use STS and LOS routine

diff --git a/mach/i86/cg/table b/mach/i86/cg/table
index 35d4c59..2b407a5 100644 (file)
--- a/mach/i86/cg/table
+++ b/mach/i86/cg/table
@@ -332,13 +332,13 @@ loi $1>4  | X_BXREG |
                        erase(%[a]) erase(%[1]) | | | (3,40+$1*9)
 los $1==2      | X_CXREG X_BXREG |
                        remove(ALL)
-                       "call .loi"
+                       "call .los"
                        erase(%[1]) erase(%[2])                 |       | |
 los !defined($1)| rm X_CXREG X_BXREG |
                        remove(ALL)
                        "cmp %[1],2"
                        "jne .unknown"
-                       "call .loi"
+                       "call .los"
                        erase(%[2]) erase(%[3])                 |       | |
 ldl            | |             | {LOCAL2, $1+2,2} {LOCAL2, $1,2}       | |
 lde            | |             | {EXTERN2, $1+"+2"} {EXTERN2, $1}      | |

diff --git a/mach/i86/ncg/table b/mach/i86/ncg/table
index ce4ded6..545744f 100644 (file)
--- a/mach/i86/ncg/table
+++ b/mach/i86/ncg/table
@@ -585,14 +585,7 @@ pat loi $1>4
 pat los $1==2
   with CXREG BXREG
   kills ALL
-  gen joehoe {label,".loi"}
-
-pat los !defined($1)
-  with rm CXREG BXREG
-  kills ALL
-  gen cmp %1,{ANYCON,2}
-      jne {label,".unknown"}
-      joehoe {label,".loi"}
+  gen joehoe {label,".los"}
 
 pat ldl                                        yields {LOCAL,$1+2,2}
                                               {LOCAL,$1,2}
@@ -781,7 +774,7 @@ pat sti $1>4
 pat sts $1==2
   with CXREG BXREG
   kills ALL
-  gen joehoe {label,".sti"}
+  gen joehoe {label,".sts"}
 
 pat sdl
   with regorconst regorconst   yields %2 %1
@@ -2698,7 +2691,7 @@ with rm-BXREG-ACC BXREG ACC
       jmp {label, ".csb2"}
 
 pat dup $1==2
-with regorconst                                yields %1 %1
+with anyreg                            yields %1 %1
 with ACC1                              yields %1 %1
 
 pat dup $1==4