64-bit cleanness: More UInt-->SizeT changes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2909

diff --git a/coregrind/core.h b/coregrind/core.h
index d9583d55d363ad816a4ce7356186f512cc270973..ef94040eda9565a799ead4ce9b6c97cad1b9d9aa 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -1171,7 +1171,7 @@ extern void VG_(read_procselfmaps) ( void );
    it's read from the buffer filled by VG_(read_procselfmaps_contents)(). */
 extern 
 void VG_(parse_procselfmaps) (
-   void (*record_mapping)( Addr addr, UInt len, Char rr, Char ww, Char xx, 
+   void (*record_mapping)( Addr addr, SizeT len, Char rr, Char ww, Char xx, 
                           UInt dev, UInt ino, ULong foff,
                            const UChar *filename ) );
 
@@ -1186,7 +1186,7 @@ extern Bool VG_(is_object_file)   ( const void *hdr );
 extern void VG_(mini_stack_dump)  ( Addr ips[], UInt n_ips );
 extern SegInfo * VG_(read_seg_symbols) ( Segment *seg );
 extern void VG_(symtab_incref)   ( SegInfo * );
-extern void VG_(symtab_decref)   ( SegInfo *, Addr a, UInt len );
+extern void VG_(symtab_decref)   ( SegInfo *, Addr a );
 
 extern Bool VG_(get_fnname_nodemangle)( Addr a, Char* fnname, Int n_fnname );
 
@@ -1296,7 +1296,7 @@ struct _Segment {
    UInt                flags;          /* SF_*                                 */
 
    Addr                addr;           /* mapped addr (page aligned)           */
-   UInt                len;            /* size of mapping (page aligned)       */
+   SizeT       len;            /* size of mapping (page aligned)       */
 
    /* These are valid if (flags & SF_FILE) */
    ULong       offset;         /* file offset                          */
@@ -1326,10 +1326,10 @@ extern Segment *VG_(find_segment)(Addr a);
 extern Segment *VG_(first_segment)(void);
 extern Segment *VG_(next_segment)(Segment *);
 
-extern Bool     VG_(seg_contains)(const Segment *s, Addr ptr, UInt size);
-extern Bool     VG_(seg_overlaps)(const Segment *s, Addr ptr, UInt size);
+extern Bool     VG_(seg_contains)(const Segment *s, Addr ptr, SizeT size);
+extern Bool     VG_(seg_overlaps)(const Segment *s, Addr ptr, SizeT size);
 
-extern void VG_(pad_address_space)(void);
+extern void VG_(pad_address_space)  (void);
 extern void VG_(unpad_address_space)(void);
 
 extern REGPARM(1)

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index fd9c6b8e8921a45540154c982b103c189f72737f..41e2c9a937e4bff84d50cd4896a2c9dfea442394 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -2340,7 +2340,7 @@ Int VG_(helper_offset)(Addr a)
 /*====================================================================*/
 
 static void build_valgrind_map_callback 
-      ( Addr start, UInt size, Char rr, Char ww, Char xx, 
+      ( Addr start, SizeT size, Char rr, Char ww, Char xx, 
         UInt dev, UInt ino, ULong foffset, const UChar* filename )
 {
    UInt prot  = 0;
@@ -2364,7 +2364,7 @@ static void build_valgrind_map_callback
 Addr sp_at_startup___global_arg = 0;
 
 static void build_segment_map_callback 
-      ( Addr start, UInt size, Char rr, Char ww, Char xx,
+      ( Addr start, SizeT size, Char rr, Char ww, Char xx,
         UInt dev, UInt ino, ULong foffset, const UChar* filename )
 {
    UInt prot = 0;

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index e111dc7fbd1f003dae9e9b1e172909fd497cfdf0..3a9e7d7bda3b1a3700e47979b2feac3713ce11ca 100644 (file)
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -66,7 +66,7 @@ static SkipList sk_segments = SKIPLIST_INIT(Segment, addr, addrcmp, straddr, VG_
 /*--- Maintain an ordered list of all the client's mappings  ---*/
 /*--------------------------------------------------------------*/
 
-Bool VG_(seg_contains)(const Segment *s, Addr p, UInt len)
+Bool VG_(seg_contains)(const Segment *s, Addr p, SizeT len)
 {
    Addr se = s->addr+s->len;
    Addr pe = p+len;
@@ -76,7 +76,7 @@ Bool VG_(seg_contains)(const Segment *s, Addr p, UInt len)
    return (p >= s->addr && pe <= se);
 }
 
-Bool VG_(seg_overlaps)(const Segment *s, Addr p, UInt len)
+Bool VG_(seg_overlaps)(const Segment *s, Addr p, SizeT len)
 {
    Addr se = s->addr+s->len;
    Addr pe = p+len;
@@ -105,7 +105,7 @@ static void freeseg(Segment *s)
 {
    recycleseg(s);
    if (s->symtab != NULL) {
-      VG_(symtab_decref)(s->symtab, s->addr, s->len);
+      VG_(symtab_decref)(s->symtab, s->addr);
       s->symtab = NULL;
    }
 
@@ -344,7 +344,7 @@ void VG_(map_file_segment)(Addr addr, SizeT len, UInt prot, UInt flags,
           s->dev != dev                ||
           s->ino != ino                ||
           s->offset != off)) {
-        VG_(symtab_decref)(s->symtab, s->addr, s->len);
+        VG_(symtab_decref)(s->symtab, s->addr);
         s->symtab = NULL;
       }
    } else {

diff --git a/coregrind/vg_procselfmaps.c b/coregrind/vg_procselfmaps.c
index 77bfddc621ae8814b28aa535fdc8493a65332c63..19f9ecc06fb3237271849d2201f15c0cc5b0bf32 100644 (file)
--- a/coregrind/vg_procselfmaps.c
+++ b/coregrind/vg_procselfmaps.c
@@ -130,7 +130,7 @@ void VG_(read_procselfmaps)(void)
 
    So the sig of the called fn might be
 
-      void (*record_mapping)( Addr start, UInt size, 
+      void (*record_mapping)( Addr start, SizeT size, 
                               Char r, Char w, Char x, 
                               ULong foffset, UChar* filename )
 
@@ -141,7 +141,7 @@ void VG_(read_procselfmaps)(void)
        procmap_buf!
 */
 void VG_(parse_procselfmaps) (
-   void (*record_mapping)( Addr addr, UInt len, Char rr, Char ww, Char xx, 
+   void (*record_mapping)( Addr addr, SizeT len, Char rr, Char ww, Char xx, 
                           UInt dev, UInt ino, ULong foff, const UChar* filename )
    )
 {

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index 15876b9e811ec438fe839771c6b2e8eb7ac356d1..5c0fef24de8ea8d49e8e2ccb2905ea0a78409502 100644 (file)
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -1321,7 +1321,7 @@ Bool vg_read_lib_symbols ( SegInfo* si )
                     continue;
 
                  if (seg->symtab != NULL)
-                    VG_(symtab_decref)(seg->symtab, seg->addr, seg->len);
+                    VG_(symtab_decref)(seg->symtab, seg->addr);
 
                  VG_(symtab_incref)(si);
                  seg->symtab = si;
@@ -1635,7 +1635,7 @@ static void unload_symbols ( Addr start, UInt length )
    return;
 }
 
-void VG_(symtab_decref)(SegInfo *si, Addr start, UInt len)
+void VG_(symtab_decref)(SegInfo *si, Addr start)
 {
    vg_assert(si->ref >= 1);
    if (--si->ref == 0)