Make the return type of VG_(disp_run_translations) be void, rather

than the HWord it was claimed to be.  Inconsistency spotted by
Philippe Waroquiers.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/TCHAIN@12486

diff --git a/coregrind/m_dispatch/dispatch-amd64-linux.S b/coregrind/m_dispatch/dispatch-amd64-linux.S
index 459c44708c8287fc63df8092355bd5eae471951b..73daec523d256889d2b6b85a50d8cba1af0be6d2 100644 (file)
--- a/coregrind/m_dispatch/dispatch-amd64-linux.S
+++ b/coregrind/m_dispatch/dispatch-amd64-linux.S
@@ -50,9 +50,9 @@
 /*----------------------------------------------------*/
 
 /* signature:
-UWord VG_(disp_run_translations)( UWord* two_words,
-                                  void*  guest_state, 
-                                  Addr   host_addr );
+void VG_(disp_run_translations)( UWord* two_words,
+                                 void*  guest_state, 
+                                 Addr   host_addr );
 */
 .text
 .globl VG_(disp_run_translations)

diff --git a/coregrind/m_dispatch/dispatch-arm-linux.S b/coregrind/m_dispatch/dispatch-arm-linux.S
index 4833a75bcc53e8a5fa3698e43a6c3c31df96cf22..8ac0dab333c6e6563ee8e069781a4db48f2f1085 100644 (file)
--- a/coregrind/m_dispatch/dispatch-arm-linux.S
+++ b/coregrind/m_dispatch/dispatch-arm-linux.S
@@ -50,9 +50,9 @@
 /*----------------------------------------------------*/
 
 /* signature:
-UWord VG_(disp_run_translations)( UWord* two_words,
-                                  void*  guest_state, 
-                                  Addr   host_addr );
+void VG_(disp_run_translations)( UWord* two_words,
+                                 void*  guest_state, 
+                                 Addr   host_addr );
 */
 .text
 .global VG_(disp_run_translations)

diff --git a/coregrind/m_dispatch/dispatch-x86-linux.S b/coregrind/m_dispatch/dispatch-x86-linux.S
index 7db1de1e2a8726333dc1eb8e0c5919040140acb9..eaf10cf372c6692f59c7c22cb61f3e274654ff17 100644 (file)
--- a/coregrind/m_dispatch/dispatch-x86-linux.S
+++ b/coregrind/m_dispatch/dispatch-x86-linux.S
@@ -49,9 +49,9 @@
 /*----------------------------------------------------*/
 
 /* signature:
-UWord VG_(disp_run_translations)( UWord* two_words,
-                                  void*  guest_state, 
-                                  Addr   host_addr );
+void VG_(disp_run_translations)( UWord* two_words,
+                                 void*  guest_state, 
+                                 Addr   host_addr );
 */
 .text
 .globl VG_(disp_run_translations)

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 349b56b355ff864c20a342014c19fbc5d3a30cd6..6326224972ea0fcf30f7720d672c720652fbc192 100644 (file)
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -818,7 +818,6 @@ void run_thread_for_a_while ( /*OUT*/HWord* two_words,
 {
    volatile HWord        jumped         = 0;
    volatile ThreadState* tst            = NULL; /* stop gcc complaining */
-   volatile UInt         trc            = 0;
    volatile Int          done_this_time = 0;
    volatile HWord        host_code_addr = 0;
 
@@ -894,11 +893,11 @@ void run_thread_for_a_while ( /*OUT*/HWord* two_words,
    SCHEDSETJMP(
       tid, 
       jumped, 
-      trc = (UInt)VG_(disp_run_translations)( 
-                     two_words,
-                     (void*)&tst->arch.vex,
-                     host_code_addr
-                  )
+      VG_(disp_run_translations)( 
+         two_words,
+         (void*)&tst->arch.vex,
+         host_code_addr
+      )
    );
 
    vg_assert(VG_(in_generated_code) == True);
@@ -907,7 +906,7 @@ void run_thread_for_a_while ( /*OUT*/HWord* two_words,
    if (jumped != (HWord)0) {
       /* We get here if the client took a fault that caused our signal
          handler to longjmp. */
-      vg_assert(trc == 0);
+      vg_assert(two_words[0] == 0 && two_words[1] == 0); // correct?
       two_words[0] = VG_TRC_FAULT_SIGNAL;
       two_words[1] = 0;
       block_signals();

diff --git a/coregrind/pub_core_dispatch.h b/coregrind/pub_core_dispatch.h
index 08cc3f29f6bb12b27de9752f272e0a115a2815fd..5b61f876a0013a827dd6e540fdb1652c9601971f 100644 (file)
--- a/coregrind/pub_core_dispatch.h
+++ b/coregrind/pub_core_dispatch.h
@@ -60,9 +60,9 @@
    a TRC value.  Second is generally unused, except in the case
    where we have to return a chain-me request.
 */
-HWord VG_(disp_run_translations)( HWord* two_words,
-                                  void*  guest_state, 
-                                  Addr   host_addr );
+void VG_(disp_run_translations)( HWord* two_words,
+                                 void*  guest_state, 
+                                 Addr   host_addr );
 
 /* We need to know addresses of the continuation-point (cp_) labels so
    we can tell VEX what they are.  They will get baked into the code