Merge r6391 (ppc32/64-linux: use 'ctr' for the branch address, not 'lr' since

using the latter trashes the branch predictors somehow)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6430

diff --git a/coregrind/m_dispatch/dispatch-amd64-linux.S b/coregrind/m_dispatch/dispatch-amd64-linux.S
index 001492f98111e38fb69c3dfba7b6a276c9389929..bbb631294c17b20f069a220851d1a513e9a298f8 100644 (file)
--- a/coregrind/m_dispatch/dispatch-amd64-linux.S
+++ b/coregrind/m_dispatch/dispatch-amd64-linux.S
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*--- The core dispatch loop, for jumping to a code address.       ---*/
-/*---                                             dispatch-amd64.S ---*/
+/*---                                       dispatch-amd64-linux.S ---*/
 /*--------------------------------------------------------------------*/
 
 /*

diff --git a/coregrind/m_dispatch/dispatch-ppc32-linux.S b/coregrind/m_dispatch/dispatch-ppc32-linux.S
index 4752498c688947365a57b3a0a494a8e27ada2ad1..f4e12aa988e5d9a642b6a5bab65bc1e818366750 100644 (file)
--- a/coregrind/m_dispatch/dispatch-ppc32-linux.S
+++ b/coregrind/m_dispatch/dispatch-ppc32-linux.S
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*--- The core dispatch loop, for jumping to a code address.       ---*/
-/*---                                             dispatch-ppc32.S ---*/
+/*---                                       dispatch-ppc32-linux.S ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -275,10 +275,10 @@ VG_(run_innerloop__dispatch_unprofiled):
         /* Found a match.  Call tce[1], which is 8 bytes along, since
            each tce element is a 64-bit int. */
         addi    8,5,8
-        mtlr    8
+        mtctr   8
 
        /* run the translation */
-        blrl
+        bctrl
 
         /* On return from guest code:
           r3  holds destination (original) address.
@@ -338,10 +338,10 @@ VG_(run_innerloop__dispatch_profiled):
         /* Found a match.  Call tce[1], which is 8 bytes along, since
            each tce element is a 64-bit int. */
         addi    8,5,8
-        mtlr    8
+        mtctr   8
 
        /* run the translation */
-        blrl
+        bctrl
 
         /* On return from guest code:
           r3  holds destination (original) address.

diff --git a/coregrind/m_dispatch/dispatch-ppc64-linux.S b/coregrind/m_dispatch/dispatch-ppc64-linux.S
index 6256e484bebe8289578484b609cb866125a65351..581e6c61d8df253f8e90675601b145dc67a3fecf 100644 (file)
--- a/coregrind/m_dispatch/dispatch-ppc64-linux.S
+++ b/coregrind/m_dispatch/dispatch-ppc64-linux.S
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*--- The core dispatch loop, for jumping to a code address.       ---*/
-/*---                                             dispatch-ppc64.S ---*/
+/*---                                       dispatch-ppc64-linux.S ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -298,10 +298,10 @@ VG_(run_innerloop__dispatch_unprofiled):
         /* Found a match.  Call tce[1], which is 8 bytes along, since
            each tce element is a 64-bit int. */
         addi    8,5,8
-        mtlr    8
+        mtctr   8
 
        /* run the translation */
-        blrl
+        bctrl
 
         /* On return from guest code:
           r3  holds destination (original) address.
@@ -376,10 +376,10 @@ VG_(run_innerloop__dispatch_profiled):
         /* Found a match.  Call tce[1], which is 8 bytes along, since
            each tce element is a 64-bit int. */
         addi    8,5,8
-        mtlr    8
+        mtctr   8
 
        /* run the translation */
-        blrl
+        bctrl
 
         /* On return from guest code:
           r3  holds destination (original) address.

diff --git a/coregrind/m_dispatch/dispatch-x86-linux.S b/coregrind/m_dispatch/dispatch-x86-linux.S
index 0ebae6bd55c96f27688426f5720751f718370c64..17dd3efc3282b009919dccd7ff5c95778da56dc2 100644 (file)
--- a/coregrind/m_dispatch/dispatch-x86-linux.S
+++ b/coregrind/m_dispatch/dispatch-x86-linux.S
@@ -1,7 +1,7 @@
 
 /*--------------------------------------------------------------------*/
 /*--- The core dispatch loop, for jumping to a code address.       ---*/
-/*---                                               dispatch-x86.S ---*/
+/*---                                         dispatch-x86-linux.S ---*/
 /*--------------------------------------------------------------------*/
 
 /*