[pypy-svn] r46531 - in pypy/dist/pypy/translator: cli jvm llvm

[antocuni at codespeak.net]

Author: antocuni
Date: Thu Sep 13 11:11:37 2007
New Revision: 46531

Modified:
   pypy/dist/pypy/translator/cli/cts.py
   pypy/dist/pypy/translator/jvm/database.py
   pypy/dist/pypy/translator/llvm/database.py
Log:
comment out references to WeakGcAddress; should these be replaced with something else?



Modified: pypy/dist/pypy/translator/cli/cts.py
==============================================================================
--- pypy/dist/pypy/translator/cli/cts.py	(original)
+++ pypy/dist/pypy/translator/cli/cts.py	Thu Sep 13 11:11:37 2007
@@ -7,7 +7,6 @@
 from py.builtin import set
 from pypy.rpython.lltypesystem import lltype
 from pypy.rpython.ootypesystem import ootype
-from pypy.rpython.lltypesystem.llmemory import WeakGcAddress
 from pypy.translator.cli.option import getoption
 from pypy.translator.cli import oopspec
 
@@ -133,7 +132,7 @@
     ootype.Class: types.type,
     ootype.String: types.string,
     ootype.StringBuilder: types.string_builder,
-    WeakGcAddress: types.weakref,
+    #WeakGcAddress: types.weakref,
 
     # maps generic types to their ordinal
     ootype.List.SELFTYPE_T: types.list,

Modified: pypy/dist/pypy/translator/jvm/database.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/database.py	(original)
+++ pypy/dist/pypy/translator/jvm/database.py	Thu Sep 13 11:11:37 2007
@@ -17,7 +17,6 @@
      jStringBuilder, jInt, jVoid, jString, jChar, jObject, \
      jThrowable, JvmNativeClass
 from pypy.translator.jvm.builtin import JvmBuiltInType
-from pypy.rpython.lltypesystem.llmemory import WeakGcAddress
 
 from pypy.translator.oosupport.database import Database as OODatabase
 from pypy.rpython.ootypesystem.bltregistry import ExternalType
@@ -461,7 +460,7 @@
         ootype.UniChar:          jvmtype.jChar,
         ootype.Class:            jvmtype.jClass,
         ootype.ROOT:             jvmtype.jObject,  # treat like a scalar
-        WeakGcAddress:           jvmtype.jWeakRef,
+        #WeakGcAddress:           jvmtype.jWeakRef,
     }
 
     # Dictionary for non-scalar types; in this case, if we see the key, we

Modified: pypy/dist/pypy/translator/llvm/database.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/database.py	(original)
+++ pypy/dist/pypy/translator/llvm/database.py	Thu Sep 13 11:11:37 2007
@@ -193,8 +193,8 @@
                         ct = lltype.typeOf(ptrvalue)
                     else:
                         return                        
-                elif ct is llmemory.WeakGcAddress:
-                    return # XXX sometime soon
+##                elif ct is llmemory.WeakGcAddress:
+##                    return # XXX sometime soon
                 else:
                     return
             else:
@@ -368,7 +368,7 @@
             lltype.UnsignedLongLong: "ulong",
             lltype.SignedLongLong: "long",
             llmemory.Address: "sbyte*",
-            llmemory.WeakGcAddress: "sbyte*",
+            #llmemory.WeakGcAddress: "sbyte*",
             }
 
         # 32 bit platform
@@ -396,7 +396,7 @@
             lltype.Bool : self.repr_bool,
             lltype.Void : self.repr_void,
             llmemory.Address : self.repr_address,
-            llmemory.WeakGcAddress : self.repr_weakgcaddress,
+            #llmemory.WeakGcAddress : self.repr_weakgcaddress,
             }        
 
         try: