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

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

diff --git a/coregrind/m_dispatch/dispatch-amd64-darwin.S b/coregrind/m_dispatch/dispatch-amd64-darwin.S
index 0180fc17d644f908fd6c045029a23615d9993846..58a504e6dce5fbe02a8d6ee4cf53586bae6f48aa 100644 (file)
--- a/coregrind/m_dispatch/dispatch-amd64-darwin.S
+++ b/coregrind/m_dispatch/dispatch-amd64-darwin.S
@@ -205,9 +205,9 @@ VG_(disp_cp_xindir):
        /* Where are we going? */
        movq    OFFSET_amd64_RIP(%rbp), %rax
 
-        /* RM ME -- stats only */
-        movabsq $_vgPlain_stats__n_xindirs, %r10
-        addq    $1, (%r10)
+        /* stats only */
+        movabsq $VG_(stats__n_xindirs_32), %r10
+        addl    $1, (%r10)
         
        /* try a fast lookup in the translation cache */
        movabsq $VG_(tt_fast), %rcx
@@ -224,9 +224,9 @@ VG_(disp_cp_xindir):
        ud2     /* persuade insn decoders not to speculate past here */
 
 fast_lookup_failed:
-        /* RM ME -- stats only */
-        movabsq $_vgPlain_stats__n_xindir_misses, %r10
-        addq    $1, %r10
+        /* stats only */
+        movabsq $VG_(stats__n_xindir_misses_32), %r10
+        addl    $1, (%r10)
 
        movq    $VG_TRC_INNER_FASTMISS, %rax
         movq    $0, %rdx

diff --git a/coregrind/m_dispatch/dispatch-x86-darwin.S b/coregrind/m_dispatch/dispatch-x86-darwin.S
index 275d6890c7b7e0c056a8e11d0c661ccc0fbddc56..31b8d7c9a6f259cf3680178f8fba378883eb0cd0 100644 (file)
--- a/coregrind/m_dispatch/dispatch-x86-darwin.S
+++ b/coregrind/m_dispatch/dispatch-x86-darwin.S
@@ -198,9 +198,8 @@ VG_(disp_cp_xindir):
        /* Where are we going? */
        movl    OFFSET_x86_EIP(%ebp), %eax
 
-        /* RM ME -- stats only */
-        addl    $1, _vgPlain_stats__n_xindirs
-        adcl    $0, _vgPlain_stats__n_xindirs+4
+        /* stats only */
+        addl    $1, VG_(stats__n_xindirs_32)
         
         /* try a fast lookup in the translation cache */
         movl    %eax, %ebx                      /* next guest addr */
@@ -215,9 +214,8 @@ VG_(disp_cp_xindir):
        ud2     /* persuade insn decoders not to speculate past here */
 
 fast_lookup_failed:
-        /* RM ME -- stats only */
-        addl    $1, _vgPlain_stats__n_xindir_misses
-        adcl    $0, _vgPlain_stats__n_xindir_misses+4
+        /* stats only */
+        addl    $1, VG_(stats__n_xindir_misses_32)
 
        movl    $VG_TRC_INNER_FASTMISS, %eax
         movl    $0, %edx