Skip to content

Commit b5a6082

Browse files
graydongraydon
committed
Update valgrind.h and memcheck.h to 3.6.0
1 parent dbe5dc9 commit b5a6082

File tree

2 files changed

+1014
-180
lines changed

2 files changed

+1014
-180
lines changed

‎src/rt/memcheck.h

Lines changed: 33 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
This file is part of MemCheck, a heavyweight Valgrind tool for
1414
detecting memory errors.
1515
16-
Copyright (C) 2000-2009 Julian Seward. All rights reserved.
16+
Copyright (C) 2000-2010 Julian Seward. All rights reserved.
1717
1818
Redistribution and use in source and binary forms, with or without
1919
modification, are permitted provided that the following conditions
@@ -107,66 +107,48 @@ typedef
107107

108108
/* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */
109109
#define VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len) \
110-
(__extension__({unsigned long _qzz_res; \
111-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
110+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
112111
VG_USERREQ__MAKE_MEM_NOACCESS, \
113-
_qzz_addr, _qzz_len, 0, 0, 0); \
114-
_qzz_res; \
115-
}))
112+
(_qzz_addr), (_qzz_len), 0, 0, 0)
116113

117114
/* Similarly, mark memory at _qzz_addr as addressable but undefined
118115
for _qzz_len bytes. */
119116
#define VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len) \
120-
(__extension__({unsigned long _qzz_res; \
121-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
117+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
122118
VG_USERREQ__MAKE_MEM_UNDEFINED, \
123-
_qzz_addr, _qzz_len, 0, 0, 0); \
124-
_qzz_res; \
125-
}))
119+
(_qzz_addr), (_qzz_len), 0, 0, 0)
126120

127121
/* Similarly, mark memory at _qzz_addr as addressable and defined
128122
for _qzz_len bytes. */
129123
#define VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len) \
130-
(__extension__({unsigned long _qzz_res; \
131-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
124+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
132125
VG_USERREQ__MAKE_MEM_DEFINED, \
133-
_qzz_addr, _qzz_len, 0, 0, 0); \
134-
_qzz_res; \
135-
}))
126+
(_qzz_addr), (_qzz_len), 0, 0, 0)
136127

137128
/* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
138129
not altered: bytes which are addressable are marked as defined,
139130
but those which are not addressable are left unchanged. */
140-
#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
141-
(__extension__({unsigned long _qzz_res; \
142-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
131+
#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
132+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
143133
VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE, \
144-
_qzz_addr, _qzz_len, 0, 0, 0); \
145-
_qzz_res; \
146-
}))
134+
(_qzz_addr), (_qzz_len), 0, 0, 0)
147135

148136
/* Create a block-description handle. The description is an ascii
149137
string which is included in any messages pertaining to addresses
150138
within the specified memory range. Has no other effect on the
151139
properties of the memory range. */
152-
#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc) \
153-
(__extension__({unsigned long _qzz_res; \
154-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
155-
VG_USERREQ__CREATE_BLOCK, \
156-
_qzz_addr, _qzz_len, _qzz_desc, \
157-
0, 0); \
158-
_qzz_res; \
159-
}))
140+
#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc) \
141+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
142+
VG_USERREQ__CREATE_BLOCK, \
143+
(_qzz_addr), (_qzz_len), (_qzz_desc), \
144+
0, 0)
160145

161146
/* Discard a block-description-handle. Returns 1 for an
162147
invalid handle, 0 for a valid handle. */
163148
#define VALGRIND_DISCARD(_qzz_blkindex) \
164-
(__extension__ ({unsigned long _qzz_res; \
165-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
149+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0 /* default return */, \
166150
VG_USERREQ__DISCARD, \
167-
0, _qzz_blkindex, 0, 0, 0); \
168-
_qzz_res; \
169-
}))
151+
0, (_qzz_blkindex), 0, 0, 0)
170152

171153

172154
/* Client-code macros to check the state of memory. */
@@ -175,25 +157,19 @@ typedef
175157
If suitable addressibility is not established, Valgrind prints an
176158
error message and returns the address of the first offending byte.
177159
Otherwise it returns zero. */
178-
#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len) \
179-
(__extension__({unsigned long _qzz_res; \
180-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
181-
VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,\
182-
_qzz_addr, _qzz_len, 0, 0, 0); \
183-
_qzz_res; \
184-
}))
160+
#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len) \
161+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
162+
VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE, \
163+
(_qzz_addr), (_qzz_len), 0, 0, 0)
185164

186165
/* Check that memory at _qzz_addr is addressable and defined for
187166
_qzz_len bytes. If suitable addressibility and definedness are not
188167
established, Valgrind prints an error message and returns the
189168
address of the first offending byte. Otherwise it returns zero. */
190169
#define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len) \
191-
(__extension__({unsigned long _qzz_res; \
192-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
170+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
193171
VG_USERREQ__CHECK_MEM_IS_DEFINED, \
194-
_qzz_addr, _qzz_len, 0, 0, 0); \
195-
_qzz_res; \
196-
}))
172+
(_qzz_addr), (_qzz_len), 0, 0, 0);
197173

198174
/* Use this macro to force the definedness and addressibility of an
199175
lvalue to be checked. If suitable addressibility and definedness
@@ -276,15 +252,11 @@ typedef
276252
The metadata is not copied in cases 0, 2 or 3 so it should be
277253
impossible to segfault your system by using this call.
278254
*/
279-
#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes) \
280-
(__extension__({unsigned long _qzz_res; \
281-
char* czza = (char*)zza; \
282-
char* czzvbits = (char*)zzvbits; \
283-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
284-
VG_USERREQ__GET_VBITS, \
285-
czza, czzvbits, zznbytes, 0, 0 ); \
286-
_qzz_res; \
287-
}))
255+
#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes) \
256+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
257+
VG_USERREQ__GET_VBITS, \
258+
(char*)(zza), (char*)(zzvbits), \
259+
(zznbytes), 0, 0)
288260

289261
/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
290262
from the provided zzvbits array. Return values:
@@ -295,15 +267,11 @@ typedef
295267
The metadata is not copied in cases 0, 2 or 3 so it should be
296268
impossible to segfault your system by using this call.
297269
*/
298-
#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes) \
299-
(__extension__({unsigned int _qzz_res; \
300-
char* czza = (char*)zza; \
301-
char* czzvbits = (char*)zzvbits; \
302-
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
303-
VG_USERREQ__SET_VBITS, \
304-
czza, czzvbits, zznbytes, 0, 0 ); \
305-
_qzz_res; \
306-
}))
270+
#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes) \
271+
VALGRIND_DO_CLIENT_REQUEST_EXPR(0, \
272+
VG_USERREQ__SET_VBITS, \
273+
(char*)(zza), (char*)(zzvbits), \
274+
(zznbytes), 0, 0 )
307275

308276
#endif
309277

0 commit comments

Comments
 (0)