[pypy-commit] pypy ppc-jit-backend: (bivab, hager): fix bug in code generator

[hager]

Author: hager <sven.hager at uni-duesseldorf.de>
Branch: ppc-jit-backend
Changeset: r50508:284314e1eb5f
Date: 2011-12-14 17:30 +0100
http://bitbucket.org/pypy/pypy/changeset/284314e1eb5f/

Log:	(bivab, hager): fix bug in code generator

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
@@ -63,7 +63,7 @@
 MI = Form("rA", "rS", "SH", "MB", "ME", "Rc")
 MB = Form("rA", "rS", "rB", "MB", "ME", "Rc")
 MDI = Form("rA", "rS", "sh", "mbe", "XO5", "Rc")
-MDS = Form("rA", "rS", "rB", "mbe", "XO5", "Rc")
+MDS = Form("rA", "rS", "rB", "mbe", "XO7", "Rc")
 
 class BasicPPCAssembler(Assembler):
 
@@ -459,10 +459,10 @@
 
     rfid  = X(19, XO1=18)
 
-    rldcl   = MDS(30, XO5=8, Rc=0)
-    rldclx  = MDS(30, XO5=8, Rc=1)
-    rldcr   = MDS(30, XO5=9, Rc=0)
-    rldcrx  = MDS(30, XO5=9, Rc=1)
+    rldcl   = MDS(30, XO7=8, Rc=0)
+    rldclx  = MDS(30, XO7=8, Rc=1)
+    rldcr   = MDS(30, XO7=9, Rc=0)
+    rldcrx  = MDS(30, XO7=9, Rc=1)
 
     rldic   = MDI(30, XO5=2, Rc=0)
     rldicx  = MDI(30, XO5=2, Rc=1)
diff --git a/pypy/jit/backend/ppc/ppcgen/form.py b/pypy/jit/backend/ppc/ppcgen/form.py
--- a/pypy/jit/backend/ppc/ppcgen/form.py
+++ b/pypy/jit/backend/ppc/ppcgen/form.py
@@ -186,7 +186,7 @@
         for fname in specializations:
             field = self.fieldmap[fname]
             if field not in self.fields:
-                raise FormException, "no nothin bout '%s'"%k
+                raise FormException, "no nothin bout '%s'"%fname
             s[field] = specializations[fname]
         return IDesc(self.fieldmap, self.fields, s)
 
diff --git a/pypy/jit/backend/ppc/ppcgen/ppc_field.py b/pypy/jit/backend/ppc/ppcgen/ppc_field.py
--- a/pypy/jit/backend/ppc/ppcgen/ppc_field.py
+++ b/pypy/jit/backend/ppc/ppcgen/ppc_field.py
@@ -49,6 +49,7 @@
     "XO4":    (30, 31),
     "XO5":    (27, 29),
     "XO6":    (21, 29),
+    "XO7":    (27, 30)
 }