From: Julian Seward <jseward@acm.org>
Date: Tue, 26 Dec 2006 03:53:52 +0000 (+0000)
Subject: Merge r6391 (ppc32/64-linux: use 'ctr' for the branch address, not 'lr' since
X-Git-Tag: svn/VALGRIND_3_2_2~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa9f11b5454f93b3b980e205d6fc4a2c595e6840;p=thirdparty%2Fvalgrind.git

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 001492f981..bbb631294c 100644
--- 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 4752498c68..f4e12aa988 100644
--- 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 6256e484be..581e6c61d8 100644
--- 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 0ebae6bd55..17dd3efc32 100644
--- 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 ---*/
 /*--------------------------------------------------------------------*/
 
 /*