[pypy-svn] r35566 - pypy/dist/pypy/interpreter

[mwh at codespeak.net]

Author: mwh
Date: Mon Dec 11 13:32:04 2006
New Revision: 35566

Modified:
   pypy/dist/pypy/interpreter/pyframe.py
   pypy/dist/pypy/interpreter/pyopcode.py
Log:
reinsert some resume_points.
this certainly won't fix the sstackless build, but it's a stop on that way...


Modified: pypy/dist/pypy/interpreter/pyframe.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyframe.py	(original)
+++ pypy/dist/pypy/interpreter/pyframe.py	Mon Dec 11 13:32:04 2006
@@ -99,6 +99,7 @@
             # the YIELD_VALUE instruction.
             next_instr = self.last_instr + 1
             w_exitvalue = self.dispatch(code, next_instr, executioncontext)
+            rstack.resume_point("execute_frame", self, executioncontext, returns=w_exitvalue)
             executioncontext.return_trace(self, w_exitvalue)
             # on exit, we try to release self.last_exception -- breaks an
             # obvious reference cycle, so it helps refcounting implementations

Modified: pypy/dist/pypy/interpreter/pyopcode.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyopcode.py	(original)
+++ pypy/dist/pypy/interpreter/pyopcode.py	Mon Dec 11 13:32:04 2006
@@ -183,6 +183,8 @@
                         # dispatch to the opcode method
                         meth = getattr(self, opdesc.methodname)
                         res = meth(oparg, next_instr)
+                        if opcode == opcodedesc.CALL_FUNCTION.index:
+                            rstack.resume_point("dispatch_call", self, co_code, next_instr, ec)
                         # !! warning, for the annotator the next line is not
                         # comparing an int and None - you can't do that.
                         # Instead, it's constant-folded to either True or False