[pypy-commit] pypy optresult-unroll: Fixes, the full test passes now.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: optresult-unroll
Changeset: r79415:9a490fdd4129
Date: 2015-09-04 13:20 +0200
http://bitbucket.org/pypy/pypy/changeset/9a490fdd4129/

Log:	Fixes, the full test passes now.

diff --git a/rpython/jit/backend/llsupport/gc.py b/rpython/jit/backend/llsupport/gc.py
--- a/rpython/jit/backend/llsupport/gc.py
+++ b/rpython/jit/backend/llsupport/gc.py
@@ -695,8 +695,8 @@
 
     def _setup_guard_is_object(self):
         from rpython.memory.gctypelayout import GCData, T_IS_RPYTHON_INSTANCE
-        self._infobits_offset = symbolic.get_field_token(GCData.TYPE_INFO,
-                                                         'infobits', True)
+        self._infobits_offset, _ = symbolic.get_field_token(GCData.TYPE_INFO,
+                                                            'infobits', True)
         self._T_IS_RPYTHON_INSTANCE = T_IS_RPYTHON_INSTANCE
 
     def get_translated_info_for_guard_is_object(self):
diff --git a/rpython/jit/backend/x86/rx86.py b/rpython/jit/backend/x86/rx86.py
--- a/rpython/jit/backend/x86/rx86.py
+++ b/rpython/jit/backend/x86/rx86.py
@@ -674,6 +674,9 @@
     TEST8_bi = insn(rex_nw, '\xF6', orbyte(0<<3), stack_bp(1), immediate(2, 'b'))
     TEST8_ji = insn(rex_nw, '\xF6', orbyte(0<<3), abs_(1), immediate(2, 'b'))
     TEST_rr = insn(rex_w, '\x85', register(2,8), register(1), '\xC0')
+    TEST_ai = insn(rex_w, '\xF7', orbyte(0<<3), mem_reg_plus_scaled_reg_plus_const(1), immediate(2))
+    TEST_mi = insn(rex_w, '\xF7', orbyte(0<<3), mem_reg_plus_const(1), immediate(2))
+    TEST_ji = insn(rex_w, '\xF7', orbyte(0<<3), abs_(1), immediate(2))
 
     BTS_mr = insn(rex_w, '\x0F\xAB', register(2,8), mem_reg_plus_const(1))
     BTS_jr = insn(rex_w, '\x0F\xAB', register(2,8), abs_(1))