[pypy-svn] pypy 32ptr-on-64bit: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 32ptr-on-64bit
Changeset: r43424:ed5ecec37b3d
Date: 2011-04-17 11:31 +0200
http://bitbucket.org/pypy/pypy/changeset/ed5ecec37b3d/

Log:	merge heads

diff --git a/pypy/jit/metainterp/warmstate.py b/pypy/jit/metainterp/warmstate.py
--- a/pypy/jit/metainterp/warmstate.py
+++ b/pypy/jit/metainterp/warmstate.py
@@ -64,34 +64,23 @@
 
 @specialize.ll()
 def wrap(cpu, value, in_const_box=False):
-    if isinstance(lltype.typeOf(value), lltype.Ptr):
-        if lltype.typeOf(value).TO._gckind == 'gc':
-            value = lltype.cast_opaque_ptr(llmemory.GCREF, value)
-            if in_const_box:
-                return history.ConstPtr(value)
-            else:
-                return history.BoxPtr(value)
+    value = unspecialize_value(value)
+    TYPE = lltype.typeOf(value)
+    if isinstance(TYPE, lltype.Ptr):
+        if in_const_box:
+            return history.ConstPtr(value)
         else:
-            adr = llmemory.cast_ptr_to_adr(value)
-            value = heaptracker.adr2int(adr)
-            # fall through to the end of the function
-    elif isinstance(lltype.typeOf(value), ootype.OOType):
-        value = ootype.cast_to_object(value)
+            return history.BoxPtr(value)
+    if isinstance(TYPE, ootype.OOType):
         if in_const_box:
             return history.ConstObj(value)
         else:
             return history.BoxObj(value)
-    elif isinstance(value, float):
-        value = longlong.getfloatstorage(value)
+    if TYPE == lltype.Float:
         if in_const_box:
             return history.ConstFloat(value)
         else:
             return history.BoxFloat(value)
-    elif isinstance(value, str) or isinstance(value, unicode):
-        assert len(value) == 1     # must be a character
-        value = ord(value)
-    else:
-        value = intmask(value)
     if in_const_box:
         return history.ConstInt(value)
     else: