[pypy-svn] r34630 - pypy/dist/pypy/translator/asm/ppcgen

[mwh at codespeak.net]

Author: mwh
Date: Wed Nov 15 15:24:49 2006
New Revision: 34630

Modified:
   pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py
Log:
fix a grotty assembler bug where I tried to define two forms called "XS0".
the funny part is that we were using one of the erroneous instructions but with
a 0 rB/Rc so it didn't matter.


Modified: pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py
==============================================================================
--- pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py	(original)
+++ pypy/dist/pypy/translator/asm/ppcgen/ppc_assembler.py	Wed Nov 15 15:24:49 2006
@@ -19,7 +19,7 @@
 
 X = Form("XO1")
 XS = Form("rA", "rS", "rB", "XO1", "Rc")
-XS0 = Form("rS", "rA", "rB", "XO1")
+XSO = Form("rS", "rA", "rB", "XO1")
 XD = Form("rD", "rA", "rB", "XO1")
 XO = Form("rD", "rA", "rB", "OE", "XO2", "Rc")
 XO0 = Form("rD", "rA", "OE", "XO2", "Rc")
@@ -405,22 +405,22 @@
     srw     = XS(31, XO1=536, Rc=0)
     srwx    = XS(31, XO1=536, Rc=1)
 
-    stbux   = XS0(31, XO1=247)
-    stbx    = XS0(31, XO1=215)
-    stfdux  = XS0(31, XO1=759)
-    stfdx   = XS0(31, XO1=727)
-    stfiwx  = XS0(31, XO1=983)
-    stfsux  = XS0(31, XO1=695)
-    stfsx   = XS0(31, XO1=663)
-    sthbrx  = XS0(31, XO1=918)
-    sthux   = XS0(31, XO1=439)
-    sthx    = XS0(31, XO1=407)
+    stbux   = XSO(31, XO1=247)
+    stbx    = XSO(31, XO1=215)
+    stfdux  = XSO(31, XO1=759)
+    stfdx   = XSO(31, XO1=727)
+    stfiwx  = XSO(31, XO1=983)
+    stfsux  = XSO(31, XO1=695)
+    stfsx   = XSO(31, XO1=663)
+    sthbrx  = XSO(31, XO1=918)
+    sthux   = XSO(31, XO1=439)
+    sthx    = XSO(31, XO1=407)
     stswi   = Form("rS", "rA", "NB", "XO1")(31, XO1=725)
-    stswx   = XS0(31, XO1=661)
-    stwbrx  = XS0(31, XO1=662)
+    stswx   = XSO(31, XO1=661)
+    stwbrx  = XSO(31, XO1=662)
     stwcxx  = Form("rS", "rA", "rB", "XO1", "Rc")(31, XO1=150, Rc=1)
-    stwux   = XS0(31, XO1=183)
-    stwx    = XS0(31, XO1=151)
+    stwux   = XSO(31, XO1=183)
+    stwx    = XSO(31, XO1=151)
 
     subf    = XO(31, XO2=40, OE=0, Rc=0)
     subfx   = XO(31, XO2=40, OE=0, Rc=1)