|
From: <sv...@va...> - 2006-01-07 21:52:57
|
Author: sewardj
Date: 2006-01-07 21:52:50 +0000 (Sat, 07 Jan 2006)
New Revision: 5504
Log:
Enable the function-wrapping tests.
Added:
branches/FNWRAP/memcheck/tests/wrap1.stderr.exp
branches/FNWRAP/memcheck/tests/wrap1.stdout.exp
branches/FNWRAP/memcheck/tests/wrap1.vgtest
branches/FNWRAP/memcheck/tests/wrap2.stderr.exp
branches/FNWRAP/memcheck/tests/wrap2.stdout.exp
branches/FNWRAP/memcheck/tests/wrap2.vgtest
branches/FNWRAP/memcheck/tests/wrap3.stderr.exp
branches/FNWRAP/memcheck/tests/wrap3.stdout.exp
branches/FNWRAP/memcheck/tests/wrap3.vgtest
branches/FNWRAP/memcheck/tests/wrap4.stderr.exp
branches/FNWRAP/memcheck/tests/wrap4.stdout.exp
branches/FNWRAP/memcheck/tests/wrap4.vgtest
branches/FNWRAP/memcheck/tests/wrap5.stderr.exp
branches/FNWRAP/memcheck/tests/wrap5.stdout.exp
branches/FNWRAP/memcheck/tests/wrap5.vgtest
Modified:
branches/FNWRAP/memcheck/tests/Makefile.am
branches/FNWRAP/memcheck/tests/wrap1.c
branches/FNWRAP/memcheck/tests/wrap2.c
branches/FNWRAP/memcheck/tests/wrap3.c
branches/FNWRAP/memcheck/tests/wrap4.c
branches/FNWRAP/memcheck/tests/wrap5.c
Modified: branches/FNWRAP/memcheck/tests/Makefile.am
=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/Makefile.am 2006-01-05 14:13:14 UTC (r=
ev 5503)
+++ branches/FNWRAP/memcheck/tests/Makefile.am 2006-01-07 21:52:50 UTC (r=
ev 5504)
@@ -102,6 +102,11 @@
trivialleak.stderr.exp trivialleak.vgtest \
metadata.stderr.exp metadata.stdout.exp metadata.vgtest-HIDING \
vgtest_ume.stderr.exp vgtest_ume.disabled \
+ wrap1.vgtest wrap1.stdout.exp wrap1.stderr.exp \
+ wrap2.vgtest wrap2.stdout.exp wrap2.stderr.exp \
+ wrap3.vgtest wrap3.stdout.exp wrap3.stderr.exp \
+ wrap4.vgtest wrap4.stdout.exp wrap4.stderr.exp \
+ wrap5.vgtest wrap5.stdout.exp wrap5.stderr.exp \
writev.stderr.exp writev.stderr.exp2 writev.stderr.exp3 writev.vgtest \
xml1.stderr.exp xml1.stderr.exp2 xml1.stderr.exp3 \
xml1.stderr.exp64 xml1.stderr.exp64_2 xml1.stdout.exp \
@@ -135,6 +140,7 @@
trivialleak \
mismatches new_override metadata \
xml1 \
+ wrap1 wrap2 wrap3 wrap4 wrap5 \
writev zeropage
=20
=20
Modified: branches/FNWRAP/memcheck/tests/wrap1.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/wrap1.c 2006-01-05 14:13:14 UTC (rev 5=
503)
+++ branches/FNWRAP/memcheck/tests/wrap1.c 2006-01-07 21:52:50 UTC (rev 5=
504)
@@ -6,6 +6,7 @@
and check we run the wrapper instead. */
=20
/* The "original" function */
+__attribute__((noinline))
void actual ( void )
{
printf("in actual\n");
@@ -14,12 +15,12 @@
/* The wrapper. Since this executable won't have a soname, we have to
use "NONE", since V treats any executable/.so which lacks a soname
as if its soname was "NONE". */
-void I_REPLACE_SONAME_FNNAME_ZU(NONE,actual) ( void )
+void I_WRAP_SONAME_FNNAME_ZU(NONE,actual) ( void )
{
+ void* orig;
+ VALGRIND_GET_ORIG_FN(orig);
printf("wrapper-pre\n");
-
- CALL_ORIG_VOIDFN_0(actual);
-
+ CALL_FN_v_v(orig);
printf("wrapper-post\n");
}
=20
Added: branches/FNWRAP/memcheck/tests/wrap1.stderr.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
Added: branches/FNWRAP/memcheck/tests/wrap1.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/wrap1.stdout.exp =
(rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap1.stdout.exp 2006-01-07 21:52:50 U=
TC (rev 5504)
@@ -0,0 +1,4 @@
+starting
+wrapper-pre
+in actual
+wrapper-post
Added: branches/FNWRAP/memcheck/tests/wrap1.vgtest
=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/wrap1.vgtest (=
rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap1.vgtest 2006-01-07 21:52:50 UTC (=
rev 5504)
@@ -0,0 +1,2 @@
+prog: wrap1
+vgopts: -q
Modified: branches/FNWRAP/memcheck/tests/wrap2.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/wrap2.c 2006-01-05 14:13:14 UTC (rev 5=
503)
+++ branches/FNWRAP/memcheck/tests/wrap2.c 2006-01-07 21:52:50 UTC (rev 5=
504)
@@ -13,11 +13,13 @@
if (n =3D=3D 0) return 1; else return mul(n, fact(n-1));
}
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact) ( int n )
{
int r;
+ void* orig;
+ VALGRIND_GET_ORIG_FN(orig);
printf("in wrapper1-pre: fact(%d)\n", n);
- CALL_ORIG_FN_1(r,fact,n);
+ CALL_FN_W_W(r, orig, n);
printf("in wrapper1-post: fact(%d) =3D %d\n", n, r);
return r;
}
Added: branches/FNWRAP/memcheck/tests/wrap2.stderr.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
Added: branches/FNWRAP/memcheck/tests/wrap2.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/wrap2.stdout.exp =
(rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap2.stdout.exp 2006-01-07 21:52:50 U=
TC (rev 5504)
@@ -0,0 +1,14 @@
+computing fact(5)
+in wrapper1-pre: fact(5)
+in wrapper1-pre: fact(4)
+in wrapper1-pre: fact(3)
+in wrapper1-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper1-pre: fact(0)
+in wrapper1-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper1-post: fact(2) =3D 2
+in wrapper1-post: fact(3) =3D 6
+in wrapper1-post: fact(4) =3D 24
+in wrapper1-post: fact(5) =3D 120
+fact(5) =3D 120
Added: branches/FNWRAP/memcheck/tests/wrap2.vgtest
=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/wrap2.vgtest (=
rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap2.vgtest 2006-01-07 21:52:50 UTC (=
rev 5504)
@@ -0,0 +1,2 @@
+prog: wrap2
+vgopts: -q
Modified: branches/FNWRAP/memcheck/tests/wrap3.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/wrap3.c 2006-01-05 14:13:14 UTC (rev 5=
503)
+++ branches/FNWRAP/memcheck/tests/wrap3.c 2006-01-07 21:52:50 UTC (rev 5=
504)
@@ -22,20 +22,24 @@
}
=20
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact1) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact1) ( int n )
{
- int r;
+ int r;
+ void* fn;
+ VALGRIND_GET_ORIG_FN(fn);
printf("in wrapper1-pre: fact(%d)\n", n);
- CALL_ORIG_FN_1(r,fact1,n);
+ CALL_FN_W_W(r,fn,n);
printf("in wrapper1-post: fact(%d) =3D %d\n", n, r);
return r;
}
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact2) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact2) ( int n )
{
- int r;
+ int r;
+ void* fn;
+ VALGRIND_GET_ORIG_FN(fn);
printf("in wrapper2-pre: fact(%d)\n", n);
- CALL_ORIG_FN_1(r,fact2,n);
+ CALL_FN_W_W(r,fn,n);
printf("in wrapper2-post: fact(%d) =3D %d\n", n, r);
return r;
}
Added: branches/FNWRAP/memcheck/tests/wrap3.stderr.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
Added: branches/FNWRAP/memcheck/tests/wrap3.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/wrap3.stdout.exp =
(rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap3.stdout.exp 2006-01-07 21:52:50 U=
TC (rev 5504)
@@ -0,0 +1,14 @@
+computing fact1(5)
+in wrapper1-pre: fact(5)
+in wrapper2-pre: fact(4)
+in wrapper1-pre: fact(3)
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+in wrapper1-post: fact(3) =3D 6
+in wrapper2-post: fact(4) =3D 24
+in wrapper1-post: fact(5) =3D 120
+fact1(5) =3D 120
Added: branches/FNWRAP/memcheck/tests/wrap3.vgtest
=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/wrap3.vgtest (=
rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap3.vgtest 2006-01-07 21:52:50 UTC (=
rev 5504)
@@ -0,0 +1,2 @@
+prog: wrap3
+vgopts: -q
Modified: branches/FNWRAP/memcheck/tests/wrap4.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/wrap4.c 2006-01-05 14:13:14 UTC (rev 5=
503)
+++ branches/FNWRAP/memcheck/tests/wrap4.c 2006-01-07 21:52:50 UTC (rev 5=
504)
@@ -26,21 +26,25 @@
}
=20
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact1) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact1) ( int n )
{
int r;
+ void* fn;
+ VALGRIND_GET_ORIG_FN(fn);
printf("in wrapper1-pre: fact(%d)\n", n);
- CALL_ORIG_FN_1(r,fact1,n);
+ CALL_FN_W_W(r, fn, n);
printf("in wrapper1-post: fact(%d) =3D %d\n", n, r);
if (n >=3D 3) r +=3D fact2(2);
return r;
}
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact2) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact2) ( int n )
{
int r;
+ void* fn;
+ VALGRIND_GET_ORIG_FN(fn);
printf("in wrapper2-pre: fact(%d)\n", n);
- CALL_ORIG_FN_1(r,fact2,n);
+ CALL_FN_W_W(r, fn, n);
printf("in wrapper2-post: fact(%d) =3D %d\n", n, r);
return r;
}
Added: branches/FNWRAP/memcheck/tests/wrap4.stderr.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
Added: branches/FNWRAP/memcheck/tests/wrap4.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/wrap4.stdout.exp =
(rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap4.stdout.exp 2006-01-07 21:52:50 U=
TC (rev 5504)
@@ -0,0 +1,26 @@
+computing fact1(5)
+in wrapper1-pre: fact(5)
+in wrapper2-pre: fact(4)
+in wrapper1-pre: fact(3)
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+in wrapper1-post: fact(3) =3D 6
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+in wrapper2-post: fact(4) =3D 32
+in wrapper1-post: fact(5) =3D 160
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+fact1(5) =3D 162
Added: branches/FNWRAP/memcheck/tests/wrap4.vgtest
=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/wrap4.vgtest (=
rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap4.vgtest 2006-01-07 21:52:50 UTC (=
rev 5504)
@@ -0,0 +1,2 @@
+prog: wrap4
+vgopts: -q
Modified: branches/FNWRAP/memcheck/tests/wrap5.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/wrap5.c 2006-01-05 14:13:14 UTC (rev 5=
503)
+++ branches/FNWRAP/memcheck/tests/wrap5.c 2006-01-07 21:52:50 UTC (rev 5=
504)
@@ -48,24 +48,28 @@
}
=20
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact1) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact1) ( int n )
{
- int r;
+ int r;
+ void* fn;
+ VALGRIND_GET_ORIG_FN(fn);
printf("in wrapper1-pre: fact(%d)\n", n);
addMoreLard();
- CALL_ORIG_FN_1(r,fact1,n);
+ CALL_FN_W_W(r, fn, n);
addMoreLard();
printf("in wrapper1-post: fact(%d) =3D %d\n", n, r);
if (n >=3D 3) r +=3D fact2(2);
return r;
}
=20
-int I_REPLACE_SONAME_FNNAME_ZU(NONE,fact2) ( int n )
+int I_WRAP_SONAME_FNNAME_ZU(NONE,fact2) ( int n )
{
- int r;
+ int r;
+ void* fn;
+ VALGRIND_GET_ORIG_FN(fn);
printf("in wrapper2-pre: fact(%d)\n", n);
addMoreLard();
- CALL_ORIG_FN_1(r,fact2,n);
+ CALL_FN_W_W(r, fn, n);
addMoreLard();
printf("in wrapper2-post: fact(%d) =3D %d\n", n, r);
return r;
Added: branches/FNWRAP/memcheck/tests/wrap5.stderr.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
Added: branches/FNWRAP/memcheck/tests/wrap5.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/wrap5.stdout.exp =
(rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap5.stdout.exp 2006-01-07 21:52:50 U=
TC (rev 5504)
@@ -0,0 +1,37 @@
+computing fact1(7)
+in wrapper1-pre: fact(7)
+in wrapper2-pre: fact(6)
+in wrapper1-pre: fact(5)
+in wrapper2-pre: fact(4)
+in wrapper1-pre: fact(3)
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+in wrapper1-post: fact(3) =3D 6
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+in wrapper2-post: fact(4) =3D 32
+in wrapper1-post: fact(5) =3D 160
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+in wrapper2-post: fact(6) =3D 972
+in wrapper1-post: fact(7) =3D 6804
+in wrapper2-pre: fact(2)
+in wrapper1-pre: fact(1)
+in wrapper2-pre: fact(0)
+in wrapper2-post: fact(0) =3D 1
+in wrapper1-post: fact(1) =3D 1
+in wrapper2-post: fact(2) =3D 2
+fact1(7) =3D 6806
+allocated 51 Lards
Added: branches/FNWRAP/memcheck/tests/wrap5.vgtest
=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/wrap5.vgtest (=
rev 0)
+++ branches/FNWRAP/memcheck/tests/wrap5.vgtest 2006-01-07 21:52:50 UTC (=
rev 5504)
@@ -0,0 +1,2 @@
+prog: wrap5
+vgopts: -q
|