[pypy-commit] pypy stmgc-c7: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r71091:24698a02507b
Date: 2014-04-29 15:50 +0200
http://bitbucket.org/pypy/pypy/changeset/24698a02507b/

Log:	merge heads

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
@@ -569,6 +569,7 @@
     POP_r = insn(rex_nw, register(1), '\x58')
     POP_b = insn(rex_nw, '\x8F', orbyte(0<<3), stack_bp(1))
     POP_m = insn(rex_nw, '\x8F', orbyte(0<<3), mem_reg_plus_const(1))
+    POP_j = insn(rex_nw, '\x8F', orbyte(0<<3), abs_(1))
 
     # note: the segment specified in LEA should always be SEGMENT_NO;
     # if instead you give it a SEGMENT_*S, it is ignored
diff --git a/rpython/jit/backend/x86/test/test_rx86.py b/rpython/jit/backend/x86/test/test_rx86.py
--- a/rpython/jit/backend/x86/test/test_rx86.py
+++ b/rpython/jit/backend/x86/test/test_rx86.py
@@ -261,3 +261,8 @@
     s = CodeBuilder64()
     s.MOV8_jr((SEGMENT_GS, 51), ebx | BYTE_REG_FLAG)
     assert s.getvalue() == '\x65\x88\x1C\x25\x33\x00\x00\x00'
+
+def test_pop_j():
+    s = CodeBuilder64()
+    s.POP_j((SEGMENT_GS, -440))
+    assert s.getvalue() == '\x65\x8f\x04\x25\x48\xfe\xff\xff'