[pypy-commit] pypy ppc-jit-backend: Accidentally killed some of David's patches.

[hager]

Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend
Changeset: r47166:0b04014b188e
Date: 2011-09-08 16:46 +0200
http://bitbucket.org/pypy/pypy/changeset/0b04014b188e/

Log:	Accidentally killed some of David's patches. Readded them to
	runner.py and ppc_assembler.py.

diff --git a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
--- a/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
+++ b/pypy/jit/backend/ppc/ppcgen/ppc_assembler.py
@@ -948,21 +948,31 @@
         if IS_PPC_32:
             self.stwx(source_reg.value, 0, 0)
         else:
-            # ? 
-            self.std(source_reg.value, 0, 10)
+            self.std(source_reg.value, 0, 0)
 
     def _save_nonvolatiles(self):
         for i, reg in enumerate(NONVOLATILES):
-            self.stw(reg, 1, self.framesize - 4 * i)
+            if IS_PPC_32:
+                self.stw(reg, 1, self.framesize - WORD * i)
+            else:
+                self.ld(reg, 1, self.framesize - WORD * i)
 
     def _restore_nonvolatiles(self):
         for i, reg in enumerate(NONVOLATILES):
-            self.lwz(reg, 1, self.framesize - i * 4)
+            if IS_PPC_32:
+                self.lwz(reg, 1, self.framesize - WORD * i)
+            else:
+                self.ld(reg, 1, self.framesize - WORD * i)
 
     def _make_prologue(self):
-        self.stwu(1, 1, -self.framesize)
-        self.mflr(0)
-        self.stw(0, 1, self.framesize + 4)
+        if IS_PPC_32:
+            self.stwu(1, 1, -self.framesize)
+            self.mflr(0)
+            self.stw(0, 1, self.framesize + 4)
+        else:
+            self.stdu(1, 1, -self.framesize)
+            self.mflr(0)
+            self.std(0, 1, self.framesize + 4)
         self._save_nonvolatiles()
 
     def _make_epilogue(self):
@@ -998,7 +1008,7 @@
         nonfloatlocs = regalloc.prepare_loop(inputargs, operations, looptoken)
         self.gen_bootstrap_code(nonfloatlocs, inputargs)
         self._walk_operations(operations, regalloc)
-        looptoken.ppc_code = self.assemble(True)
+        looptoken.ppc_code = self.assemble()
 
     def _walk_operations(self, operations, regalloc):
         while regalloc.position() < len(operations) - 1:
@@ -1678,7 +1688,10 @@
 
         self._restore_nonvolatiles()
 
-        self.lwz(0, 1, framesize + 4) # 36
+        if IS_PPC_32:
+            self.lwz(0, 1, self.framesize + WORD)
+        else:
+            self.ld(0, 1, framesize + WORD)
         self.mtlr(0)
         self.addi(1, 1, framesize)
         self.load_imm(r.r3, identifier)