[pypy-commit] pypy default: Fixes.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r46893:14091ce7892d
Date: 2011-08-29 17:39 +0200
http://bitbucket.org/pypy/pypy/changeset/14091ce7892d/

Log:	Fixes.

diff --git a/pypy/rlib/_rffi_stacklet.py b/pypy/rlib/_rffi_stacklet.py
--- a/pypy/rlib/_rffi_stacklet.py
+++ b/pypy/rlib/_rffi_stacklet.py
@@ -45,5 +45,5 @@
 destroy = llexternal('stacklet_destroy', [thread_handle, handle], lltype.Void)
 
 _translate_pointer = llexternal("_stacklet_translate_pointer",
-                                [handle, llmemory.Address],
+                                [llmemory.Address, llmemory.Address],
                                 llmemory.Address)
diff --git a/pypy/rlib/_stacklet_asmgcc.py b/pypy/rlib/_stacklet_asmgcc.py
--- a/pypy/rlib/_stacklet_asmgcc.py
+++ b/pypy/rlib/_stacklet_asmgcc.py
@@ -30,7 +30,7 @@
             p = llmemory.cast_adr_to_ptr(obj, lltype.Ptr(SUSPSTACK))
             if not p.handle:
                 return False
-            self.context = p.handle
+            self.context = llmemory.cast_ptr_to_adr(p.handle)
             anchor = p.anchor
             del p
             self.curframe = lltype.malloc(WALKFRAME, flavor='raw')
@@ -52,7 +52,7 @@
         def teardown(self):
             lltype.free(self.curframe, flavor='raw')
             lltype.free(self.otherframe, flavor='raw')
-            self.context = lltype.nullptr(_c.handle.TO)
+            self.context = llmemory.NULL
             return llmemory.NULL
 
         def next(self, obj, prev):
diff --git a/pypy/rpython/memory/gctransform/shadowstack.py b/pypy/rpython/memory/gctransform/shadowstack.py
--- a/pypy/rpython/memory/gctransform/shadowstack.py
+++ b/pypy/rpython/memory/gctransform/shadowstack.py
@@ -3,6 +3,7 @@
 from pypy.rpython.annlowlevel import llhelper
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rlib.debug import ll_assert
+from pypy.rlib.nonconst import NonConstant
 from pypy.annotation import model as annmodel
 
 
@@ -31,7 +32,7 @@
                 'root_iterator' in translator._jit2gc):
             root_iterator = translator._jit2gc['root_iterator']
             def jit_walk_stack_root(callback, addr, end):
-                root_iterator.context = llmemory.NULL
+                root_iterator.context = NonConstant(llmemory.NULL)
                 gc = self.gc
                 while True:
                     addr = root_iterator.next(gc, addr, end)