[pypy-svn] r62722 - pypy/trunk/pypy/jit/metainterp

fijal at codespeak.net fijal at codespeak.net
Sat Mar 7 18:44:38 CET 2009


Author: fijal
Date: Sat Mar  7 18:44:37 2009
New Revision: 62722

Modified:
   pypy/trunk/pypy/jit/metainterp/executor.py
   pypy/trunk/pypy/jit/metainterp/pyjitpl.py
   pypy/trunk/pypy/jit/metainterp/resoperation.py
Log:
a bunch of missing ops


Modified: pypy/trunk/pypy/jit/metainterp/executor.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/executor.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/executor.py	Sat Mar  7 18:44:37 2009
@@ -46,6 +46,8 @@
 do_uint_add = do_int_add
 do_uint_sub = do_int_sub
 do_uint_mul = do_int_mul
+do_uint_lshift = do_int_lshift
+do_uint_rshift = do_int_rshift
 
 # ----------
 
@@ -87,6 +89,8 @@
 def do_int_is_true(cpu, args, descr=0):
     return ConstInt(bool(args[0].getint()))
 
+do_uint_is_true = do_int_is_true
+
 def do_int_neg(cpu, args, descr=0):
     return ConstInt(-args[0].getint())
 

Modified: pypy/trunk/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/pyjitpl.py	Sat Mar  7 18:44:37 2009
@@ -225,10 +225,10 @@
                     'int_lt', 'int_le', 'int_eq',
                     'int_ne', 'int_gt', 'int_ge',
                     'int_and', 'int_or', 'int_xor',
-                    'int_rshift', 'int_lshift',
+                    'int_rshift', 'int_lshift', 'uint_lshift', 'uint_rshift',
                     'uint_add', 'uint_sub', 'uint_mul',
                     'uint_lt', 'uint_le', 'uint_eq',
-                    'uint_ne', 'uint_gt', 'int_ge',
+                    'uint_ne', 'uint_gt', 'int_ge', 'uint_and',
                     ]:
         exec py.code.Source('''
             @arguments("box", "box")
@@ -245,6 +245,7 @@
         ''' % (_opimpl, _opimpl.upper())).compile()
 
     for _opimpl in ['int_is_true', 'int_neg', 'int_invert', 'bool_not',
+                    'uint_is_true',
                     ]:
         exec py.code.Source('''
             @arguments("box")

Modified: pypy/trunk/pypy/jit/metainterp/resoperation.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/resoperation.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/resoperation.py	Sat Mar  7 18:44:37 2009
@@ -109,26 +109,29 @@
     UINT_ADD               = 40
     UINT_SUB               = 41
     UINT_MUL               = 42
+    UINT_LSHIFT            = 43
+    UINT_RSHIFT            = 44
     #
-    _COMPARISON_FIRST = 44
-    INT_LT                 = 44
-    INT_LE                 = 45
-    INT_EQ                 = 46
-    INT_NE                 = 47
-    INT_GT                 = 48
-    INT_GE                 = 49
-    UINT_LT                = 50
-    UINT_LE                = 51
-    UINT_EQ                = 52
-    UINT_NE                = 53
-    UINT_GT                = 54
-    UINT_GE                = 55
+    _COMPARISON_FIRST = 45
+    INT_LT                 = 45
+    INT_LE                 = 46
+    INT_EQ                 = 47
+    INT_NE                 = 48
+    INT_GT                 = 49
+    INT_GE                 = 50
+    UINT_LT                = 51
+    UINT_LE                = 52
+    UINT_EQ                = 53
+    UINT_NE                = 54
+    UINT_GT                = 55
+    UINT_GE                = 56
     _COMPARISON_LAST = 55
     #
     INT_IS_TRUE            = 60
     INT_NEG                = 61
     INT_INVERT             = 62
     BOOL_NOT               = 63
+    UINT_IS_TRUE           = 64
     #
     OONONNULL              = 70
     OOISNULL               = 71



More information about the Pypy-commit mailing list