[pypy-svn] r63943 - in pypy/branch/pyjitpl5-simplify/pypy/jit: backend/llgraph metainterp

[arigo at codespeak.net]

Author: arigo
Date: Fri Apr 10 17:50:41 2009
New Revision: 63943

Modified:
   pypy/branch/pyjitpl5-simplify/pypy/jit/backend/llgraph/runner.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/executor.py
   pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/history.py
Log:
Other rtyping fixes.  But test_zrpy_basic is still not passing.


Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/backend/llgraph/runner.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/backend/llgraph/runner.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/backend/llgraph/runner.py	Fri Apr 10 17:50:41 2009
@@ -117,7 +117,7 @@
                 elif isinstance(x, history.ConstAddr):
                     llimpl.compile_add_int_const(c, x.getint())
                 elif isinstance(x, history.ConstObj):
-                    llimpl.compile_add_ptr_const(c, x.value, TYPE=ootype.Object)
+                    llimpl.compile_add_ptr_const(c, x.value, ootype.Object)
                 else:
                     raise Exception("%s args contain: %r" % (op.getopname(),
                                                              x))
@@ -131,7 +131,7 @@
                 elif isinstance(x, history.BoxPtr):
                     var2index[x] = llimpl.compile_add_ptr_result(c)
                 elif isinstance(x, history.BoxObj):
-                    var2index[x] = llimpl.compile_add_ptr_result(c, TYPE=ootype.Object)
+                    var2index[x] = llimpl.compile_add_ptr_result(c, ootype.Object)
                 else:
                     raise Exception("%s.result contain: %r" % (op.getopname(),
                                                                x))

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/executor.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/executor.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/executor.py	Fri Apr 10 17:50:41 2009
@@ -283,7 +283,7 @@
     return func(cpu, argboxes, descr)
 execute._annspecialcase_ = 'specialize:arg(1)'
 
-def execute_nonspec(cpu, opnum, argboxes, descr=None):
+def _execute_nonspec(cpu, opnum, argboxes, descr=None):
     check_descr(descr)
     func = cpu._execute_list[opnum]
     return func(cpu, argboxes, descr)

Modified: pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/history.py
==============================================================================
--- pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/history.py	(original)
+++ pypy/branch/pyjitpl5-simplify/pypy/jit/metainterp/history.py	Fri Apr 10 17:50:41 2009
@@ -269,8 +269,8 @@
 
     nonconstbox = clonebox
 
-    def getptr_base(self):
-        return self.value
+    #def getptr_base(self):
+    #    return self.value
 
     def get_(self):
         return ootype.ooidentityhash(self.value) # XXX: check me
@@ -394,8 +394,8 @@
     def constbox(self):
         return ConstObj(self.value)
 
-    def getptr_base(self):
-        return self.value
+    #def getptr_base(self):
+    #    return self.value
 
     def get_(self):
         return ootype.ooidentityhash(self.value) # XXX: check me