Author: Armin Rigo <[email protected]>
Branch: stmgc-c7
Changeset: r72711:5b52f9756edd
Date: 2014-08-07 17:41 +0200
http://bitbucket.org/pypy/pypy/changeset/5b52f9756edd/
Log: Fix imports
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
@@ -36,7 +36,6 @@
from rpython.jit.codewriter import longlong
from rpython.rlib.rarithmetic import intmask, r_uint
from rpython.rlib.objectmodel import compute_unique_id
-from rpython.jit.backend.x86 import stmtlocal
from rpython.rlib import rstm, nonconst
@@ -2723,6 +2722,7 @@
"""
if self.SEGMENT_TL != self.SEGMENT_NO:
# only for STM and not during tests
+ from rpython.jit.backend.x86 import stmtlocal
adr -= stmtlocal.threadlocal_base()
assert rx86.fits_in_32bits(adr)
return heap(self.SEGMENT_TL, adr)
@@ -2743,7 +2743,7 @@
addr0 = stmtlocal.threadlocal_base()
addr = addr1 - addr0
assert rx86.fits_in_32bits(addr)
- self.mc.MOV_rj(resloc.value, (stmtlocal.SEGMENT_TL, addr))
+ self.mc.MOV_rj(resloc.value, (self.SEGMENT_TL, addr))
def get_set_errno(self, op, loc, issue_a_write):
# this function is only called on Linux
@@ -2751,7 +2751,7 @@
addr = stmtlocal.get_errno_tl()
assert rx86.fits_in_32bits(addr)
mc = self.mc
- SEGTL = stmtlocal.SEGMENT_TL
+ SEGTL = self.SEGMENT_TL
if issue_a_write:
if isinstance(loc, RegLoc):
mc.MOV32_jr((SEGTL, addr), loc.value) # memory write from reg
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
