[pypy-commit] pypy stm-gc: Tentative: re-enable root stack walking, just by using the ShadowStack

arigo noreply at buildbot.pypy.org
Sat Feb 25 22:22:01 CET 2012


Author: Armin Rigo <arigo at tunes.org>
Branch: stm-gc
Changeset: r52902:ae34644cc94c
Date: 2012-02-25 19:54 +0100
http://bitbucket.org/pypy/pypy/changeset/ae34644cc94c/

Log:	Tentative: re-enable root stack walking, just by using the
	ShadowStack approach.

diff --git a/pypy/rpython/memory/gctransform/stmframework.py b/pypy/rpython/memory/gctransform/stmframework.py
--- a/pypy/rpython/memory/gctransform/stmframework.py
+++ b/pypy/rpython/memory/gctransform/stmframework.py
@@ -1,5 +1,5 @@
 from pypy.rpython.memory.gctransform.framework import FrameworkGCTransformer
-from pypy.rpython.memory.gctransform.framework import BaseRootWalker
+from pypy.rpython.memory.gctransform.shadowstack import ShadowStackRootWalker
 from pypy.rpython.lltypesystem import llmemory
 from pypy.annotation import model as annmodel
 
@@ -28,12 +28,6 @@
             self.gcdata.gc.commit_transaction.im_func,
             [s_gc], annmodel.s_None)
 
-    def push_roots(self, hop, keep_current_args=False):
-        pass
-
-    def pop_roots(self, hop, livevars):
-        pass
-
     def build_root_walker(self):
         return StmStackRootWalker(self)
 
@@ -69,7 +63,5 @@
         hop.genop("direct_call", [self.stm_commit_ptr, self.c_const_gc])
 
 
-class StmStackRootWalker(BaseRootWalker):
-
-    def walk_stack_roots(self, collect_stack_root):
-        raise NotImplementedError
+class StmStackRootWalker(ShadowStackRootWalker):
+    pass


More information about the pypy-commit mailing list