[pypy-svn] r64241 - in pypy/trunk/pypy: module/posix rpython/lltypesystem/test rpython/memory/gctransform rpython/module rpython/numpy/test translator/c

pedronis at codespeak.net pedronis at codespeak.net
Fri Apr 17 12:22:51 CEST 2009


Author: pedronis
Date: Fri Apr 17 12:22:50 2009
New Revision: 64241

Removed:
   pypy/trunk/pypy/rpython/memory/gctransform/llvmgcroot.py
Modified:
   pypy/trunk/pypy/module/posix/__init__.py
   pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py
   pypy/trunk/pypy/rpython/module/ll_os.py
   pypy/trunk/pypy/rpython/numpy/test/test_array.py
   pypy/trunk/pypy/translator/c/gc.py
   pypy/trunk/pypy/translator/c/genc.py
   pypy/trunk/pypy/translator/c/node.py
Log:
deal with the last llvm references

Modified: pypy/trunk/pypy/module/posix/__init__.py
==============================================================================
--- pypy/trunk/pypy/module/posix/__init__.py	(original)
+++ pypy/trunk/pypy/module/posix/__init__.py	Fri Apr 17 12:22:50 2009
@@ -104,13 +104,6 @@
         if hasattr(os, name):
             interpleveldefs[name] = 'interp_posix.' + name
 
-    def setup_after_space_initialization(self):
-        """NOT_RPYTHON"""
-        space = self.space
-        config = space.config
-        if config.translating and config.translation.backend == "llvm":
-            space.delattr(self, space.wrap("execv"))
-
     def startup(self, space):
         from pypy.module.posix import interp_posix
         interp_posix.get(space).startup(space)

Modified: pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py
==============================================================================
--- pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py	(original)
+++ pypy/trunk/pypy/rpython/lltypesystem/test/test_rffi.py	Fri Apr 17 12:22:50 2009
@@ -742,30 +742,6 @@
     def test_generate_return_char_tests(self):
         py.test.skip("GenC does not handle char return values correctly")
 
-class TestLLVMRffi(BaseTestRffi):
-    def setup_class(cls):
-        py.test.skip("llvm backend removed for now")
-
-    def compile(self, func, args, **kwds):
-        # pfff....
-        if 'backendopt' in kwds:
-            kwds['optimize'] = kwds['backendopt']
-            del kwds['backendopt']
-        from pypy.translator.llvm.test.runtest import compile_function as compile_llvm
-        return compile_llvm(func, args, **kwds)
-
-    def test_nonmovingbuffer(self):
-        py.test.skip("Somewhat buggy...")
-
-    test_nonmoving = test_nonmovingbuffer
-
-    def test_nonmovingbuffer_semispace(self):
-        py.test.skip("LLVM backend error - unsupported operator")
-
-    def test_hashdefine(self):
-        py.test.skip("Macros cannot be called as llexternals by design, rffi does not have any special support for them")
-
-
 def test_enforced_args():
     from pypy.annotation.model import s_None
     from pypy.rpython.annlowlevel import MixLevelHelperAnnotator

Modified: pypy/trunk/pypy/rpython/module/ll_os.py
==============================================================================
--- pypy/trunk/pypy/rpython/module/ll_os.py	(original)
+++ pypy/trunk/pypy/rpython/module/ll_os.py	Fri Apr 17 12:22:50 2009
@@ -83,7 +83,7 @@
     def __init__(self):
         self.configure(CConfig)
 
-        # we need an indirection via c functions to get macro calls working on llvm
+        # we need an indirection via c functions to get macro calls working on llvm XXX still?
         if hasattr(os, 'WCOREDUMP'):
             decl_snippet = """
             %(ret_type)s pypy_macro_wrapper_%(name)s (int status);

Modified: pypy/trunk/pypy/rpython/numpy/test/test_array.py
==============================================================================
--- pypy/trunk/pypy/rpython/numpy/test/test_array.py	(original)
+++ pypy/trunk/pypy/rpython/numpy/test/test_array.py	Fri Apr 17 12:22:50 2009
@@ -26,7 +26,6 @@
 from pypy.rpython.numpy.aarray import SomeArray
 
 test_c_compile = True
-test_llvm_compile = False
 
 
 def access_array(item):

Modified: pypy/trunk/pypy/translator/c/gc.py
==============================================================================
--- pypy/trunk/pypy/translator/c/gc.py	(original)
+++ pypy/trunk/pypy/translator/c/gc.py	Fri Apr 17 12:22:50 2009
@@ -5,7 +5,7 @@
      typeOf, Ptr, ContainerType, RttiStruct, \
      RuntimeTypeInfo, getRuntimeTypeInfo, top_container
 from pypy.rpython.memory.gctransform import \
-     refcounting, boehm, framework, llvmgcroot, asmgcroot
+     refcounting, boehm, framework, asmgcroot
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 
@@ -316,9 +316,6 @@
         o = top_container(defnode.obj)
         return defnode.db.gctransformer.gc_field_values_for(o)
 
-class LLVMGcRootFrameworkGcPolicy(FrameworkGcPolicy):
-    transformerclass = llvmgcroot.LLVMGcRootFrameworkGCTransformer
-
 class AsmGcRootFrameworkGcPolicy(FrameworkGcPolicy):
     transformerclass = asmgcroot.AsmGcRootFrameworkGCTransformer
 
@@ -328,7 +325,6 @@
     'ref': RefcountingGcPolicy,
     'none': NoneGcPolicy,
     'framework': FrameworkGcPolicy,
-    'framework+llvmgcroot': LLVMGcRootFrameworkGcPolicy,
     'framework+asmgcroot': AsmGcRootFrameworkGcPolicy,
 }
 

Modified: pypy/trunk/pypy/translator/c/genc.py
==============================================================================
--- pypy/trunk/pypy/translator/c/genc.py	(original)
+++ pypy/trunk/pypy/translator/c/genc.py	Fri Apr 17 12:22:50 2009
@@ -179,9 +179,7 @@
     def get_gcpolicyclass(self):
         if self.gcpolicy is None:
             name = self.config.translation.gctransformer
-            if self.config.translation.gcrootfinder == "llvmgc":
-                name = "%s+llvmgcroot" % (name,)
-            elif self.config.translation.gcrootfinder == "asmgcc":
+            if self.config.translation.gcrootfinder == "asmgcc":
                 name = "%s+asmgcroot" % (name,)
             return gc.name_to_gcpolicy[name]
         return self.gcpolicy

Modified: pypy/trunk/pypy/translator/c/node.py
==============================================================================
--- pypy/trunk/pypy/translator/c/node.py	(original)
+++ pypy/trunk/pypy/translator/c/node.py	Fri Apr 17 12:22:50 2009
@@ -910,7 +910,7 @@
     ptarget = obj._dereference()
     wrapper = db.gcpolicy.convert_weakref_to(ptarget)
     container = wrapper._obj
-    obj._converted_weakref = container     # hack for genllvm :-/
+    #obj._converted_weakref = container     # hack for genllvm :-/
     return db.getcontainernode(container, _dont_write_c_code=False)
 
 



More information about the Pypy-commit mailing list