[pypy-svn] r62698 - pypy/trunk/pypy/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Sat Mar  7 14:35:17 2009
New Revision: 62698

Added:
   pypy/trunk/pypy/interpreter/pyopcode.py.merge.tmp
      - copied, changed from r62697, pypy/trunk/pypy/interpreter/pyopcode.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/branch/pyjitpl5/pypy/interpreter/pyopcode.py
revisions 61705 to 62697:

    ------------------------------------------------------------------------
    r62179 | arigo | 2009-02-26 13:56:10 +0100 (Thu, 26 Feb 2009) | 2 lines
    
    Remove most hints in the Python interpreter.  They are not useful any more.
    
    ------------------------------------------------------------------------
    r61713 | fijal | 2009-02-11 12:33:01 +0100 (Wed, 11 Feb 2009) | 4 lines
    
    (arigo, fijal)
    Create a new branch for importing pyjitpl5 into trunk (and pieces from
    pypy-oo-jit)
    
    ------------------------------------------------------------------------


Copied: pypy/trunk/pypy/interpreter/pyopcode.py.merge.tmp (from r62697, pypy/trunk/pypy/interpreter/pyopcode.py)
==============================================================================
--- pypy/trunk/pypy/interpreter/pyopcode.py	(original)
+++ pypy/trunk/pypy/interpreter/pyopcode.py.merge.tmp	Sat Mar  7 14:35:17 2009
@@ -183,8 +183,6 @@
                 oparg = (hi << 8) | lo
             else:
                 oparg = 0
-            hint(opcode, concrete=True)
-            hint(oparg, concrete=True)
 
             while opcode == opcodedesc.EXTENDED_ARG.index:
                 opcode = ord(co_code[next_instr])
@@ -194,8 +192,6 @@
                 hi = ord(co_code[next_instr+2])
                 next_instr += 3
                 oparg = (oparg << 16) | (hi << 8) | lo
-                hint(opcode, concrete=True)
-                hint(oparg, concrete=True)
 
             if opcode == opcodedesc.RETURN_VALUE.index:
                 w_returnvalue = self.popvalue()
@@ -265,7 +261,6 @@
         while n > 0:
             block = self.blockstack.pop()
             n -= 1
-            hint(n, concrete=True)
             if (block.handling_mask & unroller_kind) != 0:
                 return block
             block.cleanupstack(self)
@@ -1142,7 +1137,7 @@
 
     def handle(self, frame, unroller):
         next_instr = self.really_handle(frame, unroller)   # JIT hack
-        return hint(next_instr, promote=True)
+        return next_instr
 
     def really_handle(self, frame, unroller):
         """ Purely abstract method