[pypy-svn] r69648 - in pypy/branch/virtual-forcing/pypy/jit/backend: llgraph llgraph/test test

[fijal at codespeak.net]

Author: fijal
Date: Thu Nov 26 11:31:07 2009
New Revision: 69648

Modified:
   pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/llimpl.py
   pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/runner.py
   pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/test/test_llgraph.py
   pypy/branch/virtual-forcing/pypy/jit/backend/test/runner_test.py
Log:
force_token is now an into instead of address (it's a raw pointer in
the x86 backend)


Modified: pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/llimpl.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/llimpl.py	(original)
+++ pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/llimpl.py	Thu Nov 26 11:31:07 2009
@@ -146,7 +146,7 @@
     'cast_ptr_to_int' : (('ref',), 'int'),
     'debug_merge_point': (('ref',), None),
     'force_token'     : ((), 'int'),
-    'call_may_force'  : (('ref', 'varargs'), 'intorptr'),
+    'call_may_force'  : (('int', 'varargs'), 'intorptr'),
     'guard_not_forced': ((), None)
     #'getitem'         : (('void', 'ref', 'int'), 'int'),
     #'setitem'         : (('void', 'ref', 'int', 'int'), None),

Modified: pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/runner.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/runner.py	(original)
+++ pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/runner.py	Thu Nov 26 11:31:07 2009
@@ -498,7 +498,7 @@
         return history.BoxInt(llimpl.cast_to_int(ptrbox.getref_base(),
                                                         self.memo_cast))
     def force(self, force_token):
-        frame = llimpl.force(force_token)
+        frame = llimpl.force(self.cast_int_to_adr(force_token))
         self.latest_frame = frame
 
 class OOtypeCPU(BaseCPU):

Modified: pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/test/test_llgraph.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/test/test_llgraph.py	(original)
+++ pypy/branch/virtual-forcing/pypy/jit/backend/llgraph/test/test_llgraph.py	Thu Nov 26 11:31:07 2009
@@ -10,6 +10,9 @@
 from pypy.jit.backend.test.runner_test import LLtypeBackendTest
 
 class TestLLTypeLLGraph(LLtypeBackendTest):
+    # for individual tests see:
+    # ====> ../../test/runner_test.py
+    
     from pypy.jit.backend.llgraph.runner import LLtypeCPU as cpu_type
 
     def setup_method(self, _):

Modified: pypy/branch/virtual-forcing/pypy/jit/backend/test/runner_test.py
==============================================================================
--- pypy/branch/virtual-forcing/pypy/jit/backend/test/runner_test.py	(original)
+++ pypy/branch/virtual-forcing/pypy/jit/backend/test/runner_test.py	Thu Nov 26 11:31:07 2009
@@ -1229,7 +1229,7 @@
                values.append(self.cpu.get_latest_value_int(0))
                values.append(self.cpu.get_latest_value_int(1))
 
-        FUNC = self.FuncType([llmemory.Address, lltype.Signed], lltype.Void)
+        FUNC = self.FuncType([lltype.Signed, lltype.Signed], lltype.Void)
         func_ptr = llhelper(lltype.Ptr(FUNC), maybe_force)
         funcbox = self.get_funcbox(self.cpu, func_ptr).constbox()
         calldescr = self.cpu.calldescrof(FUNC, FUNC.ARGS, FUNC.RESULT)