[pypy-svn] r74636 - in pypy/branch/blackhole-improvement/pypy: jit/metainterp rpython/lltypesystem

[arigo at codespeak.net]

Author: arigo
Date: Fri May 21 17:40:41 2010
New Revision: 74636

Modified:
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py
   pypy/branch/blackhole-improvement/pypy/jit/metainterp/resume.py
   pypy/branch/blackhole-improvement/pypy/rpython/lltypesystem/llmemory.py
Log:
Fix a bug.


Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/pyjitpl.py	Fri May 21 17:40:41 2010
@@ -43,10 +43,6 @@
 
 class MIFrame(object):
 
-    # for resume.py operation
-    parent_resumedata_snapshot = None
-    parent_resumedata_frame_info_list = None
-
     env = property(lambda: xxx, lambda: xxx)     # temporary: no read/write!
 
     def __init__(self, metainterp):
@@ -67,6 +63,9 @@
         self.copy_constants(self.registers_r, jitcode.constants_r, ConstPtr)
         self.copy_constants(self.registers_f, jitcode.constants_f, ConstFloat)
         self._result_argcode = 'v'
+        # for resume.py operation
+        self.parent_resumedata_snapshot = None
+        self.parent_resumedata_frame_info_list = None
 
     def copy_constants(self, registers, constants, ConstClass):
         """Copy jitcode.constants[0] to registers[255],
@@ -1548,6 +1547,7 @@
                 # raises in case it works -- which is the common case
                 self.compile(original_boxes, live_arg_boxes, start)
                 # creation of the loop was cancelled!
+                self.staticdata.log('cancelled, going on...')
 
         # Otherwise, no loop found so far, so continue tracing.
         start = len(self.history.operations)

Modified: pypy/branch/blackhole-improvement/pypy/jit/metainterp/resume.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/jit/metainterp/resume.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/jit/metainterp/resume.py	Fri May 21 17:40:41 2010
@@ -757,7 +757,7 @@
         if tag == TAGCONST:
             if tagged_eq(tagged, NULLREF):
                 return self.cpu.ts.NULLREF
-            return self.consts[num].getptr_base()
+            return self.consts[num].getref_base()
         elif tag == TAGVIRTUAL:
             virtuals = self.virtuals
             assert virtuals is not None

Modified: pypy/branch/blackhole-improvement/pypy/rpython/lltypesystem/llmemory.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/rpython/lltypesystem/llmemory.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/rpython/lltypesystem/llmemory.py	Fri May 21 17:40:41 2010
@@ -504,10 +504,12 @@
         return model.SomeInteger()
     def lltype(self):
         return lltype.Signed
-    def __cmp__(self, other):
-        if isinstance(other, AddressAsInt):
-            return cmp(self.adr, other.adr)
-        return Symbolic.__cmp__(self, other)
+    def __eq__(self, other):
+        return self.adr == cast_int_to_adr(other)
+    def __ne__(self, other):
+        return self.adr != cast_int_to_adr(other)
+    def __nonzero__(self):
+        return bool(self.adr)
     def __repr__(self):
         try:
             return '<AddressAsInt %s>' % (self.adr.ptr,)