[pypy-svn] r62300 - pypy/branch/pyjitpl5/pypy/jit/metainterp

[fijal at codespeak.net]

Author: fijal
Date: Sun Mar  1 16:54:39 2009
New Revision: 62300

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/history.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
   pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py
Log:
A couple of asserts and intmask. Might break translation though, will
fix later


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	Sun Mar  1 16:54:39 2009
@@ -237,6 +237,7 @@
     type = 'int'
 
     def __init__(self, value=0):
+        assert isinstance(value, int)
         self.value = value
 
     def clonebox(self):

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/pyjitpl.py	Sun Mar  1 16:54:39 2009
@@ -15,6 +15,7 @@
 from pypy.jit.metainterp.heaptracker import (get_vtable_for_gcstruct,
                                              populate_type_cache)
 from pypy.jit.metainterp import codewriter, optimize
+from pypy.rlib.rarithmetic import intmask
 
 # ____________________________________________________________
 
@@ -894,6 +895,7 @@
                     cls = ConstInt
                 else:
                     cls = BoxInt
+                value = intmask(value)
             box = cls(value)
             original_boxes.append(box)
             self._initialize_from_start(original_boxes, num_green_args-1,

Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/resoperation.py	Sun Mar  1 16:54:39 2009
@@ -18,6 +18,7 @@
         assert isinstance(opnum, int)
         self.opnum = opnum
         self.args = list(args)
+        assert not isinstance(result, list)
         self.result = result
 
     def __repr__(self):