[pypy-commit] pypy jit-leaner-frontend: fix some typos and details

[fijal]

Author: fijal
Branch: jit-leaner-frontend
Changeset: r82928:96773552cf51
Date: 2016-03-10 10:51 +0200
http://bitbucket.org/pypy/pypy/changeset/96773552cf51/

Log:	fix some typos and details

diff --git a/rpython/jit/metainterp/opencoder.py b/rpython/jit/metainterp/opencoder.py
--- a/rpython/jit/metainterp/opencoder.py
+++ b/rpython/jit/metainterp/opencoder.py
@@ -274,6 +274,15 @@
     def get_iter(self):
         return TraceIterator(self, 0, len(self._ops))
 
+    def unpack(self):
+        """ NOT_RPYTHON - really rpython, but only use for debugging
+        """
+        iter = self.get_iter()
+        ops = []
+        while not iter.done():
+            ops.append(iter.next())
+        return ops
+
     def _get_operations(self):
         """ NOT_RPYTHON
         """
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -424,7 +424,7 @@
         elif self.level == LEVEL_NONNULL:
             if other.level == LEVEL_UNKNOWN:
                 if runtime_box is not None and runtime_box.nonnull():
-                    op = ResOperation(rop.GUARD_NONNULL, [box], None)
+                    op = ResOperation(rop.GUARD_NONNULL, [box])
                     extra_guards.append(op)
                     return
                 else:
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -1387,7 +1387,7 @@
 
     @arguments()
     def opimpl_current_trace_length(self):
-        trace_length = len(self.metainterp.history.operations)
+        trace_length = self.metainterp.history.length()
         return ConstInt(trace_length)
 
     @arguments("box")
@@ -2618,6 +2618,7 @@
                 live_arg_boxes[num_green_args:])
         finally:
             self.history.cut(cut_at) # pop the jump
+            self.history.ends_with_jump = False
         if target_token is not None: # raise if it *worked* correctly
             assert isinstance(target_token, TargetToken)
             jitcell_token = target_token.targeting_jitcell_token
diff --git a/rpython/jit/metainterp/test/test_ajit.py b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -2007,7 +2007,7 @@
         res = self.meta_interp(g, [3, 14])
         assert res == g(3, 14)
 
-    def test_specialied_bridge(self):
+    def test_specialized_bridge(self):
         myjitdriver = JitDriver(greens = [], reds = ['y', 'x', 'res'])
         class A:
             def __init__(self, val):