20090616-2317

1 files changed, 54 insertions, 54 deletions

diff --git a/utils/6a/lex.c b/utils/6a/lex.c
index cb0aa72c..bd836040 100644
--- a/utils/6a/lex.c
+++ b/utils/6a/lex.c
@@ -169,7 +169,7 @@ struct
 	"CL",		LBREG,	D_CL,
 	"DL",		LBREG,	D_DL,
 	"BL",		LBREG,	D_BL,
-/*	"SPB",	LBREG,	D_SPB,	*/
+/*	"SPB",		LBREG,	D_SPB,	*/
 	"SIB",		LBREG,	D_SIB,
 	"DIB",		LBREG,	D_DIB,
 	"BPB",		LBREG,	D_BPB,
@@ -197,14 +197,14 @@ struct
 	"DI",		LLREG,	D_DI,
 	"R8",		LLREG,	D_R8,
 	"R9",		LLREG,	D_R9,
-	"R10",	LLREG,	D_R10,
-	"R11",	LLREG,	D_R11,
-	"R12",	LLREG,	D_R12,
-	"R13",	LLREG,	D_R13,
-	"R14",	LLREG,	D_R14,
-	"R15",	LLREG,	D_R15,
+	"R10",		LLREG,	D_R10,
+	"R11",		LLREG,	D_R11,
+	"R12",		LLREG,	D_R12,
+	"R13",		LLREG,	D_R13,
+	"R14",		LLREG,	D_R14,
+	"R15",		LLREG,	D_R15,
 
-	"RARG",	LLREG,	REGARG,
+	"RARG",		LLREG,	REGARG,
 
 	"F0",		LFREG,	D_F0+0,
 	"F1",		LFREG,	D_F0+1,
@@ -215,31 +215,31 @@ struct
 	"F6",		LFREG,	D_F0+6,
 	"F7",		LFREG,	D_F0+7,
 
-	"M0",	LMREG,	D_M0+0,
-	"M1",	LMREG,	D_M0+1,
-	"M2",	LMREG,	D_M0+2,
-	"M3",	LMREG,	D_M0+3,
-	"M4",	LMREG,	D_M0+4,
-	"M5",	LMREG,	D_M0+5,
-	"M6",	LMREG,	D_M0+6,
-	"M7",	LMREG,	D_M0+7,
+	"M0",		LMREG,	D_M0+0,
+	"M1",		LMREG,	D_M0+1,
+	"M2",		LMREG,	D_M0+2,
+	"M3",		LMREG,	D_M0+3,
+	"M4",		LMREG,	D_M0+4,
+	"M5",		LMREG,	D_M0+5,
+	"M6",		LMREG,	D_M0+6,
+	"M7",		LMREG,	D_M0+7,
 
-	"X0",	LXREG,	D_X0+0,
-	"X1",	LXREG,	D_X0+1,
-	"X2",	LXREG,	D_X0+2,
-	"X3",	LXREG,	D_X0+3,
-	"X4",	LXREG,	D_X0+4,
-	"X5",	LXREG,	D_X0+5,
-	"X6",	LXREG,	D_X0+6,
-	"X7",	LXREG,	D_X0+7,
-	"X8",	LXREG,	D_X0+8,
-	"X9",	LXREG,	D_X0+9,
-	"X10",	LXREG,	D_X0+10,
-	"X11",	LXREG,	D_X0+11,
-	"X12",	LXREG,	D_X0+12,
-	"X13",	LXREG,	D_X0+13,
-	"X14",	LXREG,	D_X0+14,
-	"X15",	LXREG,	D_X0+15,
+	"X0",		LXREG,	D_X0+0,
+	"X1",		LXREG,	D_X0+1,
+	"X2",		LXREG,	D_X0+2,
+	"X3",		LXREG,	D_X0+3,
+	"X4",		LXREG,	D_X0+4,
+	"X5",		LXREG,	D_X0+5,
+	"X6",		LXREG,	D_X0+6,
+	"X7",		LXREG,	D_X0+7,
+	"X8",		LXREG,	D_X0+8,
+	"X9",		LXREG,	D_X0+9,
+	"X10",		LXREG,	D_X0+10,
+	"X11",		LXREG,	D_X0+11,
+	"X12",		LXREG,	D_X0+12,
+	"X13",		LXREG,	D_X0+13,
+	"X14",		LXREG,	D_X0+14,
+	"X15",		LXREG,	D_X0+15,
 
 	"CS",		LSREG,	D_CS,
 	"SS",		LSREG,	D_SS,
@@ -347,7 +347,7 @@ struct
 	"CMPXCHGL",	LTYPE3,	ACMPXCHGL,
 	"CMPXCHGQ",	LTYPE3,	ACMPXCHGQ,
 	"CMPXCHGW",	LTYPE3,	ACMPXCHGW,
-	"CPUID",		LTYPE0,	ACPUID,
+	"CPUID",	LTYPE0,	ACPUID,
 	"DAA",		LTYPE0,	ADAA,
 	"DAS",		LTYPE0,	ADAS,
 	"DATA",		LTYPED,	ADATA,
@@ -384,7 +384,7 @@ struct
 	"INSW",		LTYPE0,	AINSW,
 	"INT",		LTYPE2,	AINT,
 	"INTO",		LTYPE0,	AINTO,
-	"INVD",	LTYPE0,	AINVD,
+	"INVD",		LTYPE0,	AINVD,
 	"INVLPG",	LTYPE2,	AINVLPG,
 	"IRETL",	LTYPE0,	AIRETL,
 	"IRETQ",	LTYPE0,	AIRETQ,
@@ -530,15 +530,15 @@ struct
 	"RCRL",		LTYPE3,	ARCRL,
 	"RCRQ",		LTYPE3,	ARCRQ,
 	"RCRW",		LTYPE3,	ARCRW,
-	"RDMSR",		LTYPE0,	ARDMSR,
-	"RDPMC",		LTYPE0,	ARDPMC,
-	"RDTSC",		LTYPE0,	ARDTSC,
+	"RDMSR",	LTYPE0,	ARDMSR,
+	"RDPMC",	LTYPE0,	ARDPMC,
+	"RDTSC",	LTYPE0,	ARDTSC,
 	"REP",		LTYPE0,	AREP,
 	"REPN",		LTYPE0,	AREPN,
 	"RET",		LTYPE0,	ARET,
-	"RETFL",	LTYPERT,	ARETFL,
-	"RETFW",	LTYPERT,	ARETFW,
-	"RETFQ",	LTYPERT,	ARETFQ,
+	"RETFL",	LTYPERT,ARETFL,
+	"RETFW",	LTYPERT,ARETFW,
+	"RETFQ",	LTYPERT,ARETFQ,
 	"ROLB",		LTYPE3,	AROLB,
 	"ROLL",		LTYPE3,	AROLL,
 	"ROLQ",		LTYPE3,	AROLQ,
@@ -605,7 +605,7 @@ struct
 	"SUBQ",		LTYPE3,	ASUBQ,
 	"SUBW",		LTYPE3,	ASUBW,
 	"SYSCALL",	LTYPE0,	ASYSCALL,
-	"SYSRET",		LTYPE0,	ASYSRET,
+	"SYSRET",	LTYPE0,	ASYSRET,
 	"SWAPGS",	LTYPE0,	ASWAPGS,
 	"TESTB",	LTYPE3,	ATESTB,
 	"TESTL",	LTYPE3,	ATESTL,
@@ -617,7 +617,7 @@ struct
 	"QUAD",		LTYPE2,	AQUAD,
 	"WAIT",		LTYPE0,	AWAIT,
 	"WBINVD",	LTYPE0,	AWBINVD,
-	"WRMSR",		LTYPE0,	AWRMSR,
+	"WRMSR",	LTYPE0,	AWRMSR,
 	"WORD",		LTYPE2,	AWORD,
 	"XADDB",	LTYPE3,	AXADDB,
 	"XADDL",	LTYPE3,	AXADDL,
@@ -788,10 +788,10 @@ struct
 	"ANDNPS",	LTYPE3,	AANDNPS,
 	"ANDPD",	LTYPE3,	AANDPD,
 	"ANDPS",	LTYPE3,	AANDPS,
-	"CMPPD",	LTYPEXC,	ACMPPD,
-	"CMPPS",	LTYPEXC,	ACMPPS,
-	"CMPSD",	LTYPEXC,	ACMPSD,
-	"CMPSS",	LTYPEXC,	ACMPSS,
+	"CMPPD",	LTYPEXC,ACMPPD,
+	"CMPPS",	LTYPEXC,ACMPPS,
+	"CMPSD",	LTYPEXC,ACMPSD,
+	"CMPSS",	LTYPEXC,ACMPSS,
 	"COMISD",	LTYPE3,	ACOMISD,
 	"COMISS",	LTYPE3,	ACOMISS,
 	"CVTPL2PD",	LTYPE3,	ACVTPL2PD,
@@ -844,9 +844,9 @@ struct
 	"MINSS",	LTYPE3,	AMINSS,
 	"MOVAPD",	LTYPE3,	AMOVAPD,
 	"MOVAPS",	LTYPE3,	AMOVAPS,
-	"MOVD",	LTYPE3,	AMOVQ,	/* syn */
+	"MOVD",		LTYPE3,	AMOVQ,	/* syn */
 	"MOVDQ2Q",	LTYPE3,	AMOVQ,	/* syn */
-	"MOVO",	LTYPE3,	AMOVO,
+	"MOVO",		LTYPE3,	AMOVO,
 	"MOVOA",	LTYPE3,	AMOVO,	/* syn */
 	"MOVOU",	LTYPE3,	AMOVOU,
 	"MOVHLPS",	LTYPE3,	AMOVHLPS,
@@ -871,8 +871,8 @@ struct
 	"MULPS",	LTYPE3,	AMULPS,
 	"MULSD",	LTYPE3,	AMULSD,
 	"MULSS",	LTYPE3,	AMULSS,
-	"ORPD",	LTYPE3,	AORPD,
-	"ORPS",	LTYPE3,	AORPS,
+	"ORPD",		LTYPE3,	AORPD,
+	"ORPS",		LTYPE3,	AORPS,
 	"PACKSSLW",	LTYPE3,	APACKSSLW,
 	"PACKSSWB",	LTYPE3,	APACKSSWB,
 	"PACKUSWB",	LTYPE3,	APACKUSWB,
@@ -892,7 +892,7 @@ struct
 	"PANDUSB",	LTYPE3,	APANDUSB,
 	"PANDUSW",	LTYPE3,	APANDUSW,
 	"PANDW",	LTYPE3,	APANDW,
-	"PANDN",		LTYPE3, APANDN,
+	"PANDN",	LTYPE3, APANDN,
 	"PAVGB",	LTYPE3,	APAVGB,
 	"PAVGW",	LTYPE3,	APAVGW,
 	"PCMPEQB",	LTYPE3,	APCMPEQB,
@@ -914,7 +914,7 @@ struct
 	"PMULHW",	LTYPE3,	APMULHW,
 	"PMULLW",	LTYPE3,	APMULLW,
 	"PMULULQ",	LTYPE3,	APMULULQ,
-	"POR",	LTYPE3,	APOR,
+	"POR",		LTYPE3,	APOR,
 	"PSADBW",	LTYPE3,	APSADBW,
 	"PSHUFHW",	LTYPEX,	APSHUFHW,
 	"PSHUFL",	LTYPEX,	APSHUFL,
@@ -948,7 +948,7 @@ struct
 	"PUNPCKLLQ",	LTYPE3,	APUNPCKLLQ,
 	"PUNPCKLQDQ",	LTYPE3,	APUNPCKLQDQ,
 	"PUNPCKLWL",	LTYPE3,	APUNPCKLWL,
-	"PXOR",	LTYPE3,	APXOR,
+	"PXOR",		LTYPE3,	APXOR,
 	"RCPPS",	LTYPE3,	ARCPPS,
 	"RCPSS",	LTYPE3,	ARCPSS,
 	"RSQRTPS",	LTYPE3,	ARSQRTPS,
@@ -1210,7 +1210,7 @@ jackpot:
 	zaddr(&g2->to, st);
 
 out:
-	if(a != AGLOBL && a != ADATA)
+	if(a != AGLOBL && a != ADATA && a != AMODE)
 		pc++;
 }