Fixed regression test tc20_verifywrap2, which was broken through r8829.

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

diff --git a/drd/drd_clientobj.h b/drd/drd_clientobj.h
index 19a361535f17666ca32d9bcdb25b7abf777b3650..39e97f94f32a7fad3fedcbc1dd834afd1c99358c 100644 (file)
--- a/drd/drd_clientobj.h
+++ b/drd/drd_clientobj.h
@@ -88,7 +88,7 @@ struct semaphore_info
   ObjType     type;
   void        (*cleanup)(union drd_clientobj*);
   ExeContext* first_observed_at;
-  UWord       value;             // Semaphore value.
+  UInt        value;             // Semaphore value.
   UWord       waiters;           // Number of threads inside sem_wait().
   DrdThreadId last_sem_post_tid; // Thread ID associated with last sem_post().
   Segment*    last_sem_post_segment;

diff --git a/drd/drd_semaphore.c b/drd/drd_semaphore.c
index 8f585d8731c6a0d85d144eff8a1f2ce98b2073f4..0f163053d04bef7be2b63e1f5f441c83b431ae01 100644 (file)
--- a/drd/drd_semaphore.c
+++ b/drd/drd_semaphore.c
@@ -110,14 +110,14 @@ static struct semaphore_info* semaphore_get(const Addr semaphore)
 
 /** Called before sem_init(). */
 struct semaphore_info* semaphore_init(const Addr semaphore,
-                                      const Word pshared, const UWord value)
+                                      const Word pshared, const UInt value)
 {
   struct semaphore_info* p;
 
   if (s_trace_semaphore)
   {
     VG_(message)(Vg_UserMsg,
-                 "[%d/%d] semaphore_init      0x%lx value %ld",
+                 "[%d/%d] semaphore_init      0x%lx value %u",
                  VG_(get_running_tid)(),
                  thread_get_running_tid(),
                  semaphore,
@@ -153,7 +153,7 @@ void semaphore_destroy(const Addr semaphore)
   if (s_trace_semaphore)
   {
     VG_(message)(Vg_UserMsg,
-                 "[%d/%d] semaphore_destroy   0x%lx value %ld",
+                 "[%d/%d] semaphore_destroy   0x%lx value %u",
                  VG_(get_running_tid)(),
                  thread_get_running_tid(),
                  semaphore,
@@ -183,7 +183,7 @@ void semaphore_pre_wait(const Addr semaphore)
   if (s_trace_semaphore)
   {
     VG_(message)(Vg_UserMsg,
-                 "[%d/%d] semaphore_pre_wait  0x%lx value %ld",
+                 "[%d/%d] semaphore_pre_wait  0x%lx value %u",
                  VG_(get_running_tid)(),
                  thread_get_running_tid(),
                  semaphore,
@@ -208,7 +208,7 @@ void semaphore_post_wait(const DrdThreadId tid, const Addr semaphore,
   if (s_trace_semaphore)
   {
     VG_(message)(Vg_UserMsg,
-                 "[%d/%d] semaphore_post_wait 0x%lx value %ld",
+                 "[%d/%d] semaphore_post_wait 0x%lx value %u",
                  VG_(get_running_tid)(),
                  thread_get_running_tid(),
                  semaphore,
@@ -251,7 +251,7 @@ void semaphore_pre_post(const DrdThreadId tid, const Addr semaphore)
   if (s_trace_semaphore)
   {
     VG_(message)(Vg_UserMsg,
-                 "[%d/%d] semaphore_post      0x%lx value %ld",
+                 "[%d/%d] semaphore_post      0x%lx value %u",
                  VG_(get_running_tid)(),
                  thread_get_running_tid(),
                  semaphore,

diff --git a/drd/drd_semaphore.h b/drd/drd_semaphore.h
index 2b5107fa6775a513dd796a7012d9d0dc4aab467d..80dde06ddb900cf47f65d4b7e09c04cd47b807e3 100644 (file)
--- a/drd/drd_semaphore.h
+++ b/drd/drd_semaphore.h
@@ -40,7 +40,7 @@ struct semaphore_info;
 
 void semaphore_set_trace(const Bool trace_semaphore);
 struct semaphore_info* semaphore_init(const Addr semaphore,
-                                      const Word pshared, const UWord value);
+                                      const Word pshared, const UInt value);
 void semaphore_destroy(const Addr semaphore);
 void semaphore_pre_wait(const Addr semaphore);
 void semaphore_post_wait(const DrdThreadId tid, const Addr semaphore,

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
index e33af90848eaf88bfa891b79135c429174c41ebc..987a55b4cd6c605f4216bc29ae525d65d93af6e5 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
@@ -128,7 +128,7 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1/1] semaphore_init      0x........ value -1
+[1/1] semaphore_init      0x........ value 4294967295
 [1/1] semaphore_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
@@ -141,7 +141,7 @@ semaphore 0x........ was first observed at:
 FIXME: can't figure out how to verify wrap of sem_destroy
 
 [1/1] semaphore_pre_wait  0x........ value 0
-[1/1] semaphore_post_wait 0x........ value -1
+[1/1] semaphore_post_wait 0x........ value 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
index b50c673e3af772ec08cabfdebade3a5d52c4f3e5..9cf6853256acd9f1d64cd101f974bf3a4f6b01c2 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
@@ -128,7 +128,7 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1/1] semaphore_init      0x........ value -1
+[1/1] semaphore_init      0x........ value 4294967295
 [1/1] semaphore_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
@@ -141,7 +141,7 @@ semaphore 0x........ was first observed at:
 FIXME: can't figure out how to verify wrap of sem_destroy
 
 [1/1] semaphore_pre_wait  0x........ value 0
-[1/1] semaphore_post_wait 0x........ value -1
+[1/1] semaphore_post_wait 0x........ value 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
index 5584e5382bc0fb51a5407397f8548fa217117c36..5eff6ac6bc0cd2108e256f416b882d4581bcb7a4 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
@@ -134,7 +134,7 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1/1] semaphore_init      0x........ value -1
+[1/1] semaphore_init      0x........ value 4294967295
 [1/1] semaphore_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
@@ -147,7 +147,7 @@ semaphore 0x........ was first observed at:
 FIXME: can't figure out how to verify wrap of sem_destroy
 
 [1/1] semaphore_pre_wait  0x........ value 0
-[1/1] semaphore_post_wait 0x........ value -1
+[1/1] semaphore_post_wait 0x........ value 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
index f79d69a885cb726bdcae5ad274c5b726933a3900..427e3f2e07b9ed15fc67337e52b823f99a9c23f2 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
@@ -134,7 +134,7 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1/1] semaphore_init      0x........ value -1
+[1/1] semaphore_init      0x........ value 4294967295
 [1/1] semaphore_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
@@ -147,7 +147,7 @@ semaphore 0x........ was first observed at:
 FIXME: can't figure out how to verify wrap of sem_destroy
 
 [1/1] semaphore_pre_wait  0x........ value 0
-[1/1] semaphore_post_wait 0x........ value -1
+[1/1] semaphore_post_wait 0x........ value 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
index e551bada2f42808bbcae3051c8971aa37fa88995..accfaef18e5d383cdd898486876d40df254f364a 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -134,13 +134,13 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1/1] semaphore_init      0x........ value -1
+[1/1] semaphore_init      0x........ value 4294967295
 [1/1] semaphore_init      0x........ value 0
 
 FIXME: can't figure out how to verify wrap of sem_destroy
 
 [1/1] semaphore_pre_wait  0x........ value 0
-[1/1] semaphore_post_wait 0x........ value -1
+[1/1] semaphore_post_wait 0x........ value 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)