[pypy-commit] pypy stmgc-c7: Typos

arigo noreply at buildbot.pypy.org
Mon Jun 30 19:53:01 CEST 2014


Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r72296:49a3796d3798
Date: 2014-06-30 19:52 +0200
http://bitbucket.org/pypy/pypy/changeset/49a3796d3798/

Log:	Typos

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
@@ -297,7 +297,6 @@
         #
         if hasattr(GCClass, 'JIT_WB_CARDS_SET'):
             self.jit_wb_cards_set = GCClass.JIT_WB_CARDS_SET
-            self.jit_wb_card_page_shift = GCClass.JIT_WB_CARD_PAGE_SHIFT
             self.jit_wb_cards_set_byteofs, self.jit_wb_cards_set_singlebyte = (
                 self.extract_flag_byte(self.jit_wb_cards_set))
             #
@@ -307,6 +306,7 @@
                 assert (self.jit_wb_cards_set_byteofs ==
                         self.jit_wb_if_flag_byteofs)
                 assert self.jit_wb_cards_set_singlebyte == -0x80
+                self.jit_wb_card_page_shift = GCClass.JIT_WB_CARD_PAGE_SHIFT
         else:
             self.jit_wb_cards_set = 0
 
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -451,9 +451,9 @@
             # A final TEST8 before the RET, for the caller.  Careful to
             # not follow this instruction with another one that changes
             # the status of the CPU flags!
-            if stm:
-                mc.TEST8_rr(eax.value | BYTE_REG_FLAG,
-                            eax.value | BYTE_REG_FLAG)
+            if self.cpu.gc_ll_descr.stm:
+                mc.TEST8_rr(eax.value | rx86.BYTE_REG_FLAG,
+                            eax.value | rx86.BYTE_REG_FLAG)
             else:
                 if IS_X86_32:
                     mc.MOV_rs(eax.value, 3*WORD)


More information about the pypy-commit mailing list