|
From: <sv...@va...> - 2006-01-10 16:21:11
|
Author: sewardj
Date: 2006-01-10 16:21:07 +0000 (Tue, 10 Jan 2006)
New Revision: 5511
Log:
Make this work the same on both 32- and 64-bit platforms.
Modified:
branches/FNWRAP/memcheck/tests/wrap6.c
branches/FNWRAP/memcheck/tests/wrap6.stdout.exp
Modified: branches/FNWRAP/memcheck/tests/wrap6.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/FNWRAP/memcheck/tests/wrap6.c 2006-01-10 16:12:16 UTC (rev 5=
510)
+++ branches/FNWRAP/memcheck/tests/wrap6.c 2006-01-10 16:21:07 UTC (rev 5=
511)
@@ -8,27 +8,27 @@
attempt to shake out any problems caused by insufficient saving of
caller-save registers around the hidden call instruction. */
=20
-typedef unsigned long UWord;
+typedef unsigned int UInt;
=20
-#define ROL(_x,n) (((_x) << n) | ((UWord)(_x)) >> ((8*sizeof(UWord)-n)))
+#define ROL(_x,n) (((_x) << n) | ((UInt)(_x)) >> ((8*sizeof(UInt)-n)))
=20
#define TRASH_IREGS(_rlval, _vec) \
do { \
- UWord* vec =3D (_vec); \
+ UInt* vec =3D (_vec); \
/* x86 spills for v > 4, amd64 for v > 12. */ \
- UWord i, sum =3D 0; \
- UWord v1 =3D vec[1-1]; \
- UWord v2 =3D vec[2-1]; \
- UWord v3 =3D vec[3-1]; \
- UWord v4 =3D vec[4-1]; \
- UWord v5 =3D vec[5-1]; \
- UWord v6 =3D vec[6-1]; \
- UWord v7 =3D vec[7-1]; \
- UWord v8 =3D vec[8-1]; \
- UWord v9 =3D vec[9-1]; \
- UWord v10 =3D vec[10-1]; \
- UWord v11 =3D vec[11-1]; \
- UWord v12 =3D vec[12-1]; \
+ UInt i, sum =3D 0; \
+ UInt v1 =3D vec[1-1]; \
+ UInt v2 =3D vec[2-1]; \
+ UInt v3 =3D vec[3-1]; \
+ UInt v4 =3D vec[4-1]; \
+ UInt v5 =3D vec[5-1]; \
+ UInt v6 =3D vec[6-1]; \
+ UInt v7 =3D vec[7-1]; \
+ UInt v8 =3D vec[8-1]; \
+ UInt v9 =3D vec[9-1]; \
+ UInt v10 =3D vec[10-1]; \
+ UInt v11 =3D vec[11-1]; \
+ UInt v12 =3D vec[12-1]; \
for (i =3D 0; i < 50; i++) { \
v1 =3D ROL(v1,1); \
v2 =3D ROL(v2,2); \
@@ -59,18 +59,18 @@
=20
/* --------------- 0 --------------- */ =20
=20
-UWord fn_0 ( void )
+UInt fn_0 ( void )
{
- UWord r;
- UWord* words =3D calloc(200, sizeof(UWord));
+ UInt r;
+ UInt* words =3D calloc(200, sizeof(UInt));
TRASH_IREGS(r, words);
free(words);
return r;
}
=20
-UWord I_WRAP_SONAME_FNNAME_ZU(NONE,fn_0) ( UWord a1 )
+UInt I_WRAP_SONAME_FNNAME_ZU(NONE,fn_0) ( UInt a1 )
{
- UWord r;
+ UInt r;
void* fn;
VALGRIND_GET_ORIG_FN(fn);
printf("fn_0 wrapper pre ()\n");
@@ -83,19 +83,19 @@
=20
/* --------------- 1 --------------- */ =20
=20
-UWord fn_1 ( UWord a1 )
+UInt fn_1 ( UInt a1 )
{
- UWord r;
- UWord* words =3D calloc(200, sizeof(UWord));
+ UInt r;
+ UInt* words =3D calloc(200, sizeof(UInt));
words[1-1] =3D a1;
TRASH_IREGS(r, words);
free(words);
return r;
}
=20
-UWord I_WRAP_SONAME_FNNAME_ZU(NONE,fn_1) ( UWord a1 )
+UInt I_WRAP_SONAME_FNNAME_ZU(NONE,fn_1) ( UInt a1 )
{
- UWord r;
+ UInt r;
void* fn;
VALGRIND_GET_ORIG_FN(fn);
printf("fn_1 wrapper pre ( %d )\n", (int)a1);
@@ -108,10 +108,10 @@
=20
/* --------------- 2 --------------- */ =20
=20
-UWord fn_2 ( UWord a1, UWord a2 )
+UInt fn_2 ( UInt a1, UInt a2 )
{
- UWord r;
- UWord* words =3D calloc(200, sizeof(UWord));
+ UInt r;
+ UInt* words =3D calloc(200, sizeof(UInt));
words[1-1] =3D a1;
words[2-1] =3D a2;
TRASH_IREGS(r, words);
@@ -119,9 +119,9 @@
return r;
}
=20
-UWord I_WRAP_SONAME_FNNAME_ZU(NONE,fn_2) ( UWord a1, UWord a2 )
+UInt I_WRAP_SONAME_FNNAME_ZU(NONE,fn_2) ( UInt a1, UInt a2 )
{
- UWord r;
+ UInt r;
void* fn;
VALGRIND_GET_ORIG_FN(fn);
printf("fn_2 wrapper pre ( %d, %d )\n", (int)a1, (int)a2);
@@ -136,7 +136,7 @@
=20
int main ( void )
{
- UWord w;
+ UInt w;
=20
printf("fn_0 ...\n");
w =3D fn_0();
Modified: branches/FNWRAP/memcheck/tests/wrap6.stdout.exp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/FNWRAP/memcheck/tests/wrap6.stdout.exp 2006-01-10 16:12:16 U=
TC (rev 5510)
+++ branches/FNWRAP/memcheck/tests/wrap6.stdout.exp 2006-01-10 16:21:07 U=
TC (rev 5511)
@@ -6,13 +6,13 @@
=20
fn_1 ...
fn_1 wrapper pre ( 42 )
-fn_1 wrapper post1 =3D -52
-fn_1 wrapper post2 =3D -52
- ... -52
+fn_1 wrapper post1 =3D -13631437
+fn_1 wrapper post2 =3D -13631437
+ ... -13631437
=20
fn_2 ...
fn_2 wrapper pre ( 42, 43 )
-fn_2 wrapper post1 =3D 2617
-fn_2 wrapper post2 =3D 2617
- ... 2617
+fn_2 wrapper post1 =3D 201956282
+fn_2 wrapper post2 =3D 201956282
+ ... 201956282
=20
|