From 887f6d16c900b88194a33ee8cdfc9699ea52972d Mon Sep 17 00:00:00 2001
From: ceriel <none@none>
Date: Wed, 12 Aug 1987 14:51:58 +0000
Subject: [PATCH] some adaptions undone

---
 mach/i86/cg/table | 89 +++++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 37 deletions(-)

diff --git a/mach/i86/cg/table b/mach/i86/cg/table
index c017fd597..4510e21a6 100644
--- a/mach/i86/cg/table
+++ b/mach/i86/cg/table
@@ -461,9 +461,6 @@ sti $1==1	| addreg regorconst12 |
 ...		| reg_off regorconst12 |
 			remove(referals)
 			move(%[2],{ind_regoff1,%[1.reg],%[1.off]})  |	| |
-...		| reg_off regorconst12 |
-			remove(referals)
-			move(%[2],{ind_regoff1,%[1.reg],%[1.off]})  |	| |
 ...		| bpreg_off regorconst12 |
 			remove(all_locals)
 			remove(indexed)
@@ -1499,7 +1496,7 @@ cff		| CXREG DXREG |
 loc loc cii $1==1 && $2==2	| X_ACC |
 			 "cbw"
 			 samecc 		    | ax  | |(1,2)
-...				| rmorconst1 |
+...				| nocoercions: rmorconst1 |
 			allocate(%[1], ACC1 = %[1])
 			 "cbw"
 			 samecc			    | ax  | |(1,2)
@@ -1520,7 +1517,7 @@ loc loc cii $1==1 && $2==4	| X_ACC |
 			"cbw"
 			"cwd"
 			samecc			    | %[a] ax | |(2,7)
-...				| rmorconst1 |
+...				| nocoercions: rmorconst1 |
 			allocate(%[1], ACC1 = %[1], DXREG)
 			"cbw"
 			"cwd"
@@ -2070,7 +2067,7 @@ cmi tlt $1==2	| regorconst rm |
 			"jge 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jle 1f"
@@ -2082,7 +2079,7 @@ cmi tle $1==2	| regorconst rm |
 			"jg 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jl 1f"
@@ -2094,7 +2091,7 @@ cmi teq $1==2	| regorconst rm |
 			"jne 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jne 1f"
@@ -2106,7 +2103,7 @@ cmi tne $1==2	| regorconst rm |
 			"je 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"je 1f"
@@ -2118,7 +2115,7 @@ cmi tge $1==2	| regorconst rm |
 			"jl 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jg 1f"
@@ -2130,7 +2127,7 @@ cmi tgt $1==2	| regorconst rm |
 			"jle 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jge 1f"
@@ -2142,7 +2139,7 @@ cmp tlt 	| regorconst rm |
 			"jae 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jbe 1f"
@@ -2154,7 +2151,7 @@ cmp tle 	| regorconst rm |
 			"ja 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jb 1f"
@@ -2166,7 +2163,7 @@ cmp teq 	| regorconst rm |
 			"jne 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jne 1f"
@@ -2178,7 +2175,7 @@ cmp tne 	| regorconst rm |
 			"je 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"je 1f"
@@ -2190,7 +2187,7 @@ cmp tge 	| regorconst rm |
 			"jb 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"ja 1f"
@@ -2202,7 +2199,7 @@ cmp tgt 	| regorconst rm |
 			"jbe 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jae 1f"
@@ -2214,7 +2211,7 @@ cms teq $1==2	| regorconst rm |
 			"jne 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"jne 1f"
@@ -2226,7 +2223,7 @@ cms tne $1==2	| regorconst rm |
 			"je 1f"
 			"inc %[a]\n1:"
 			erase(%[a])		     | %[a] | |
-...		| rm regorconst |
+...		| NO rm regorconst |
 			allocate(REG={ANYCON,0})
 			"cmp %[1],%[2]"
 			"je 1f"
@@ -2235,49 +2232,57 @@ cms tne $1==2	| regorconst rm |
 cmp zlt 	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jb $2" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"ja $2" 			  | | |
 cmp zle 	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jbe $2"			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jae $2"			  | | |
 cmp zeq 	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"je $2" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"je $2" 			  | | |
 cmp zne 	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jne $2"			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jne $2"			  | | |
 cmp zge 	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jae $2"			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jbe $2"			  | | |
 cmp zgt 	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"ja $2" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jb $2" 			  | | |
 cms zeq $1==2	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"je $2"			  	  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"je $2"			  	  | | |
 cms zne $1==2	| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jne $2" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jne $2" 			  | | |
 cms zne $1==4	| regorconst regorconst rm rm STACK |
@@ -2285,7 +2290,8 @@ cms zne $1==4	| regorconst regorconst rm rm STACK |
 			"jne $2"
 			"cmp %[4],%[2]"
 			"jne $2"			  | | |
-...		| rm rm regorconst regorconst STACK |
+...		| NO rm rm regorconst regorconst |
+			remove(ALL)
 			"cmp %[1],%[3]"
 			"jne $2"
 			"cmp %[2],%[4]"
@@ -2295,7 +2301,8 @@ cms zeq $1==4	| regorconst regorconst rm rm STACK |
 			"jne 1f"
 			"cmp %[4],%[2]"
 			"je $2\n1:"			  | | |
-...		| rm rm regorconst regorconst STACK |
+...		| NO rm rm regorconst regorconst |
+			remove(ALL)
 			"cmp %[1],%[3]"
 			"jne 1f"
 			"cmp %[2],%[4]"
@@ -2303,13 +2310,15 @@ cms zeq $1==4	| regorconst regorconst rm rm STACK |
 and zeq $1==2	| regorconst rm STACK |
 			"test %[2],%[1]"
 			"je $2" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"test %[1],%[2]"
 			"je $2"				  | | |
 and zne $1==2	| regorconst rm STACK |
 			"test %[2],%[1]"
 			"jne $2" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"test %[1],%[2]"
 			"jne $2"			  | | |
 loc and zeq $1<256 && $1>=0 && $2==2	| nocoercions : rm1 + memory2 |
@@ -2375,37 +2384,43 @@ bra		| |	remove(ALL)
 blt		| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jl $1" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jg $1" 			  | | |
 ble		| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jle $1"			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jge $1"			  | | |
 beq		| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"je $1" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"je $1" 			  | | |
 bne		| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jne $1"			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jne $1"			  | | |
 bge		| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jge $1"			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jle $1"			  | | |
 bgt		| regorconst rm STACK |
 			"cmp %[2],%[1]"
 			"jg $1" 			  | | |
-...		| rm regorconst STACK |
+...		| NO rm regorconst |
+			remove(ALL)
 			"cmp %[1],%[2]"
 			"jl $1" 			  | | |
 zlt		| rm STACK |
-- 
2.34.1