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

[rxe at codespeak.net]

Author: rxe
Date: Tue Nov 20 15:10:55 2007
New Revision: 48838

Modified:
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/modwrapper.py
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/buildllvm.py
Log:
(cfbolz, rxe) fix llvm tests

Modified: pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/modwrapper.py
==============================================================================
--- pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/modwrapper.py	(original)
+++ pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/modwrapper.py	Tue Nov 20 15:10:55 2007
@@ -163,7 +163,8 @@
         self.file.write(self.prolog % self.dllname)
         
         g = self.graph
-        name = self.genllvm.entry_name
+
+        name = self.entryname
 
         ARGS = [a.concretetype for a in g.startblock.inputargs]
         inputargtypes, to_llargs = self.build_args_to_ctypes_to_lltype(ARGS)

Modified: pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/buildllvm.py
==============================================================================
--- pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/buildllvm.py	(original)
+++ pypy/branch/new-genc-tests-wrapper/pypy/translator/llvm/buildllvm.py	Tue Nov 20 15:10:55 2007
@@ -5,7 +5,7 @@
 
 from pypy.translator.tool import stdoutcapture
 from pypy.translator.llvm.log import log
-from pypy.translator.llvm.modwrapper import CtypesModule
+from pypy.translator.llsupport.modwrapper import CtypesModule
 
 def llvm_is_on_path():
     if py.path.local.sysfind("llvm-as") is None or \
@@ -133,7 +133,11 @@
 
         try:
             self.execute_cmds()
-            modname = CtypesModule(self.genllvm, "%s.so" % base).create()
+            gen = self.genllvm
+            modname = CtypesModule(gen.entry_name,
+                                   gen.filename,
+                                   gen.entrynode.graph,
+                                   "%s.so" % base).create()
 
         finally:
             self.lastdir.chdir()