[pypy-svn] r32762 - in pypy/dist/pypy/translator: c llvm

[mwh at codespeak.net]

Author: mwh
Date: Sat Sep 30 11:40:52 2006
New Revision: 32762

Modified:
   pypy/dist/pypy/translator/c/database.py
   pypy/dist/pypy/translator/c/funcgen.py
   pypy/dist/pypy/translator/c/genc.py
   pypy/dist/pypy/translator/llvm/database.py
Log:
revert stuff accidentally checked in when i removed the l3interp.
(it was a half-hearted attempt to make llvm's test_gc pass)


Modified: pypy/dist/pypy/translator/c/database.py
==============================================================================
--- pypy/dist/pypy/translator/c/database.py	(original)
+++ pypy/dist/pypy/translator/c/database.py	Sat Sep 30 11:40:52 2006
@@ -36,7 +36,6 @@
         self.containerstats = {}
         self.externalfuncs = {}
         self.helper2ptr = {}
-        self.raisingop2direct = True
 
         # late_initializations is for when the value you want to
         # assign to a constant object is something C doesn't think is

Modified: pypy/dist/pypy/translator/c/funcgen.py
==============================================================================
--- pypy/dist/pypy/translator/c/funcgen.py	(original)
+++ pypy/dist/pypy/translator/c/funcgen.py	Sat Sep 30 11:40:52 2006
@@ -46,10 +46,6 @@
         if db.stacklesstransformer:
             db.stacklesstransformer.transform_graph(graph)
         # apply the exception transformation
-        if self.db.raisingop2direct:
-            from pypy.translator.backendopt.raisingop2direct_call import raisingop2direct_call
-            raisingop2direct_call(db.translator, [graph])
-            
         if self.db.exctransformer:
             self.db.exctransformer.create_exception_handling(self.graph)
         # apply the gc transformation

Modified: pypy/dist/pypy/translator/c/genc.py
==============================================================================
--- pypy/dist/pypy/translator/c/genc.py	(original)
+++ pypy/dist/pypy/translator/c/genc.py	Sat Sep 30 11:40:52 2006
@@ -142,8 +142,6 @@
         # actually generating the source.
         if db is None:
             db = self.build_database()
-        from pypy.translator.backendopt.all import backend_optimizations
-        backend_optimizations(self.translator, raisingop2direct_call_all=True)
         for node in db.containerlist:
             if isinstance(node, FuncNode):
                 for funcgen in node.funcgens:

Modified: pypy/dist/pypy/translator/llvm/database.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/database.py	(original)
+++ pypy/dist/pypy/translator/llvm/database.py	Sat Sep 30 11:40:52 2006
@@ -560,12 +560,7 @@
         elif isinstance(value, llmemory.CompositeOffset):
             from_, indices, to = self.get_offset(value.offsets[0], indices)
             for item in value.offsets[1:]:
-                if not isinstance(item, llmemory.GCHeaderOffset):
-                    _, indices, to = self.get_offset(item, indices)
-
-        elif isinstance(value, llmemory.GCHeaderOffset):
-            from_ = lltype.Ptr(value.gcheaderbuilder.HDR)
-            to = "BBB" # better not use this!
+                _, indices, to = self.get_offset(item, indices)
 
         else:
             raise Exception("unsupported offset")