From: Julian Seward <jseward@acm.org>
Date: Wed, 4 Apr 2012 12:23:23 +0000 (+0000)
Subject: Make the return type of VG_(disp_run_translations) be void, rather
X-Git-Tag: svn/VALGRIND_3_8_0~350^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712ee2547bb8a25a5f1ae4a2cac91c520195cf0e;p=thirdparty%2Fvalgrind.git

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 459c44708c..73daec523d 100644
--- 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 4833a75bcc..8ac0dab333 100644
--- 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 7db1de1e2a..eaf10cf372 100644
--- 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 349b56b355..6326224972 100644
--- 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 08cc3f29f6..5b61f876a0 100644
--- 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