64-bit cleanness: replace hard-wired 0xffffffff literals with something less
32-bit-specific.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2914 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c
index e81c78c..93de8dc 100644
--- a/coregrind/vg_mylibc.c
+++ b/coregrind/vg_mylibc.c
@@ -45,7 +45,7 @@
if (set == NULL)
return -1;
for (i = 0; i < _VKI_NSIG_WORDS; i++)
- set->sig[i] = 0xFFFFFFFF;
+ set->sig[i] = ~(UWord)0x0;
return 0;
}
diff --git a/massif/ms_main.c b/massif/ms_main.c
index fdb39d0..e88edbd 100644
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -415,7 +415,7 @@
// to ensure this in certain cases. See comments below.
static XPt* get_XCon( ThreadId tid, Bool custom_malloc )
{
- // Static to minimise stack size. +1 for added 0xffffffff %eip.
+ // Static to minimise stack size. +1 for added ~0 %eip.
static Addr eips[MAX_DEPTH + MAX_ALLOC_FNS + 1];
XPt* xpt = alloc_xpt;
@@ -440,7 +440,7 @@
// wasn't a bottom-XPt (now or later) it would cause problems later (eg.
// the parent's approx_ST wouldn't be equal [or almost equal] to the
// total of the childrens' approx_STs).
- eips[ n_eips++ ] = 0xffffffff;
+ eips[ n_eips++ ] = ~((Addr)0);
// Skip over alloc functions in eips[].
for (L = 0; is_alloc_fn(eips[L]) && L < n_eips; L++) { }
diff --git a/memcheck/tests/brk.c b/memcheck/tests/brk.c
index 58c4260..7b4f4dc 100644
--- a/memcheck/tests/brk.c
+++ b/memcheck/tests/brk.c
@@ -13,7 +13,7 @@
void* ds = orig_ds;
void* vals[10];
void* res;
-
+#define EOL ((void*)( ~(long)0 ))
vals[0] = (void*)0;
vals[1] = (void*)1;
vals[2] = ds - 0x1; // small shrink
@@ -23,8 +23,8 @@
vals[6] = ds + 0x500; // shrink a little, but still above start size
vals[7] = ds - 0x1; // shrink below start size
// vals[8] = ds - 0x1000; // shrink a lot below start size (into text)
-// vals[9] = (void*)0xffffffff;
- vals[8] = (void*)0xffffffff;
+// vals[9] = EOL;
+ vals[8] = EOL;
for (i = 0; (void*)0xffffffff != vals[i]; i++) {
res = (void*)syscall(__NR_brk, vals[i]);
@@ -32,7 +32,7 @@
assert( 0 == brk(orig_ds) ); // libc brk()
- for (i = 0; (void*)0xffffffff != vals[i]; i++) {
+ for (i = 0; EOL != vals[i]; i++) {
res = (void*)brk(vals[i]);
}