some simplifications and a bug fix

diff --git a/mach/i86/ncg/table b/mach/i86/ncg/table
index 545744f..5adb2ff 100644 (file)
--- a/mach/i86/ncg/table
+++ b/mach/i86/ncg/table
@@ -1471,7 +1471,7 @@ pat lol lof xor lol stf $1==$4 && $2==$5 && $3==2 && inreg($1)==reg_any
 
 proc lofruxxsof example lol lof inc lol stf
 kills referals
-gen uxx* {ind_regoff2, regvar($1), 2}
+gen uxx* {ind_regoff2, regvar($1), $2}
 
 pat lol lof inc lol stf $1==$4 && $2==$5 && inreg($1)==reg_any
                                        call lofruxxsof("inc")
@@ -2022,25 +2022,17 @@ with CXREG REG REG
 
 pat inn $1==2
 with SHIFT_CREG REG
-gen shr %2,cl
-    and %2,{ANYCON, 1}                 yields %2
-with SHIFT_CREG ACC
 gen shr %2,cl
     and %2,{ANYCON, 1}                 yields %2
 
 pat loc inn $1==1 && $2==2
 with REG
-gen shr %1,{ANYCON, 1}
-    and %1,{ANYCON, 1}                 yields %1
-with ACC
 gen shr %1,{ANYCON, 1}
     and %1,{ANYCON, 1}                 yields %1
 
 pat loc inn $1==0 && $2==2
 with REG
 gen and %1,{ANYCON, 1}                 yields %1
-with ACC
-gen and %1,{ANYCON, 1}                 yields %1
 
 pat inn defined($1)
 with ACC