Author: Armin Rigo <[email protected]>
Branch: vmprof-newstack
Changeset: r81918:fba43bc13dda
Date: 2016-01-22 16:41 +0100
http://bitbucket.org/pypy/pypy/changeset/fba43bc13dda/
Log: Fix for some tests: don't use .offset directly, call .getoffset()
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
@@ -857,7 +857,8 @@
# eax = address in the stack of a 3-words struct vmprof_stack_s
self.mc.LEA_rs(eax.value, (FRAME_FIXED_SIZE - 4) * WORD)
# old = current value of vmprof_tl_stack
- self.mc.MOV_rm(old.value, (tloc.value, cintf.vmprof_tl_stack.offset))
+ offset = cintf.vmprof_tl_stack.getoffset()
+ self.mc.MOV_rm(old.value, (tloc.value, offset))
# eax->next = old
self.mc.MOV_mr((eax.value, 0), old.value)
# eax->value = my esp
@@ -865,7 +866,7 @@
# eax->kind = VMPROF_JITTED_TAG
self.mc.MOV_mi((eax.value, WORD * 2), VMPROF_JITTED_TAG)
# save in vmprof_tl_stack the new eax
- self.mc.MOV_mr((tloc.value, cintf.vmprof_tl_stack.offset), eax.value)
+ self.mc.MOV_mr((tloc.value, offset), eax.value)
def _call_footer_vmprof(self):
from rpython.rlib.rvmprof.rvmprof import cintf
@@ -874,7 +875,8 @@
# eax = (our local vmprof_tl_stack).next
self.mc.MOV_rs(eax.value, (FRAME_FIXED_SIZE - 4 + 0) * WORD)
# save in vmprof_tl_stack the value eax
- self.mc.MOV_mr((edx.value, cintf.vmprof_tl_stack.offset), eax.value)
+ offset = cintf.vmprof_tl_stack.getoffset()
+ self.mc.MOV_mr((edx.value, offset), eax.value)
def _call_header(self):
self.mc.SUB_ri(esp.value, FRAME_FIXED_SIZE * WORD)
diff --git a/rpython/rlib/rthread.py b/rpython/rlib/rthread.py
--- a/rpython/rlib/rthread.py
+++ b/rpython/rlib/rthread.py
@@ -308,7 +308,7 @@
offset = CDefinedIntSymbolic('RPY_TLOFS_%s' % self.fieldname,
default='?')
offset.loop_invariant = loop_invariant
- self.offset = offset
+ self._offset = offset
def getraw():
if we_are_translated():
@@ -364,7 +364,7 @@
ThreadLocalField.__init__(self, lltype.Signed, 'tlref%d' % unique_id,
loop_invariant=loop_invariant)
setraw = self.setraw
- offset = self.offset
+ offset = self._offset
def get():
if we_are_translated():
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
