Use 32-bit XIndir counter incs, instead of 64-bit, as per r12527.

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

diff --git a/coregrind/m_dispatch/dispatch-ppc32-linux.S b/coregrind/m_dispatch/dispatch-ppc32-linux.S
index 4a2c5d3b8757d22c177450fad57cdc30cb98bcee..6cfe4b53c59b2a48583951fdfa79f56f2d6b868b 100644 (file)
--- a/coregrind/m_dispatch/dispatch-ppc32-linux.S
+++ b/coregrind/m_dispatch/dispatch-ppc32-linux.S
@@ -440,13 +440,10 @@ VG_(disp_cp_xindir):
         lwz     3,OFFSET_ppc32_CIA(31)
 
         /* stats only */
-        lis     5,VG_(stats__n_xindirs)@ha
-        addi    5,5,VG_(stats__n_xindirs)@l
-        lwz     6,4(5)
-        addic.  6,6,1
-        stw     6,4(5)
+        lis     5,VG_(stats__n_xindirs_32)@ha
+        addi    5,5,VG_(stats__n_xindirs_32)@l
         lwz     6,0(5)
-        addze   6,6
+        addi    6,6,1
         stw     6,0(5)
         
         /* r5 = &VG_(tt_fast) */
@@ -469,13 +466,10 @@ VG_(disp_cp_xindir):
 
 fast_lookup_failed:
         /* stats only */
-        lis     5,VG_(stats__n_xindir_misses)@ha
-        addi    5,5,VG_(stats__n_xindir_misses)@l
-        lwz     6,4(5)
-        addic.  6,6,1
-        stw     6,4(5)
+        lis     5,VG_(stats__n_xindir_misses_32)@ha
+        addi    5,5,VG_(stats__n_xindir_misses_32)@l
         lwz     6,0(5)
-        addze   6,6
+        addi    6,6,1
         stw     6,0(5)
 
         li      6,VG_TRC_INNER_FASTMISS

diff --git a/coregrind/m_dispatch/dispatch-ppc64-linux.S b/coregrind/m_dispatch/dispatch-ppc64-linux.S
index 9083be138c41c2274ab4edd53eeea8a4cf5b9323..af847486464b5a305aaa28bb5b976f0aa67519a7 100644 (file)
--- a/coregrind/m_dispatch/dispatch-ppc64-linux.S
+++ b/coregrind/m_dispatch/dispatch-ppc64-linux.S
@@ -46,10 +46,10 @@
 .section ".toc","aw"
 .tocent__vgPlain_tt_fast:
         .tc vgPlain_tt_fast[TC],vgPlain_tt_fast
-.tocent__vgPlain_stats__n_xindirs:
-        .tc vgPlain_stats__n_xindirs[TC],vgPlain_stats__n_xindirs
-.tocent__vgPlain_stats__n_xindir_misses:
-        .tc vgPlain_stats__n_xindir_misses[TC],vgPlain_stats__n_xindir_misses
+.tocent__vgPlain_stats__n_xindirs_32:
+        .tc vgPlain_stats__n_xindirs_32[TC],vgPlain_stats__n_xindirs_32
+.tocent__vgPlain_stats__n_xindir_misses_32:
+        .tc vgPlain_stats__n_xindir_misses_32[TC],vgPlain_stats__n_xindir_misses_32
 .tocent__vgPlain_machine_ppc64_has_VMX:
         .tc vgPlain_machine_ppc64_has_VMX[TC],vgPlain_machine_ppc64_has_VMX
 
@@ -456,10 +456,10 @@ VG_(disp_cp_xindir):
         ld      3,OFFSET_ppc64_CIA(31)
 
         /* stats only */
-       ld      5, .tocent__vgPlain_stats__n_xindirs@toc(2)
-        ld      6,0(5)
+       ld      5, .tocent__vgPlain_stats__n_xindirs_32@toc(2)
+        lwz     6,0(5)
         addi    6,6,1
-        std     6,0(5)
+        stw     6,0(5)
 
        /* r5 = &VG_(tt_fast) */
        ld      5, .tocent__vgPlain_tt_fast@toc(2) /* &VG_(tt_fast) */
@@ -481,10 +481,10 @@ VG_(disp_cp_xindir):
 
 .fast_lookup_failed:
         /* stats only */
-       ld      5, .tocent__vgPlain_stats__n_xindir_misses@toc(2)
-        ld      6,0(5)
+       ld      5, .tocent__vgPlain_stats__n_xindir_misses_32@toc(2)
+        lwz     6,0(5)
         addi    6,6,1
-        std     6,0(5)
+        stw     6,0(5)
 
         li      6,VG_TRC_INNER_FASTMISS
         li      7,0