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

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

diff --git a/coregrind/m_dispatch/dispatch-arm-linux.S b/coregrind/m_dispatch/dispatch-arm-linux.S
index 2c0ea625cb439eb2c6a3bfcd29692d255c5fad28..95008fba23ec6af70a8c05abad1e078f740109bd 100644 (file)
--- a/coregrind/m_dispatch/dispatch-arm-linux.S
+++ b/coregrind/m_dispatch/dispatch-arm-linux.S
@@ -152,15 +152,12 @@ VG_(disp_cp_xindir):
        /* Where are we going? */
         ldr  r0, [r8, #OFFSET_arm_R15T]
 
-        /* RM ME -- stats only */
-        movw r1, #:lower16:vgPlain_stats__n_xindirs
-        movt r1, #:upper16:vgPlain_stats__n_xindirs
+        /* stats only */
+        movw r1, #:lower16:vgPlain_stats__n_xindirs_32
+        movt r1, #:upper16:vgPlain_stats__n_xindirs_32
         ldr  r2, [r1, #0]
-        adds r2, r2, #1
+        add  r2, r2, #1
         str  r2, [r1, #0]
-        ldr  r2, [r1, #4]
-        adc  r2, r2, #0
-        str  r2, [r1, #4]
         
         /* try a fast lookup in the translation cache */
         // r0 = next guest, r1,r2,r3,r4 scratch
@@ -181,14 +178,11 @@ VG_(disp_cp_xindir):
 
         /* otherwise the fast lookup failed */
         /* RM ME -- stats only */
-        movw r1, #:lower16:vgPlain_stats__n_xindir_misses
-        movt r1, #:upper16:vgPlain_stats__n_xindir_misses
+        movw r1, #:lower16:vgPlain_stats__n_xindir_misses_32
+        movt r1, #:upper16:vgPlain_stats__n_xindir_misses_32
         ldr  r2, [r1, #0]
-        adds r2, r2, #1
+        add  r2, r2, #1
         str  r2, [r1, #0]
-        ldr  r2, [r1, #4]
-        adc  r2, r2, #0
-        str  r2, [r1, #4]
 
        mov  r1, #VG_TRC_INNER_FASTMISS
         mov  r2, #0