[pypy-svn] r35553 - in pypy/dist/pypy: objspace tool

[arigo at codespeak.net]

Author: arigo
Date: Sun Dec 10 15:41:25 2006
New Revision: 35553

Modified:
   pypy/dist/pypy/objspace/trace.py
   pypy/dist/pypy/tool/pydis.py
   pypy/dist/pypy/tool/stdlib_opcode.py
Log:
Fixes for the trace objspace.


Modified: pypy/dist/pypy/objspace/trace.py
==============================================================================
--- pypy/dist/pypy/objspace/trace.py	(original)
+++ pypy/dist/pypy/objspace/trace.py	Sun Dec 10 15:41:25 2006
@@ -16,7 +16,7 @@
     def __init__(self, frame):
         self.frame = frame
         self.code = frame.pycode
-        self.index = intmask(frame.next_instr)
+        self.index = intmask(frame.last_instr)
 
 class EnterFrame(object):
     def __init__(self, frame):

Modified: pypy/dist/pypy/tool/pydis.py
==============================================================================
--- pypy/dist/pypy/tool/pydis.py	(original)
+++ pypy/dist/pypy/tool/pydis.py	Sun Dec 10 15:41:25 2006
@@ -8,11 +8,13 @@
 import autopath
 import sys
 
+from pypy.tool import stdlib_opcode
 from pypy.tool.stdlib_opcode import *
-from pypy.tool.stdlib_opcode import __all__ as _opcodes_all
 
-__all__ = ["dis","pydisassemble","distb","disco"] + _opcodes_all
-del _opcodes_all
+__all__ = ["dis","pydisassemble","distb","disco"] + stdlib_opcode.__all__
+
+EXTENDED_ARG = stdlib_opcode.opcodedesc.EXTENDED_ARG.index
+
 
 class Bytecode:
     def __init__(self, disresult, bytecodeindex, oparg, lineno):

Modified: pypy/dist/pypy/tool/stdlib_opcode.py
==============================================================================
--- pypy/dist/pypy/tool/stdlib_opcode.py	(original)
+++ pypy/dist/pypy/tool/stdlib_opcode.py	Sun Dec 10 15:41:25 2006
@@ -1,7 +1,8 @@
 # load opcode.py as pythonopcode from our own lib
 
 __all__ = ['opmap', 'opname', 'HAVE_ARGUMENT',
-           'hasjrel', 'hasjabs', 'cmp_op']
+           'hasconst', 'hasname', 'hasjrel', 'hasjabs',
+           'haslocal', 'hascompare', 'hasfree', 'cmp_op']
 
 def load_opcode():
     import py