[pypy-svn] r34879 - in pypy/dist/pypy/jit: timeshifter tl

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Nov 22 21:26:44 2006
New Revision: 34879

Modified:
   pypy/dist/pypy/jit/timeshifter/rcontainer.py
   pypy/dist/pypy/jit/tl/tlc.py
Log:
(arigo around, pedronis)

oops, promoting an object instead of its type. Slightly saner code, we still need to be much more careful
about merges and likeyl split more to avoid forcing.



Modified: pypy/dist/pypy/jit/timeshifter/rcontainer.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/rcontainer.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/rcontainer.py	Wed Nov 22 21:26:44 2006
@@ -6,6 +6,7 @@
 
 from pypy.rpython.lltypesystem import lloperation
 debug_print = lloperation.llop.debug_print
+debug_pdb = lloperation.llop.debug_pdb
 
 class AbstractContainer(object):
     __slots__ = []
@@ -250,6 +251,7 @@
                 self.ownbox.content = None
                 return
         debug_print(lltype.Void, "FORCE CONTAINER")
+        #debug_pdb(lltype.Void)
         genvar = builder.genop_malloc_fixedsize(typedesc.alloctoken)
         # force the box pointing to this VirtualStruct
         self.ownbox.genvar = genvar

Modified: pypy/dist/pypy/jit/tl/tlc.py
==============================================================================
--- pypy/dist/pypy/jit/tl/tlc.py	(original)
+++ pypy/dist/pypy/jit/tl/tlc.py	Wed Nov 22 21:26:44 2006
@@ -226,7 +226,7 @@
 
             elif opcode == BR_COND:
                 cond = stack.pop()
-                hint(cond, promote=True)
+                hint(cond.__class__, promote=True)
                 if cond.t():
                     pc += char2int(code[pc])
                 pc += 1