[pypy-commit] pypy stmgc-c7: Fix

arigo noreply at buildbot.pypy.org
Sat Jan 31 10:37:50 CET 2015


Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r75600:3790409ce24c
Date: 2015-01-31 10:37 +0100
http://bitbucket.org/pypy/pypy/changeset/3790409ce24c/

Log:	Fix

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1944,8 +1944,8 @@
             num, ref = self._regalloc.extract_raw_stm_location()
             mc.MOV_rs(r11.value, STM_SHADOWSTACK_BASE_OFS + extra_stack)
             # r11 = base address in the shadowstack + 1
-            # write the marker to [esi - 1] and [esi + 7]
-            for (targetofs, number) in [(-1, num), (+7, ref)]:
+            # write the marker to [r11 - 1] and [r11 + 7]
+            for (targetofs, number) in [(-1, 2 * num + 1), (+7, ref)]:
                 if rx86.fits_in_32bits(number):
                     mc.MOV_mi((self.SEGMENT_NO, r11.value, targetofs), number)
                 else:


More information about the pypy-commit mailing list