Author: Armin Rigo <ar...@tunes.org>
Branch: stackroot-speedup-2
Changeset: r75711:526dbd4749a9
Date: 2015-02-04 19:23 +0100
http://bitbucket.org/pypy/pypy/changeset/526dbd4749a9/
Log: fixes
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
@@ -1993,7 +1993,7 @@
tmploc = eax
if tmploc is argloc:
tmploc = edx
- self.mc.MOV(tmploc, threadlocal_ofs)
+ self.mc.MOV(tmploc, threadlocal_loc)
self.mc.AND_ri(tmploc.value, ~1)
threadlocal_ofs = tmploc
#
diff --git a/rpython/memory/gctransform/asmgcroot.py
b/rpython/memory/gctransform/asmgcroot.py
--- a/rpython/memory/gctransform/asmgcroot.py
+++ b/rpython/memory/gctransform/asmgcroot.py
@@ -761,9 +761,7 @@
return LOC_NOWHERE # case "outside the jit"
else:
# case "in the jit"
- from rpython.jit.backend.x86.arch import THREADLOCAL_OFS
- from rpython.jit.backend.x86.arch import PASS_ON_MY_FRAME
- stack_depth = PASS_ON_MY_FRAME + self.extra_stack_depth
+ from rpython.jit.backend.x86.arch import THREADLOCAL_OFS, WORD
return (LOC_ESP_PLUS |
((THREADLOCAL_OFS // WORD + self.extra_stack_depth) << 2))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
