[pypy-svn] r53741 - in pypy/dist/pypy: rpython/memory/gctransform translator/c translator/c/src

[arigo at codespeak.net]

Author: arigo
Date: Sun Apr 13 17:34:53 2008
New Revision: 53741

Modified:
   pypy/dist/pypy/rpython/memory/gctransform/asmgcroot.py
   pypy/dist/pypy/translator/c/funcgen.py
   pypy/dist/pypy/translator/c/src/mem.h
Log:
Remove old stuff.


Modified: pypy/dist/pypy/rpython/memory/gctransform/asmgcroot.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform/asmgcroot.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform/asmgcroot.py	Sun Apr 13 17:34:53 2008
@@ -28,15 +28,10 @@
             return
         # mark the values as gc roots
         for var in livevars:
-            if 0:
-                # uses direct support in genc - more compact code,
-                # but it's probably not changing anything
-                hop.genop("asm_gcroot", [var])
-            else:
-                v_adr = gen_cast(hop.llops, llmemory.Address, var)
-                v_newaddr = hop.genop("direct_call", [c_asm_gcroot, v_adr],
-                                      resulttype=llmemory.Address)
-                hop.genop("gc_reload_possibly_moved", [v_newaddr, var])
+            v_adr = gen_cast(hop.llops, llmemory.Address, var)
+            v_newaddr = hop.genop("direct_call", [c_asm_gcroot, v_adr],
+                                  resulttype=llmemory.Address)
+            hop.genop("gc_reload_possibly_moved", [v_newaddr, var])
 
     def build_root_walker(self):
         return AsmStackRootWalker(self)

Modified: pypy/dist/pypy/translator/c/funcgen.py
==============================================================================
--- pypy/dist/pypy/translator/c/funcgen.py	(original)
+++ pypy/dist/pypy/translator/c/funcgen.py	Sun Apr 13 17:34:53 2008
@@ -765,8 +765,4 @@
     def OP_IS_EARLY_CONSTANT(self, op):
         return self.expr(op.result)  + ' = 0;' # Allways false
 
-    def OP_ASM_GCROOT(self, op):
-        value = self.expr(op.args[0])
-        return 'PYPY_GCROOT(%s);' % (value,)
-
 assert not USESLOTS or '__dict__' not in dir(FunctionCodeGenerator)

Modified: pypy/dist/pypy/translator/c/src/mem.h
==============================================================================
--- pypy/dist/pypy/translator/c/src/mem.h	(original)
+++ pypy/dist/pypy/translator/c/src/mem.h	Sun Apr 13 17:34:53 2008
@@ -21,7 +21,6 @@
 extern char __gcmapend;
 extern char __gccallshapes;
 
-#define PYPY_GCROOT(p)  asm ("/* GCROOT %0 */" : "=g" (p) : "0" (p) : "memory")
 #define pypy_asm_gcroot(p) ({void*_r; \
                asm ("/* GCROOT %0 */" : "=g" (_r) : "0" (p) : "memory"); \
                _r; })