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

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Nov 20 16:55:00 2007
New Revision: 48848

Modified:
   pypy/branch/new-genc-tests-wrapper/pypy/translator/c/genc.py
   pypy/branch/new-genc-tests-wrapper/pypy/translator/llsupport/modwrapper.py
Log:
(cfbolz, rxe): some tests are passing


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 16:55:00 2007
@@ -185,14 +185,14 @@
         modname = CtypesModule(self.entrypoint_name,
                                self.graph_entrypoint,
                                dll_filename).create()
-
+        self.modname = modname
         self._compiled = True
         
     def import_module(self):
         assert self._compiled
         assert not self.c_ext_module
         mod = import_module_from_directory(self.c_source_filename.dirpath(),
-                                           self.c_source_filename.purebasename)
+                                           self.modname)
         self.c_ext_module = mod
         return mod
 
@@ -200,7 +200,7 @@
         assert self._compiled
         assert not self.c_ext_module
         self.c_ext_module = isolate.Isolate((str(self.c_source_filename.dirpath()),
-                                             self.c_source_filename.purebasename))
+                                             self.modname))
         return self.c_ext_module
         
     def get_entry_point(self):

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 16:55:00 2007
@@ -142,7 +142,7 @@
 # %(ARGS)r
 ll_to_res = %(ll_to_res)s
 __entrypoint__.restype = %(returntype)s
-    """
+"""
     
     TO_CTYPES = {lltype.Bool: "ctypes.c_byte",
                  lltype.SingleFloat: "ctypes.c_float",
@@ -183,6 +183,7 @@
         returntype, ll_to_res = self.build_lltype_to_ctypes_to_res(RT)
         
         self.file.write(self.epilog % locals())
+        self.file.write("\n%s = entrypoint" % (self.graph.name, ))
         self.file.close()
         return self.modfilename.purebasename