[Valgrind-developers] valgrind: r8525 - in trunk: coregrind coregrind/m_debuginfo include

[<sv...@va...>]

Author: sewardj
Date: 2008-08-19 09:57:49 +0100 (Tue, 19 Aug 2008)
New Revision: 8525

Log:
Make VG_(addToXA) and VG_(addBytesToXA) 64-bit clean.



Modified:
   trunk/coregrind/m_debuginfo/storage.c
   trunk/coregrind/m_xarray.c
   trunk/include/pub_tool_xarray.h


Modified: trunk/coregrind/m_debuginfo/storage.c
===================================================================
--- trunk/coregrind/m_debuginfo/storage.c	2008-08-19 08:38:52 UTC (rev 8524)
+++ trunk/coregrind/m_debuginfo/storage.c	2008-08-19 08:57:49 UTC (rev 8525)
@@ -420,7 +420,7 @@
    CfiExpr e;
    VG_(memset)( &e, 0, sizeof(e) );
    e.tag = Cex_Undef;
-   return VG_(addToXA)( dst, &e );
+   return (Int)VG_(addToXA)( dst, &e );
 }
 Int ML_(CfiExpr_Deref)( XArray* dst, Int ixAddr )
 {
@@ -428,7 +428,7 @@
    VG_(memset)( &e, 0, sizeof(e) );
    e.tag = Cex_Deref;
    e.Cex.Deref.ixAddr = ixAddr;
-   return VG_(addToXA)( dst, &e );
+   return (Int)VG_(addToXA)( dst, &e );
 }
 Int ML_(CfiExpr_Const)( XArray* dst, UWord con )
 {
@@ -436,7 +436,7 @@
    VG_(memset)( &e, 0, sizeof(e) );
    e.tag = Cex_Const;
    e.Cex.Const.con = con;
-   return VG_(addToXA)( dst, &e );
+   return (Int)VG_(addToXA)( dst, &e );
 }
 Int ML_(CfiExpr_Binop)( XArray* dst, CfiOp op, Int ixL, Int ixR )
 {
@@ -446,7 +446,7 @@
    e.Cex.Binop.op  = op;
    e.Cex.Binop.ixL = ixL;
    e.Cex.Binop.ixR = ixR;
-   return VG_(addToXA)( dst, &e );
+   return (Int)VG_(addToXA)( dst, &e );
 }
 Int ML_(CfiExpr_CfiReg)( XArray* dst, CfiReg reg )
 {
@@ -454,7 +454,7 @@
    VG_(memset)( &e, 0, sizeof(e) );
    e.tag = Cex_CfiReg;
    e.Cex.CfiReg.reg = reg;
-   return VG_(addToXA)( dst, &e );
+   return (Int)VG_(addToXA)( dst, &e );
 }
 Int ML_(CfiExpr_DwReg)( XArray* dst, Int reg )
 {
@@ -462,7 +462,7 @@
    VG_(memset)( &e, 0, sizeof(e) );
    e.tag = Cex_DwReg;
    e.Cex.DwReg.reg = reg;
-   return VG_(addToXA)( dst, &e );
+   return (Int)VG_(addToXA)( dst, &e );
 }
 
 static void ppCfiOp ( CfiOp op ) 

Modified: trunk/coregrind/m_xarray.c
===================================================================
--- trunk/coregrind/m_xarray.c	2008-08-19 08:38:52 UTC (rev 8524)
+++ trunk/coregrind/m_xarray.c	2008-08-19 08:57:49 UTC (rev 8525)
@@ -165,7 +165,7 @@
    }
 }
 
-Int VG_(addToXA) ( XArray* xao, void* elem )
+Word VG_(addToXA) ( XArray* xao, void* elem )
 {
    struct _XArray* xa = (struct _XArray*)xao;
    vg_assert(xa);
@@ -182,9 +182,9 @@
    return xa->usedsizeE-1;
 }
 
-Int VG_(addBytesToXA) ( XArray* xao, void* bytesV, Int nbytes )
+Word VG_(addBytesToXA) ( XArray* xao, void* bytesV, Word nbytes )
 {
-   Int r, i;
+   Word r, i;
    struct _XArray* xa = (struct _XArray*)xao;
    vg_assert(xa);
    vg_assert(xa->elemSzB == 1);

Modified: trunk/include/pub_tool_xarray.h
===================================================================
--- trunk/include/pub_tool_xarray.h	2008-08-19 08:38:52 UTC (rev 8524)
+++ trunk/include/pub_tool_xarray.h	2008-08-19 08:57:49 UTC (rev 8525)
@@ -64,12 +64,12 @@
 /* Add an element to an XArray.  Element is copied into the XArray.
    Index at which it was added is returned.  Note this will be
    invalidated if the array is later sortXA'd. */
-extern Int VG_(addToXA) ( XArray*, void* elem );
+extern Word VG_(addToXA) ( XArray*, void* elem );
 
 /* Add a sequence of bytes to an XArray of bytes.  Asserts if nbytes
    is negative or the array's element size is not 1.  Returns the
    index at which the first byte was added. */
-extern Int VG_(addBytesToXA) ( XArray* xao, void* bytesV, Int nbytes );
+extern Word VG_(addBytesToXA) ( XArray* xao, void* bytesV, Word nbytes );
 
 /* Sort an XArray using its comparison function, if set; else bomb.
    Probably not a stable sort w.r.t. equal elements module cmpFn. */