[pypy-svn] r65170 - in pypy/branch/pyjitpl5/pypy: jit/metainterp rpython/lltypesystem

[arigo at codespeak.net]

Author: arigo
Date: Fri May  8 22:29:09 2009
New Revision: 65170

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py
   pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rffi.py
Log:
Argh.  Complain loudly when we try to do anything with
a LONGLONG.  This was an obscure issue when translating pypy.


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py	Fri May  8 22:29:09 2009
@@ -1,6 +1,6 @@
 
 from pypy.rpython.extregistry import ExtRegistryEntry
-from pypy.rpython.lltypesystem import lltype, llmemory
+from pypy.rpython.lltypesystem import lltype, llmemory, rffi
 from pypy.rpython.ootypesystem import ootype
 from pypy.rlib.objectmodel import we_are_translated, r_dict, Symbolic
 from pypy.rlib.rarithmetic import intmask
@@ -24,6 +24,9 @@
     if TYPE is lltype.Void:
         return "void"
     elif isinstance(TYPE, lltype.Primitive):
+        # XXX fix this for oo...
+        if rffi.sizeof(TYPE) > rffi.sizeof(lltype.Signed):
+            raise NotImplementedError("type %s is too large" % TYPE)
         return "int"
     elif isinstance(TYPE, lltype.Ptr):
         if TYPE.TO._gckind == 'raw':

Modified: pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rffi.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rffi.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/lltypesystem/rffi.py	Fri May  8 22:29:09 2009
@@ -730,7 +730,7 @@
         return size
     if isinstance(tp, lltype.Ptr):
         tp = ULONG     # XXX!
-    if tp is lltype.Char:
+    if tp is lltype.Char or tp is lltype.Bool:
         return 1
     if tp is lltype.UniChar:
         return r_wchar_t.BITS/8