[pypy-commit] pypy ppc-jit-backend: refactor load_from_addr. clarify register usage in store_reg.

[edelsohn]

Author: edelsohn
Branch: ppc-jit-backend
Changeset: r49404:3db474e494aa
Date: 2011-11-14 10:56 -0500
http://bitbucket.org/pypy/pypy/changeset/3db474e494aa/

Log:	refactor load_from_addr. clarify register usage in store_reg.

diff --git a/pypy/jit/backend/ppc/ppcgen/codebuilder.py b/pypy/jit/backend/ppc/ppcgen/codebuilder.py
--- a/pypy/jit/backend/ppc/ppcgen/codebuilder.py
+++ b/pypy/jit/backend/ppc/ppcgen/codebuilder.py
@@ -950,19 +950,18 @@
             self.ori(rD, rD, lo(word))
 
     def load_from_addr(self, rD, addr):
+        self.load_imm(rD, addr)
         if IS_PPC_32:
-            self.load_imm(rD, addr)
             self.lwzx(rD.value, 0, rD.value)
         else:
-            self.load_imm(rD, addr)
             self.ldx(rD.value, 0, rD.value)
 
     def store_reg(self, source_reg, addr):
         self.load_imm(r.r0, addr)
         if IS_PPC_32:
-            self.stwx(source_reg.value, 0, 0)
+            self.stwx(source_reg.value, 0, r.r0.value)
         else:
-            self.stdx(source_reg.value, 0, 0)
+            self.stdx(source_reg.value, 0, r.r0.value)
 
     def b_cond_offset(self, offset, condition):
         pos = self.currpos()