Author: Remi Meier <remi.me...@gmail.com>
Branch: stmgc-c4
Changeset: r65617:c25cd18401d9
Date: 2013-07-24 17:44 +0200
http://bitbucket.org/pypy/pypy/changeset/c25cd18401d9/
Log: take the real address
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
@@ -1188,7 +1188,6 @@
rst = gcrootmap.get_root_stack_top_addr()
if gcrootmap.is_stm:
rst = rst - stmtlocal.threadlocal_base()
- assert rst > 0
assert rx86.fits_in_32bits(rst)
return rst
diff --git a/rpython/translator/stm/funcgen.py
b/rpython/translator/stm/funcgen.py
--- a/rpython/translator/stm/funcgen.py
+++ b/rpython/translator/stm/funcgen.py
@@ -96,7 +96,7 @@
def stm_get_root_stack_top(funcgen, op):
result = funcgen.expr(op.result)
- return '%s = (%s)stm_shadowstack;' % (
+ return '%s = (%s)&stm_shadowstack;' % (
result, cdecl(funcgen.lltypename(op.result), ''))
def stm_weakref_allocate(funcgen, op):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
