[pypy-svn] pypy real-rffi.INT: Fix "import pypy.jit.metainterp.test", not sure whether this change is right.

amauryfa commits-noreply at bitbucket.org
Thu Mar 3 22:11:49 CET 2011


Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: real-rffi.INT
Changeset: r42414:a786782ca95c
Date: 2011-03-03 22:11 +0100
http://bitbucket.org/pypy/pypy/changeset/a786782ca95c/

Log:	Fix "import pypy.jit.metainterp.test", not sure whether this change
	is right.

diff --git a/pypy/jit/codewriter/longlong.py b/pypy/jit/codewriter/longlong.py
--- a/pypy/jit/codewriter/longlong.py
+++ b/pypy/jit/codewriter/longlong.py
@@ -7,7 +7,7 @@
 """
 
 import sys
-from pypy.rpython.lltypesystem import lltype
+from pypy.rpython.lltypesystem import lltype, rffi
 
 
 if sys.maxint > 2147483647:
@@ -34,7 +34,7 @@
 
     supports_longlong = True
     r_float_storage = rarithmetic.r_longlong
-    FLOATSTORAGE = lltype.SignedLongLong
+    FLOATSTORAGE = rffi.LONGLONG
 
     getfloatstorage = longlong2float.float2longlong
     getrealfloat    = longlong2float.longlong2float

diff --git a/pypy/jit/backend/llgraph/llimpl.py b/pypy/jit/backend/llgraph/llimpl.py
--- a/pypy/jit/backend/llgraph/llimpl.py
+++ b/pypy/jit/backend/llgraph/llimpl.py
@@ -1642,7 +1642,7 @@
 
 if longlong.FLOATSTORAGE is lltype.Float:
     s_FloatStorage = annmodel.SomeFloat()
-elif longlong.FLOATSTORAGE is lltype.SignedLongLong:
+elif longlong.FLOATSTORAGE is rffi.LONGLONG:
     s_FloatStorage = annmodel.SomeInteger(knowntype=longlong.r_float_storage)
 else:
     assert 0


More information about the Pypy-commit mailing list