[pypy-commit] pypy stmgc-c7: Add the markers here too

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70779:929f41fc2aad
Date: 2014-04-19 19:00 +0200
http://bitbucket.org/pypy/pypy/changeset/929f41fc2aad/

Log:	Add the markers here too

diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py
--- a/pypy/module/pypyjit/interp_jit.py
+++ b/pypy/module/pypyjit/interp_jit.py
@@ -48,6 +48,7 @@
         self = hint(self, access_directly=True)
         next_instr = r_uint(next_instr)
         is_being_profiled = self.is_being_profiled
+        rstm.push_marker(intmask(next_instr) * 2 + 1, pycode)
         try:
             while True:
                 pypyjitdriver.jit_merge_point(ec=ec,
@@ -59,6 +60,7 @@
                 co_code = pycode.co_code
                 self.valuestackdepth = hint(self.valuestackdepth, promote=True)
                 next_instr = self.handle_bytecode(co_code, next_instr, ec)
+                rstm.update_marker_num(intmask(next_instr) * 2 + 1)
                 is_being_profiled = self.is_being_profiled
         except Yield:
             self.last_exception = None
@@ -68,6 +70,8 @@
         except ExitFrame:
             self.last_exception = None
             return self.popvalue()
+        finally:
+            rstm.pop_marker()
 
     def jump_absolute(self, jumpto, ec):
         if we_are_jitted():