Author: Remi Meier <remi.me...@gmail.com>
Branch: stmgc-c4
Changeset: r65769:646270f9f8db
Date: 2013-07-26 16:29 +0200
http://bitbucket.org/pypy/pypy/changeset/646270f9f8db/
Log: remove a jump
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
@@ -2232,7 +2232,7 @@
mc.CMP_rb(X86_64_SCRATCH_REG.value, StmGC.H_REVISION)
else:
mc.CMP(X86_64_SCRATCH_REG, mem(loc_base, StmGC.H_REVISION))
-
+ #
if isinstance(descr, STMReadBarrierDescr):
# jump to end if h_rev==priv_rev
mc.J_il8(rx86.Conditions['Z'], 0) # patched below
@@ -2268,19 +2268,15 @@
mc.TEST8_bi(StmGC.H_TID + off, flag)
else:
mc.TEST8_mi((loc_base.value, StmGC.H_TID + off), flag)
- mc.J_il8(rx86.Conditions['NZ'], 0) # patched below
- jnz_location2 = mc.get_relative_pos()
-
- # jump to end
- mc.JMP_l8(0) # patched below
+
+ mc.J_il8(rx86.Conditions['Z'], 0) # patched below
jz_location = mc.get_relative_pos()
+ # both conditions succeeded, jump to end
# jump target slowpath:
offset = mc.get_relative_pos() - jnz_location
- offset2 = mc.get_relative_pos() - jnz_location2
assert 0 < offset <= 127
mc.overwrite(jnz_location - 1, chr(offset))
- mc.overwrite(jnz_location2 - 1, chr(offset2))
#
# SLOWPATH_START
#
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
