[pypy-commit] pypy default: this is clearly nonsense, load from the address in reg and not from the number of reg -.-

[bivab]

Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r63361:5cad4f307202
Date: 2013-04-15 14:28 +0200
http://bitbucket.org/pypy/pypy/changeset/5cad4f307202/

Log:	this is clearly nonsense, load from the address in reg and not from
	the number of reg -.-

diff --git a/rpython/jit/backend/arm/assembler.py b/rpython/jit/backend/arm/assembler.py
--- a/rpython/jit/backend/arm/assembler.py
+++ b/rpython/jit/backend/arm/assembler.py
@@ -764,13 +764,13 @@
 
         # restore registers
         self._pop_all_regs_from_jitframe(mc, [], self.cpu.supports_floats)
-        mc.POP([r.ip.value, r.pc.value]) # return
+        mc.POP([r.ip.value, r.pc.value])  # return
         self._frame_realloc_slowpath = mc.materialize(self.cpu.asmmemmgr, [])
 
     def _load_shadowstack_top(self, mc, reg, gcrootmap):
         rst = gcrootmap.get_root_stack_top_addr()
         mc.gen_load_int(reg.value, rst)
-        mc.gen_load_int(reg.value, reg.value)
+        self.load_reg(mc, reg.value, reg.value)
         return rst
 
     def fixup_target_tokens(self, rawstart):