[pypy-commit] pypy better-jit-hooks: pass also ops_offset, for good measure

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: better-jit-hooks
Changeset: r51048:9f4f6c879538
Date: 2012-01-05 23:34 +0200
http://bitbucket.org/pypy/pypy/changeset/9f4f6c879538/

Log:	pass also ops_offset, for good measure

diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -319,7 +319,7 @@
     metainterp_sd.profiler.end_backend() 
     portal.on_compile(jitdriver_sd.jitdriver, metainterp_sd.logger_ops,
                       original_jitcell_token, loop.operations, type, greenkey,
-                      asmstart, asmlen)
+                      ops_offset, asmstart, asmlen)
     metainterp_sd.stats.add_new_loop(loop)
     if not we_are_translated():
         metainterp_sd.stats.compiled()
@@ -352,8 +352,8 @@
         debug_stop("jit-backend")
     metainterp_sd.profiler.end_backend()
     portal.on_compile_bridge(jitdriver_sd.jitdriver, metainterp_sd.logger_ops,
-                             original_loop_token, operations, n, asmstart,
-                             asmlen)
+                             original_loop_token, operations, n, ops_offset,
+                             asmstart, asmlen)
     if not we_are_translated():
         metainterp_sd.stats.compiled()
     metainterp_sd.log("compiled new bridge")
diff --git a/pypy/jit/metainterp/test/test_jitportal.py b/pypy/jit/metainterp/test/test_jitportal.py
--- a/pypy/jit/metainterp/test/test_jitportal.py
+++ b/pypy/jit/metainterp/test/test_jitportal.py
@@ -43,7 +43,7 @@
         
         class MyJitPortal(JitPortal):
             def on_compile(self, jitdriver, logger, looptoken, operations,
-                           type, greenkey, asmaddr, asmlen):
+                           type, greenkey, ops_offset, asmaddr, asmlen):
                 assert asmaddr == 0
                 assert asmlen == 0
                 called[(greenkey[1].getint(), greenkey[0].getint(), type)] = looptoken
@@ -70,13 +70,13 @@
         
         class MyJitPortal(JitPortal):
             def on_compile(self, jitdriver, logger, looptoken, operations,
-                           type, greenkey, asmaddr, asmlen):
+                           type, greenkey, ops_offset, asmaddr, asmlen):
                 assert asmaddr == 0
                 assert asmlen == 0
                 called[(greenkey[1].getint(), greenkey[0].getint(), type)] = looptoken
 
             def on_compile_bridge(self, jitdriver, logger, orig_token,
-                                  operations, n, asmstart, asmlen):
+                                  operations, n, ops_offset, asmstart, asmlen):
                 assert 'bridge' not in called
                 called['bridge'] = orig_token