[pypy-commit] pypy stmgc-c8: fixes for the merge

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c8
Changeset: r78245:329874ff059b
Date: 2015-06-22 16:36 +0200
http://bitbucket.org/pypy/pypy/changeset/329874ff059b/

Log:	fixes for the merge

diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -146,7 +146,7 @@
             if self.emulated_pbc_calls:
                 for pbc, args_s in self.emulated_pbc_calls.itervalues():
                     args = simple_args(args_s)
-                    self.consider_call_site(args, s_ImpossibleValue, None)
+                    pbc.consider_call_site(args, s_ImpossibleValue, None)
                 self.emulated_pbc_calls.clear()
         finally:
             self.leave()
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
@@ -139,7 +139,7 @@
         self._pop_all_regs_from_frame(mc, [eax], True, callee_only=True)
         mc.RET()
         self._stm_leave_noninevitable_tr_slowpath = mc.materialize(
-            self.cpu.asmmemmgr, [])
+            self.cpu, [])
         #
         # a second helper to call _stm_reattach_transaction(tl),
         # preserving only registers that might store the result of a call
@@ -155,7 +155,7 @@
         mc.MOV_rs(eax.value, 0)
         mc.ADD_ri(esp.value, 3 * WORD)
         mc.RET()
-        self._stm_reattach_tr_slowpath = mc.materialize(self.cpu.asmmemmgr, [])
+        self._stm_reattach_tr_slowpath = mc.materialize(self.cpu, [])
 
 
     def set_extra_stack_depth(self, mc, value):
diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py
--- a/rpython/jit/backend/x86/callbuilder.py
+++ b/rpython/jit/backend/x86/callbuilder.py
@@ -107,7 +107,7 @@
             self.asm.set_extra_stack_depth(self.mc, -current_esp)
         noregs = self.asm.cpu.gc_ll_descr.is_shadow_stack()
         gcmap = self.asm._regalloc.get_gcmap([eax], noregs=noregs)
-        self.asm.update_stm_location(self.mc, -self.current_esp)
+        self.asm.update_stm_location(self.mc, -self.get_current_esp())
         self.asm.push_gcmap(self.mc, gcmap, store=True)
 
     def pop_gcmap(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
@@ -644,7 +644,7 @@
         self.PO1_b(ofs)
         self.stack_frame_size_delta(-self.WORD)
 
-    def POP_m(self, arg)
+    def POP_m(self, arg):
         self.PO1_m(arg)
         self.stack_frame_size_delta(-self.WORD)