[pypy-commit] pypy stmgc-c7: fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r70209:d80633d4a761
Date: 2014-03-23 16:33 +0100
http://bitbucket.org/pypy/pypy/changeset/d80633d4a761/

Log:	fixes

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
@@ -1557,7 +1557,7 @@
         base_loc, ofs_loc, size_loc, ofs, sign_loc = arglocs
         assert isinstance(ofs, ImmedLoc)
         src_addr = addr_add(self.SEGMENT_NO, base_loc, ofs_loc, ofs.value, 0)
-        self.load_from_mem(resloc, src_addr, size_loc, sign_loc, op)
+        self.load_from_mem(resloc, src_addr, size_loc, sign_loc)
 
     def _imul_const_scaled(self, mc, targetreg, sourcereg, itemsize):
         """Produce one operation to do roughly
diff --git a/rpython/jit/backend/x86/runner.py b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
+++ b/rpython/jit/backend/x86/runner.py
@@ -131,7 +131,7 @@
             rstm.stop_all_other_threads()
             
         for addr, tgt in looptoken.compiled_loop_token.invalidate_positions:
-            mc = codebuf.MachineCodeBlockWrapper(self)
+            mc = codebuf.MachineCodeBlockWrapper()
             mc.JMP_l(tgt)
             assert mc.get_relative_pos() == 5      # [JMP] [tgt 4 bytes]
             mc.copy_to_raw_memory(addr - 1)