sync compilers with Plan 9

remove 1[acl] 2[acl]

1 files changed, 64 insertions, 6 deletions

diff --git a/utils/8a/lex.c b/utils/8a/lex.c
index 0ec4dc17..3c7d0859 100644
--- a/utils/8a/lex.c
+++ b/utils/8a/lex.c
@@ -1,7 +1,7 @@
+#include <ctype.h>
 #define	EXTERN
 #include "a.h"
 #include "y.tab.h"
-#include <ctype.h>
 
 void
 main(int argc, char *argv[])
@@ -274,6 +274,9 @@ struct
 	"CMPSB",	LTYPE0,	ACMPSB,
 	"CMPSL",	LTYPE0,	ACMPSL,
 	"CMPSW",	LTYPE0,	ACMPSW,
+	"CMPXCHGB",	LTYPE3,	ACMPXCHGB,
+	"CMPXCHGL",	LTYPE3,	ACMPXCHGL,
+	"CMPXCHGW",	LTYPE3,	ACMPXCHGW,
 	"DAA",		LTYPE0,	ADAA,
 	"DAS",		LTYPE0,	ADAS,
 	"DATA",		LTYPED,	ADATA,
@@ -285,14 +288,14 @@ struct
 	"DIVW",		LTYPE2,	ADIVW,
 	"END",		LTYPE0,	AEND,
 	"ENTER",	LTYPE2,	AENTER,
-	"GLOBL",	LTYPET,	AGLOBL,
+	"GLOBL",	LTYPEG,	AGLOBL,
 	"HLT",		LTYPE0,	AHLT,
 	"IDIVB",	LTYPE2,	AIDIVB,
 	"IDIVL",	LTYPE2,	AIDIVL,
 	"IDIVW",	LTYPE2,	AIDIVW,
-	"IMULB",	LTYPE2,	AIMULB,
-	"IMULL",	LTYPE2,	AIMULL,
-	"IMULW",	LTYPE2,	AIMULW,
+	"IMULB",	LTYPEI,	AIMULB,
+	"IMULL",	LTYPEI,	AIMULL,
+	"IMULW",	LTYPEI,	AIMULW,
 	"INB",		LTYPE0,	AINB,
 	"INL",		LTYPE0,	AINL,
 	"INW",		LTYPE0,	AINW,
@@ -493,6 +496,39 @@ struct
 	"XORL",		LTYPE3,	AXORL,
 	"XORW",		LTYPE3,	AXORW,
 
+	"CMOVLCC",	LTYPE3,	ACMOVLCC,
+	"CMOVLCS",	LTYPE3,	ACMOVLCS,
+	"CMOVLEQ",	LTYPE3,	ACMOVLEQ,
+	"CMOVLGE",	LTYPE3,	ACMOVLGE,
+	"CMOVLGT",	LTYPE3,	ACMOVLGT,
+	"CMOVLHI",	LTYPE3,	ACMOVLHI,
+	"CMOVLLE",	LTYPE3,	ACMOVLLE,
+	"CMOVLLS",	LTYPE3,	ACMOVLLS,
+	"CMOVLLT",	LTYPE3,	ACMOVLLT,
+	"CMOVLMI",	LTYPE3,	ACMOVLMI,
+	"CMOVLNE",	LTYPE3,	ACMOVLNE,
+	"CMOVLOC",	LTYPE3,	ACMOVLOC,
+	"CMOVLOS",	LTYPE3,	ACMOVLOS,
+	"CMOVLPC",	LTYPE3,	ACMOVLPC,
+	"CMOVLPL",	LTYPE3,	ACMOVLPL,
+	"CMOVLPS",	LTYPE3,	ACMOVLPS,
+	"CMOVWCC",	LTYPE3,	ACMOVWCC,
+	"CMOVWCS",	LTYPE3,	ACMOVWCS,
+	"CMOVWEQ",	LTYPE3,	ACMOVWEQ,
+	"CMOVWGE",	LTYPE3,	ACMOVWGE,
+	"CMOVWGT",	LTYPE3,	ACMOVWGT,
+	"CMOVWHI",	LTYPE3,	ACMOVWHI,
+	"CMOVWLE",	LTYPE3,	ACMOVWLE,
+	"CMOVWLS",	LTYPE3,	ACMOVWLS,
+	"CMOVWLT",	LTYPE3,	ACMOVWLT,
+	"CMOVWMI",	LTYPE3,	ACMOVWMI,
+	"CMOVWNE",	LTYPE3,	ACMOVWNE,
+	"CMOVWOC",	LTYPE3,	ACMOVWOC,
+	"CMOVWOS",	LTYPE3,	ACMOVWOS,
+	"CMOVWPC",	LTYPE3,	ACMOVWPC,
+	"CMOVWPL",	LTYPE3,	ACMOVWPL,
+	"CMOVWPS",	LTYPE3,	ACMOVWPS,
+
 	"FMOVB",	LTYPE3, AFMOVB,
 	"FMOVBP",	LTYPE3, AFMOVBP,
 	"FMOVD",	LTYPE3, AFMOVD,
@@ -507,6 +543,14 @@ struct
 	"FMOVWP",	LTYPE3, AFMOVWP,
 	"FMOVX",	LTYPE3, AFMOVX,
 	"FMOVXP",	LTYPE3, AFMOVXP,
+	"FCMOVCC",	LTYPE3, AFCMOVCC,
+	"FCMOVCS",	LTYPE3, AFCMOVCS,
+	"FCMOVEQ",	LTYPE3, AFCMOVEQ,
+	"FCMOVHI",	LTYPE3, AFCMOVHI,
+	"FCMOVLS",	LTYPE3, AFCMOVLS,
+	"FCMOVNE",	LTYPE3, AFCMOVNE,
+	"FCMOVNU",	LTYPE3, AFCMOVNU,
+	"FCMOVUN",	LTYPE3, AFCMOVUN,
 	"FCOMB",	LTYPE3, AFCOMB,
 	"FCOMBP",	LTYPE3, AFCOMBP,
 	"FCOMD",	LTYPE3, AFCOMD,
@@ -514,11 +558,15 @@ struct
 	"FCOMDPP",	LTYPE3, AFCOMDPP,
 	"FCOMF",	LTYPE3, AFCOMF,
 	"FCOMFP",	LTYPE3, AFCOMFP,
+	"FCOMI",	LTYPE3, AFCOMI,
+	"FCOMIP",	LTYPE3, AFCOMIP,
 	"FCOML",	LTYPE3, AFCOML,
 	"FCOMLP",	LTYPE3, AFCOMLP,
 	"FCOMW",	LTYPE3, AFCOMW,
 	"FCOMWP",	LTYPE3, AFCOMWP,
 	"FUCOM",	LTYPE3, AFUCOM,
+	"FUCOMI",	LTYPE3, AFUCOMI,
+	"FUCOMIP",	LTYPE3, AFUCOMIP,
 	"FUCOMP",	LTYPE3, AFUCOMP,
 	"FUCOMPP",	LTYPE3, AFUCOMPP,
 	"FADDW",	LTYPE3, AFADDW,
@@ -629,7 +677,7 @@ cinit(void)
 	if(mygetwd(pathname, 99) == 0) {
 		pathname = allocn(pathname, 100, 900);
 		if(mygetwd(pathname, 999) == 0)
-			strcpy(pathname, "/???");
+			strcpy(pathname, "/?");
 	}
 }
 
@@ -704,6 +752,9 @@ zaddr(Gen *a, int s)
 	case D_FCONST:
 		t |= T_FCONST;
 		break;
+	case D_CONST2:
+		t |= T_OFFSET|T_OFFSET2;
+		break;
 	case D_SCONST:
 		t |= T_SCONST;
 		break;
@@ -723,6 +774,13 @@ zaddr(Gen *a, int s)
 		Bputc(&obuf, l>>16);
 		Bputc(&obuf, l>>24);
 	}
+	if(t & T_OFFSET2) {
+		l = a->offset2;
+		Bputc(&obuf, l);
+		Bputc(&obuf, l>>8);
+		Bputc(&obuf, l>>16);
+		Bputc(&obuf, l>>24);
+	}
 	if(t & T_SYM)		/* implies sym */
 		Bputc(&obuf, s);
 	if(t & T_FCONST) {