[pypy-svn] r48836 - in pypy/branch/new-genc-tests-wrapper/pypy/translator: c llsupport llsupport/test llvm

[rxe at codespeak.net]

Author: rxe
Date: Tue Nov 20 15:01:56 2007
New Revision: 48836

Added:
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/   (props changed)
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/test/   (props changed)
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/test/__init__.py
Modified:
   pypy/branch/new-genc-tests-wrapper/pypy/translator/c/genc.py
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/modwrapper.py
Log:
(cfbolz, rxe) add empty llsupport

Modified: pypy/branch/new-genc-tests-wrapper/pypy/translator/c/genc.py
==============================================================================
--- pypy/branch/new-genc-tests-wrapper/pypy/translator/c/genc.py	(original)
+++ pypy/branch/new-genc-tests-wrapper/pypy/translator/c/genc.py	Tue Nov 20 15:01:56 2007
@@ -167,10 +167,9 @@
     standalone = False
     c_ext_module = None 
 
-    def getentrypointptr(self, obj=None):
-        if obj is None:
-            obj = self.entrypoint
-        return lltype.pyobjectptr(obj)
+    def getentrypointptr(self):
+        bk = self.translator.annotator.bookkeeper
+        return getfunctionptr(bk.getdesc(self.entrypoint).getuniquegraph())
 
     def compile(self):
         assert self.c_source_filename 

Added: pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/test/__init__.py
==============================================================================

Modified: pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/modwrapper.py
==============================================================================
--- pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/modwrapper.py	(original)
+++ pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/modwrapper.py	Tue Nov 20 15:01:56 2007
@@ -150,18 +150,19 @@
                  lltype.UniChar: "ctypes.c_uint",
                  }
 
-    def __init__(self, genllvm, dllname):
-        self.genllvm = genllvm
+    def __init__(self, entryname, filename, graph, dllname):
+        self.entryname = entryname
         self.dllname = dllname
-        basename = self.genllvm.entry_name + '_wrapper.py'
-        self.modfilename = genllvm.filename.new(basename=basename)
+        basename = self.entryname + '_wrapper.py'
+        self.modfilename = filename.new(basename=basename)
         self.count = 0
-
+        self.graph = graph
+        
     def create(self):
         self.file = open(str(self.modfilename), 'w')
         self.file.write(self.prolog % self.dllname)
         
-        g = self.genllvm.entrynode.graph  
+        g = self.graph
         name = self.genllvm.entry_name
 
         ARGS = [a.concretetype for a in g.startblock.inputargs]