Mess with this even more so that fn_1 doesn't return zero.

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

diff --git a/memcheck/tests/wrap6.c b/memcheck/tests/wrap6.c
index ca7f3107d0a1d2dc8e7673df9903d3eb10fbbba9..e18385891141f3e11b23f82836f18589eea955fd 100644 (file)
--- a/memcheck/tests/wrap6.c
+++ b/memcheck/tests/wrap6.c
@@ -78,6 +78,7 @@ typedef unsigned int  UInt;
          v27 = ROL(v27,27);   \
          v28 = ROL(v28,28);   \
          v29 = ROL(v29,29);   \
+         sum ^= ((0xFFF & v1) * i);   \
          sum ^= (v1-v2);   \
          sum ^= (v1-v3);   \
          sum ^= (v1-v4);   \

diff --git a/memcheck/tests/wrap6.stdout.exp b/memcheck/tests/wrap6.stdout.exp
index d2ccd9fa6ec4a6e1f9a654a615cba8f36aabed29..e6b08c7f5da241d9ef862063a5e8ac9fc7a58164 100644 (file)
--- a/memcheck/tests/wrap6.stdout.exp
+++ b/memcheck/tests/wrap6.stdout.exp
@@ -6,64 +6,64 @@ fn_0  wrapper post2 = 0
 
 fn_1  ...
 fn_1  wrapper pre ( 42 )
-fn_1  wrapper post1 = 0
-fn_1  wrapper post2 = 0
-      ...  0
+fn_1  wrapper post1 = 103266
+fn_1  wrapper post2 = 103266
+      ...  103266
 
 fn_2  ...
 fn_2  wrapper pre ( 42, 43 )
-fn_2  wrapper post1 = -214328439
-fn_2  wrapper post2 = -214328439
-      ...  -214328439
+fn_2  wrapper post1 = -214431509
+fn_2  wrapper post2 = -214431509
+      ...  -214431509
 
 fn_3  ...
 fn_3  wrapper pre ( 42, 43, 44 )
-fn_3  wrapper post1 = 1989809564
-fn_3  wrapper post2 = 1989809564
-      ...  1989809564
+fn_3  wrapper post1 = 1989904126
+fn_3  wrapper post2 = 1989904126
+      ...  1989904126
 
 fn_4  ...
 fn_4  wrapper pre ( 42, 43, 44, 45 )
-fn_4  wrapper post1 = -1115306928
-      ...  -1115306928
+fn_4  wrapper post1 = -1115400398
+      ...  -1115400398
 
 fn_5  ...
 fn_5  wrapper pre ( 42, 43, 44, 45, 46 )
-fn_5  wrapper post1 = 1634194685
-      ...  1634194685
+fn_5  wrapper post1 = 1634092959
+      ...  1634092959
 
 fn_6  ...
 fn_6  wrapper pre ( 42, 43, 44, 45, 46, 47 )
-fn_6  wrapper post1 = -374735757
-      ...  -374735757
+fn_6  wrapper post1 = -374837487
+      ...  -374837487
 
 fn_7  ...
 fn_7  wrapper pre ( 42, 43, 44, 45, 46, 47, 48 )
-fn_7  wrapper post1 = 1638028537
-      ...  1638028537
+fn_7  wrapper post1 = 1638123419
+      ...  1638123419
 
 fn_8  ...
 fn_8  wrapper pre ( 42, 43, 44, 45, 46, 47, 48, 49 )
-fn_8  wrapper post1 = -1965908999
-      ...  -1965908999
+fn_8  wrapper post1 = -1965881189
+      ...  -1965881189
 
 fn_9  ...
 fn_9  wrapper pre ( 42, 43, 44, 45, 46, 47, 48, 49, 50 )
-fn_9  wrapper post1 = 905402864
-      ...  905402864
+fn_9  wrapper post1 = 905366162
+      ...  905366162
 
 fn_10 ...
 fn_10 wrapper pre ( 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 )
-fn_10 wrapper post1 = 731777928
-      ...  731777928
+fn_10 wrapper post1 = 731879658
+      ...  731879658
 
 fn_11 ...
 fn_11 wrapper pre ( 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52 )
-fn_11 wrapper post1 = -947292594
-      ...  -947292594
+fn_11 wrapper post1 = -947329748
+      ...  -947329748
 
 fn_12 ...
 fn_12 wrapper pre ( 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53 )
-fn_12 wrapper post1 = -1058391648
-      ...  -1058391648
+fn_12 wrapper post1 = -1058297150
+      ...  -1058297150