[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    valgrind
From:       Nicholas Nethercote <njn25 () cam ! ac ! uk>
Date:       2004-11-04 13:49:28
Message-ID: 20041104134928.B942A16D9F () office ! kde ! org
[Download RAW message or body]

CVS commit by nethercote: 


64-bit cleanness: replace hard-wired 0xffffffff literals with something less
32-bit-specific.


  M +1 -1      coregrind/vg_mylibc.c   1.100
  M +2 -2      massif/ms_main.c   1.19
  M +4 -4      memcheck/tests/brk.c   1.2


--- valgrind/coregrind/vg_mylibc.c  #1.99:1.100
@@ -46,5 +46,5 @@ Int VG_(sigfillset)( vki_sigset_t* set )
       return -1;
    for (i = 0; i < _VKI_NSIG_WORDS; i++)
-      set->sig[i] = 0xFFFFFFFF;
+      set->sig[i] = ~(UWord)0x0;
    return 0;
 }

--- valgrind/massif/ms_main.c  #1.18:1.19
@@ -416,5 +416,5 @@ static Bool is_alloc_fn(Addr eip)
 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];
 
@@ -441,5 +441,5 @@ static XPt* get_XCon( ThreadId tid, Bool
       // 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[]. 

--- valgrind/memcheck/tests/brk.c  #1.1:1.2
@@ -14,5 +14,5 @@ int main(void)
    void* vals[10];
    void* res;
-
+#define EOL ((void*)( ~(long)0 ))
    vals[0] = (void*)0;
    vals[1] = (void*)1;
@@ -24,6 +24,6 @@ int main(void)
    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++) {
@@ -33,5 +33,5 @@ int main(void)
    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]);
    }


[prev in list] [next in list] [prev in thread] [next in thread]