Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r57287:997afb65da15
Date: 2012-09-11 15:57 +0200
http://bitbucket.org/pypy/pypy/changeset/997afb65da15/
Log: Pass the test.
diff --git a/pypy/jit/backend/test/runner_test.py
b/pypy/jit/backend/test/runner_test.py
--- a/pypy/jit/backend/test/runner_test.py
+++ b/pypy/jit/backend/test/runner_test.py
@@ -2080,7 +2080,7 @@
record = []
#
S = lltype.GcStruct('S', ('tid', lltype.Signed))
- FUNC = self.FuncType([lltype.Ptr(S)], lltype.Void)
+ FUNC = self.FuncType([lltype.Ptr(S)], lltype.Ptr(S))
func_ptr = llhelper(lltype.Ptr(FUNC), func_void)
funcbox = self.get_funcbox(self.cpu, func_ptr)
class WriteBarrierDescr(WBDescrForTests):
diff --git a/pypy/jit/backend/x86/assembler.py
b/pypy/jit/backend/x86/assembler.py
--- a/pypy/jit/backend/x86/assembler.py
+++ b/pypy/jit/backend/x86/assembler.py
@@ -398,7 +398,7 @@
mc.CALL(imm(func))
#
if descr.returns_modified_object:
- mc.MOV_sr(correct_esp_by, eax.value)
+ mc.MOV_sr(correct_esp_by + WORD, eax.value)
#
if withcards:
# A final TEST8 before the RET, for the caller. Careful to
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
