[pypy-svn] r71698 - in pypy/branch/cleanup-warnings/pypy/jit: backend/x86 metainterp

[fijal at codespeak.net]

Author: fijal
Date: Wed Mar  3 05:25:13 2010
New Revision: 71698

Modified:
   pypy/branch/cleanup-warnings/pypy/jit/backend/x86/assembler.py
   pypy/branch/cleanup-warnings/pypy/jit/backend/x86/runner.py
   pypy/branch/cleanup-warnings/pypy/jit/metainterp/history.py
   pypy/branch/cleanup-warnings/pypy/jit/metainterp/optimizeopt.py
Log:
Store some attributes by default, so rtyper won't complain


Modified: pypy/branch/cleanup-warnings/pypy/jit/backend/x86/assembler.py
==============================================================================
--- pypy/branch/cleanup-warnings/pypy/jit/backend/x86/assembler.py	(original)
+++ pypy/branch/cleanup-warnings/pypy/jit/backend/x86/assembler.py	Wed Mar  3 05:25:13 2010
@@ -100,6 +100,7 @@
     mc2 = None
     mc_size = MachineCodeBlockWrapper.MC_DEFAULT_SIZE
     _float_constants = None
+    _regalloc = None
 
     def __init__(self, cpu, translate_support_code=False,
                             failargs_limit=1000):

Modified: pypy/branch/cleanup-warnings/pypy/jit/backend/x86/runner.py
==============================================================================
--- pypy/branch/cleanup-warnings/pypy/jit/backend/x86/runner.py	(original)
+++ pypy/branch/cleanup-warnings/pypy/jit/backend/x86/runner.py	Wed Mar  3 05:25:13 2010
@@ -4,7 +4,7 @@
 from pypy.rpython.lltypesystem import lltype, llmemory, rffi
 from pypy.rpython.llinterp import LLInterpreter
 from pypy.rlib.objectmodel import we_are_translated
-from pypy.jit.metainterp import history
+from pypy.jit.metainterp import history, compile
 from pypy.jit.backend.x86.assembler import Assembler386
 from pypy.jit.backend.x86.regalloc import FORCE_INDEX_OFS
 from pypy.jit.backend.x86.profagent import ProfileAgent
@@ -141,3 +141,19 @@
 
 import pypy.jit.metainterp.executor
 pypy.jit.metainterp.executor.make_execute_list(CPU)
+
+# silence warnings
+
+history.LoopToken._x86_param_depth = 0
+history.LoopToken._x86_arglocs = (None, None)
+history.LoopToken._x86_frame_depth = 0
+history.LoopToken._x86_bootstrap_code = 0
+history.LoopToken._x86_direct_bootstrap_code = 0
+history.LoopToken._x86_failure_recovery_bytecode = 0
+history.LoopToken._x86_adr_jump_offset = 0
+history.LoopToken._x86_loop_code = 0
+history.LoopToken._x86_current_depths = (0, 0)
+
+compile._DoneWithThisFrameDescr._x86_current_depths = (0, 0)
+compile._DoneWithThisFrameDescr._x86_failure_recovery_bytecode = 0
+compile._DoneWithThisFrameDescr._x86_adr_jump_offset = 0

Modified: pypy/branch/cleanup-warnings/pypy/jit/metainterp/history.py
==============================================================================
--- pypy/branch/cleanup-warnings/pypy/jit/metainterp/history.py	(original)
+++ pypy/branch/cleanup-warnings/pypy/jit/metainterp/history.py	Wed Mar  3 05:25:13 2010
@@ -685,6 +685,7 @@
     terminating = False # see TerminatingLoopToken in compile.py
     # specnodes = ...
     # and more data specified by the backend when the loop is compiled
+    number = 0
 
     def __init__(self, number=0):
         self.number = number
@@ -864,6 +865,7 @@
     compiled_count = 0
     enter_count = 0
     aborted_count = 0
+    history = None
 
     def __init__(self):
         self.loops = []

Modified: pypy/branch/cleanup-warnings/pypy/jit/metainterp/optimizeopt.py
==============================================================================
--- pypy/branch/cleanup-warnings/pypy/jit/metainterp/optimizeopt.py	(original)
+++ pypy/branch/cleanup-warnings/pypy/jit/metainterp/optimizeopt.py	Wed Mar  3 05:25:13 2010
@@ -47,6 +47,7 @@
     last_guard_index = -1
 
     level = LEVEL_UNKNOWN
+    known_class = None
 
     def __init__(self, box):
         self.box = box