[pypy-svn] r69580 - in pypy/branch/shorter-guard-path-2/pypy/jit/backend: test x86

[arigo at codespeak.net]

Author: arigo
Date: Tue Nov 24 15:02:23 2009
New Revision: 69580

Modified:
   pypy/branch/shorter-guard-path-2/pypy/jit/backend/test/runner_test.py
   pypy/branch/shorter-guard-path-2/pypy/jit/backend/x86/assembler.py
Log:
Small fixes.


Modified: pypy/branch/shorter-guard-path-2/pypy/jit/backend/test/runner_test.py
==============================================================================
--- pypy/branch/shorter-guard-path-2/pypy/jit/backend/test/runner_test.py	(original)
+++ pypy/branch/shorter-guard-path-2/pypy/jit/backend/test/runner_test.py	Tue Nov 24 15:02:23 2009
@@ -142,7 +142,7 @@
         self.cpu.compile_loop(inputargs, operations, looptoken)
         self.cpu.set_future_value_int(0, 2)
         fail = self.cpu.execute_token(looptoken)
-        assert fail == 2
+        assert fail.identifier == 2
         res = self.cpu.get_latest_value_int(2)
         assert res == 10
 
@@ -234,7 +234,7 @@
 
         self.cpu.set_future_value_int(0, 2)
         fail = self.cpu.execute_token(looptoken)
-        assert fail == 2
+        assert fail.identifier == 2
         res = self.cpu.get_latest_value_int(0)
         assert res == 20
 

Modified: pypy/branch/shorter-guard-path-2/pypy/jit/backend/x86/assembler.py
==============================================================================
--- pypy/branch/shorter-guard-path-2/pypy/jit/backend/x86/assembler.py	(original)
+++ pypy/branch/shorter-guard-path-2/pypy/jit/backend/x86/assembler.py	Tue Nov 24 15:02:23 2009
@@ -788,7 +788,8 @@
         # for testing the decoding, write a final byte 0xCC
         if not we_are_translated():
             mc.writechr(0xCC)
-            faildescr._x86_debug_faillocs = fail_locs
+            faildescr._x86_debug_faillocs = [loc for loc in fail_locs
+                                                 if loc is not None]
         return addr
 
     DESCR_REF       = 0x00