[pypy-svn] r76968 - in pypy/branch/jit-generator/pypy/jit: backend/test backend/x86 metainterp

[arigo at codespeak.net]

Author: arigo
Date: Thu Sep  9 14:53:29 2010
New Revision: 76968

Modified:
   pypy/branch/jit-generator/pypy/jit/backend/test/runner_test.py
   pypy/branch/jit-generator/pypy/jit/backend/x86/regalloc.py
   pypy/branch/jit-generator/pypy/jit/metainterp/jitdriver.py
   pypy/branch/jit-generator/pypy/jit/metainterp/warmspot.py
Log:
Merge r76967 into this branch.


Modified: pypy/branch/jit-generator/pypy/jit/backend/test/runner_test.py
==============================================================================
--- pypy/branch/jit-generator/pypy/jit/backend/test/runner_test.py	(original)
+++ pypy/branch/jit-generator/pypy/jit/backend/test/runner_test.py	Thu Sep  9 14:53:29 2010
@@ -1777,7 +1777,7 @@
         self.cpu.compile_loop(loop.inputargs, loop.operations, looptoken)
         ARGS = [lltype.Signed] * 10
         RES = lltype.Signed
-        self.cpu.portal_calldescr = self.cpu.calldescrof(
+        FakeJitDriverSD.portal_calldescr = self.cpu.calldescrof(
             lltype.Ptr(lltype.FuncType(ARGS, RES)), ARGS, RES)
         for i in range(10):
             self.cpu.set_future_value_int(i, i+1)
@@ -1816,7 +1816,7 @@
 
         ARGS = [lltype.Float, lltype.Float]
         RES = lltype.Float
-        self.cpu.portal_calldescr = self.cpu.calldescrof(
+        FakeJitDriverSD.portal_calldescr = self.cpu.calldescrof(
             lltype.Ptr(lltype.FuncType(ARGS, RES)), ARGS, RES)
         
         ops = '''

Modified: pypy/branch/jit-generator/pypy/jit/backend/x86/regalloc.py
==============================================================================
--- pypy/branch/jit-generator/pypy/jit/backend/x86/regalloc.py	(original)
+++ pypy/branch/jit-generator/pypy/jit/backend/x86/regalloc.py	Thu Sep  9 14:53:29 2010
@@ -665,13 +665,11 @@
         self._consider_call(op, guard_op)
 
     def consider_call_assembler(self, op, guard_op):
-        portal_calldescr = self.assembler.cpu.portal_calldescr
-        size = portal_calldescr.get_result_size(self.translate_support_code)
-        #
         descr = op.descr
         assert isinstance(descr, LoopToken)
         jd = descr.outermost_jitdriver_sd
         assert jd is not None
+        size = jd.portal_calldescr.get_result_size(self.translate_support_code)
         vable_index = jd.index_of_virtualizable
         if vable_index >= 0:
             self.rm._sync_var(op.args[vable_index])

Modified: pypy/branch/jit-generator/pypy/jit/metainterp/jitdriver.py
==============================================================================
--- pypy/branch/jit-generator/pypy/jit/metainterp/jitdriver.py	(original)
+++ pypy/branch/jit-generator/pypy/jit/metainterp/jitdriver.py	Thu Sep  9 14:53:29 2010
@@ -8,6 +8,7 @@
     #    self.portal_graph      ... pypy.jit.metainterp.warmspot
     #    self.portal_runner_ptr ... pypy.jit.metainterp.warmspot
     #    self.portal_runner_adr ... pypy.jit.metainterp.warmspot
+    #    self.portal_calldescr  ... pypy.jit.metainterp.warmspot
     #    self.num_green_args    ... pypy.jit.metainterp.warmspot
     #    self.result_type       ... pypy.jit.metainterp.warmspot
     #    self.virtualizable_info... pypy.jit.metainterp.warmspot

Modified: pypy/branch/jit-generator/pypy/jit/metainterp/warmspot.py
==============================================================================
--- pypy/branch/jit-generator/pypy/jit/metainterp/warmspot.py	(original)
+++ pypy/branch/jit-generator/pypy/jit/metainterp/warmspot.py	Thu Sep  9 14:53:29 2010
@@ -650,7 +650,7 @@
         jd.portal_runner_ptr = self.helper_func(jd._PTR_PORTAL_FUNCTYPE,
                                                 ll_portal_runner)
         jd.portal_runner_adr = llmemory.cast_ptr_to_adr(jd.portal_runner_ptr)
-        self.cpu.portal_calldescr = self.cpu.calldescrof(
+        jd.portal_calldescr = self.cpu.calldescrof(
             jd._PTR_PORTAL_FUNCTYPE.TO,
             jd._PTR_PORTAL_FUNCTYPE.TO.ARGS,
             jd._PTR_PORTAL_FUNCTYPE.TO.RESULT)