X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=mach.c;h=2673aa9f5fb5063a44fb3831bf33cf033e13084d;hp=78a79634f213fa31c78d0b17d1d480fe1a4391c9;hb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c;hpb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4

diff --git a/mach.c b/mach.c
index 78a7963..2673aa9 100644
--- a/mach.c
+++ b/mach.c
@@ -11,11 +11,11 @@
 #include "direct.h"
 #include "eagen.h"
 #include "error.h"
+#include "expr.h"
 #include "procln.h"
 #include "riscasm.h"
 #include "sect.h"
 #include "token.h"
-#include "expr.h"
 
 #define DEF_KW
 #include "kwtab.h"
@@ -49,8 +49,9 @@ int m_movep(WORD, WORD);
 int m_trap(WORD, WORD);
 int m_movem(WORD, WORD);
 int m_clra(WORD, WORD);
+int m_clrd(WORD, WORD);
 
-int m_move30(WORD, WORD);			//68020/30/40/60
+int m_move30(WORD, WORD);			// 68020/30/40/60
 int m_br30(WORD inst, WORD siz);
 int m_ea030(WORD inst, WORD siz);
 int m_bfop(WORD inst, WORD siz);
@@ -88,38 +89,7 @@ int m_pload(WORD inst, WORD siz, WORD extension);
 int m_pmove(WORD inst, WORD siz);
 int m_pmovefd(WORD inst, WORD siz);
 int m_ptest(WORD inst, WORD siz);
-int m_ptrapbs(WORD inst, WORD siz);
-int m_ptrapbc(WORD inst, WORD siz);
-int m_ptrapls(WORD inst, WORD siz);
-int m_ptraplc(WORD inst, WORD siz);
-int m_ptrapss(WORD inst, WORD siz);
-int m_ptrapsc(WORD inst, WORD siz);
-int m_ptrapas(WORD inst, WORD siz);
-int m_ptrapac(WORD inst, WORD siz);
-int m_ptrapws(WORD inst, WORD siz);
-int m_ptrapwc(WORD inst, WORD siz);
-int m_ptrapis(WORD inst, WORD siz);
-int m_ptrapic(WORD inst, WORD siz);
-int m_ptrapgc(WORD inst, WORD siz);
-int m_ptrapgs(WORD inst, WORD siz);
-int m_ptrapcs(WORD inst, WORD siz);
 int m_ptrapcc(WORD inst, WORD siz);
-int m_ptrapbsn(WORD inst, WORD siz);
-int m_ptrapbcn(WORD inst, WORD siz);
-int m_ptraplsn(WORD inst, WORD siz);
-int m_ptraplcn(WORD inst, WORD siz);
-int m_ptrapssn(WORD inst, WORD siz);
-int m_ptrapscn(WORD inst, WORD siz);
-int m_ptrapasn(WORD inst, WORD siz);
-int m_ptrapacn(WORD inst, WORD siz);
-int m_ptrapwsn(WORD inst, WORD siz);
-int m_ptrapwcn(WORD inst, WORD siz);
-int m_ptrapisn(WORD inst, WORD siz);
-int m_ptrapicn(WORD inst, WORD siz);
-int m_ptrapgsn(WORD inst, WORD siz);
-int m_ptrapgcn(WORD inst, WORD siz);
-int m_ptrapcsn(WORD inst, WORD siz);
-int m_ptrapccn(WORD inst, WORD siz);
 int m_ploadr(WORD inst, WORD siz);
 int m_ploadw(WORD inst, WORD siz);
 
@@ -164,38 +134,7 @@ int m_fnop(WORD inst, WORD siz);
 int m_frem(WORD inst, WORD siz);
 int m_fsabs(WORD inst, WORD siz);
 int m_fsadd(WORD inst, WORD siz);
-int m_fseq(WORD inst, WORD siz);
-int m_fsne(WORD inst, WORD siz);
-int m_fsgt(WORD inst, WORD siz);
-int m_fsngt(WORD inst, WORD siz);
-int m_fsge(WORD inst, WORD siz);
-int m_fsnge(WORD inst, WORD siz);
-int m_fslt(WORD inst, WORD siz);
-int m_fsnlt(WORD inst, WORD siz);
-int m_fsle(WORD inst, WORD siz);
-int m_fsnle(WORD inst, WORD siz);
-int m_fsgl(WORD inst, WORD siz);
-int m_fsngl(WORD inst, WORD siz);
-int m_fsgle(WORD inst, WORD siz);
-int m_fsngle(WORD inst, WORD siz);
-int m_fsogt(WORD inst, WORD siz);
-int m_fsule(WORD inst, WORD siz);
-int m_fsoge(WORD inst, WORD siz);
-int m_fsult(WORD inst, WORD siz);
-int m_fsolt(WORD inst, WORD siz);
-int m_fsuge(WORD inst, WORD siz);
-int m_fsole(WORD inst, WORD siz);
-int m_fsugt(WORD inst, WORD siz);
-int m_fsogl(WORD inst, WORD siz);
-int m_fsueq(WORD inst, WORD siz);
-int m_fsor(WORD inst, WORD siz);
-int m_fsun(WORD inst, WORD siz);
-int m_fsf(WORD inst, WORD siz);
-int m_fst(WORD inst, WORD siz);
-int m_fssf(WORD inst, WORD siz);
-int m_fsst(WORD inst, WORD siz);
-int m_fsseq(WORD inst, WORD siz);
-int m_fssne(WORD inst, WORD siz);
+int m_fscc(WORD inst, WORD siz);
 int m_fscale(WORD inst, WORD siz);
 int m_fsdiv(WORD inst, WORD siz);
 int m_fsfsqrt(WORD inst, WORD siz);
@@ -215,70 +154,7 @@ int m_ftanh(WORD inst, WORD siz);
 int m_ftentox(WORD inst, WORD siz);
 int m_ftst(WORD inst, WORD siz);
 int m_ftwotox(WORD inst, WORD siz);
-int m_ftrapeq(WORD inst, WORD siz);
-int m_ftrapne(WORD inst, WORD siz);
-int m_ftrapgt(WORD inst, WORD siz);
-int m_ftrapngt(WORD inst, WORD siz);
-int m_ftrapge(WORD inst, WORD siz);
-int m_ftrapnge(WORD inst, WORD siz);
-int m_ftraplt(WORD inst, WORD siz);
-int m_ftrapnlt(WORD inst, WORD siz);
-int m_ftraple(WORD inst, WORD siz);
-int m_ftrapnle(WORD inst, WORD siz);
-int m_ftrapgl(WORD inst, WORD siz);
-int m_ftrapngl(WORD inst, WORD siz);
-int m_ftrapgle(WORD inst, WORD siz);
-int m_ftrapngle(WORD inst, WORD siz);
-int m_ftrapogt(WORD inst, WORD siz);
-int m_ftrapule(WORD inst, WORD siz);
-int m_ftrapoge(WORD inst, WORD siz);
-int m_ftrapult(WORD inst, WORD siz);
-int m_ftrapolt(WORD inst, WORD siz);
-int m_ftrapuge(WORD inst, WORD siz);
-int m_ftrapole(WORD inst, WORD siz);
-int m_ftrapugt(WORD inst, WORD siz);
-int m_ftrapogl(WORD inst, WORD siz);
-int m_ftrapueq(WORD inst, WORD siz);
-int m_ftrapor(WORD inst, WORD siz);
-int m_ftrapun(WORD inst, WORD siz);
-int m_ftrapf(WORD inst, WORD siz);
-int m_ftrapt(WORD inst, WORD siz);
-int m_ftrapsf(WORD inst, WORD siz);
-int m_ftrapst(WORD inst, WORD siz);
-int m_ftrapseq(WORD inst, WORD siz);
-int m_ftrapsne(WORD inst, WORD siz);
-int m_ftrapeqn(WORD inst, WORD siz);
-int m_ftrapnen(WORD inst, WORD siz);
-int m_ftrapgtn(WORD inst, WORD siz);
-int m_ftrapngtn(WORD inst, WORD siz);
-int m_ftrapgen(WORD inst, WORD siz);
-int m_ftrapngen(WORD inst, WORD siz);
-int m_ftrapltn(WORD inst, WORD siz);
-int m_ftrapnltn(WORD inst, WORD siz);
-int m_ftraplen(WORD inst, WORD siz);
-int m_ftrapnlen(WORD inst, WORD siz);
-int m_ftrapgln(WORD inst, WORD siz);
-int m_ftrapngln(WORD inst, WORD siz);
-int m_ftrapglen(WORD inst, WORD siz);
-int m_ftrapnglen(WORD inst, WORD siz);
-int m_ftrapogtn(WORD inst, WORD siz);
-int m_ftrapulen(WORD inst, WORD siz);
-int m_ftrapogen(WORD inst, WORD siz);
-int m_ftrapultn(WORD inst, WORD siz);
-int m_ftrapoltn(WORD inst, WORD siz);
-int m_ftrapugen(WORD inst, WORD siz);
-int m_ftrapolen(WORD inst, WORD siz);
-int m_ftrapugtn(WORD inst, WORD siz);
-int m_ftrapogln(WORD inst, WORD siz);
-int m_ftrapueqn(WORD inst, WORD siz);
-int m_ftraporn(WORD inst, WORD siz);
-int m_ftrapunn(WORD inst, WORD siz);
-int m_ftrapfn(WORD inst, WORD siz);
-int m_ftraptn(WORD inst, WORD siz);
-int m_ftrapsfn(WORD inst, WORD siz);
-int m_ftrapstn(WORD inst, WORD siz);
-int m_ftrapseqn(WORD inst, WORD siz);
-int m_ftrapsnen(WORD inst, WORD siz);
+int m_ftrapcc(WORD inst, WORD siz);
 
 // Common error messages
 char range_error[] = "expression out of range";
@@ -292,9 +168,9 @@ char unsupport[] = "unsupported for selected CPU";
 
 // Include code tables
 MNTAB machtab[] = {
-   { 0xFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000, 0, m_badmode }, // 0
-   #include "68ktab.h"
-   {  0,  0L,  0L, 0x0000, 0, m_unimp   }            // Last entry
+	{ 0xFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000, 0, m_badmode }, // 0
+#include "68ktab.h"
+	{  0,  0L,  0L, 0x0000, 0, m_unimp   }            // Last entry
 };
 
 // Register number << 9
@@ -332,10 +208,10 @@ WORD lwsiz_8[] = {
 // Byte/Word/long size (0=.w, 1=.l) in bit 9
 WORD lwsiz_9[] = {
 	(WORD)-1,
-	0,                                                      // Byte
-	1<<9, (WORD)-1,                                         // Word
-	1<<10, (WORD)-1, (WORD)-1, (WORD)-1,                    // Long
-	1<<9                                                    // Word (SIZN)
+	0,                                               // Byte
+	1<<9, (WORD)-1,                                  // Word
+	1<<10, (WORD)-1, (WORD)-1, (WORD)-1,             // Long
+	1<<9                                             // Word (SIZN)
 };
 
 // Addressing mode in bits 6..11 (register/mode fields are reversed)
@@ -660,7 +536,7 @@ int m_shi(WORD inst, WORD siz)
 	}
 	else
 	{
-		AddFixup(FU_QUICK, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_QUICK, sloc, a0expr);
 		D_word(inst);
 	}
 
@@ -723,7 +599,7 @@ int m_dbra(WORD inst, WORD siz)
 	}
 	else
 	{
-		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, (TOKENPTR)a1expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, a1expr);
 		D_word(0);
 	}
 
@@ -789,22 +665,22 @@ int m_link(WORD inst, WORD siz)
 
 WORD extra_addressing[16]=
 {
-	0,     //0100 (bd,An,Xn)
-	0,     //0101 ([bd,An],Xn,od)
-	0x180, //0102 ([bc,An,Xn],od) (111 110 110 111)
-	0,     //0103 (bd,PC,Xn)
-	0,     //0104 ([bd,PC],Xn,od)
-	0,     //0105 ([bc,PC,Xn],od)
-	0,     //0106
-	0,     //0107
-	0,     //0110
-	0,     //0111 Nothing
-	0x30,  //0112 (Dn.w)
-	0x30,  //0113 (Dn.l)
-	0,     //0114
-	0,     //0115
-	0,     //0116
-	0      //0117
+	0,     // 0100 (bd,An,Xn)
+	0,     // 0101 ([bd,An],Xn,od)
+	0x180, // 0102 ([bc,An,Xn],od) (111 110 110 111)
+	0,     // 0103 (bd,PC,Xn)
+	0,     // 0104 ([bd,PC],Xn,od)
+	0,     // 0105 ([bc,PC,Xn],od)
+	0,     // 0106
+	0,     // 0107
+	0,     // 0110
+	0,     // 0111 Nothing
+	0x30,  // 0112 (Dn.w)
+	0x30,  // 0113 (Dn.l)
+	0,     // 0114
+	0,     // 0115
+	0,     // 0116
+	0      // 0117
 };
 
 
@@ -834,7 +710,7 @@ int m_move(WORD inst, WORD size)
 	}
 	else
 	{
-		if ((am0 < ABASE) && (am1 < ABASE))			//68000 modes
+		if ((am0 < ABASE) && (am1 < ABASE))			// 68000 modes
 		{
 			inst |= siz_12[siz] | am_6[am1] | reg_9[a1reg] | am0 | a0reg;
 
@@ -846,7 +722,7 @@ int m_move(WORD inst, WORD size)
 			if (am1 >= ADISP)
 				ea1gen((WORD)siz | 0x8000);   // Tell ea1gen we're move ea,ea
 		}
-		else					//68020+ modes
+		else					// 68020+ modes
 		{
 			inst |= siz_12[siz] | reg_9[a1reg] | extra_addressing[am0 - ABASE];
 
@@ -863,6 +739,7 @@ int m_move(WORD inst, WORD size)
 	return OK;
 }
 
+
 //
 // Handle MOVE <C_ALL030> <C_ALTDATA>
 //        MOVE <C_ALL030> <M_AREG>
@@ -914,7 +791,7 @@ int m_moveq(WORD inst, WORD siz)
 	// Arrange for future fixup
 	if (!(a0exattr & DEFINED))
 	{
-		AddFixup(FU_BYTE | FU_SEXT, sloc + 1, (TOKENPTR)a0expr);
+		AddFixup(FU_BYTE | FU_SEXT, sloc + 1, a0expr);
 		a0exval = 0;
 	}
 	else if ((uint32_t)a0exval + 0x100 >= 0x200)
@@ -1030,7 +907,7 @@ int m_br(WORD inst, WORD siz)
 	if (siz == SIZB || siz == SIZS)
 	{
 		// .B
-		AddFixup(FU_BBRA | FU_PCREL | FU_SEXT, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_BBRA | FU_PCREL | FU_SEXT, sloc, a0expr);
 		D_word(inst);
 		return OK;
 	}
@@ -1038,7 +915,7 @@ int m_br(WORD inst, WORD siz)
 	{
 		// .W
 		D_word(inst);
-		AddFixup(FU_WORD | FU_PCREL | FU_LBRA | FU_ISBRA, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_LBRA | FU_ISBRA, sloc, a0expr);
 		D_word(0);
 	}
 
@@ -1063,7 +940,7 @@ int m_addq(WORD inst, WORD siz)
 	}
 	else
 	{
-		AddFixup(FU_QUICK, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_QUICK, sloc, a0expr);
 		D_word(inst);
 	}
 
@@ -1114,10 +991,10 @@ int m_movem(WORD inst, WORD siz)
 	if (siz == SIZL)
 		inst |= 0x0040;
 
-	if (*tok.u32 == '#')
+	if (*tok == '#')
 	{
 		// Handle #<expr>, ea
-		tok.u32++;
+		tok++;
 
 		if (abs_expr(&eval) != OK)
 			return OK;
@@ -1129,14 +1006,14 @@ int m_movem(WORD inst, WORD siz)
 		goto immed1;
 	}
 
-	if ((*tok.u32 >= KW_D0) && (*tok.u32 <= KW_A7))
+	if ((*tok >= KW_D0) && (*tok <= KW_A7))
 	{
 		// <rlist>, ea
 		if (reglist(&rmask) < 0)
 			return OK;
 
 immed1:
-		if (*tok.u32++ != ',')
+		if (*tok++ != ',')
 			return error("missing comma");
 
 		if (amode(0) < 0)
@@ -1165,16 +1042,16 @@ immed1:
 
 		inst |= 0x0400 | am0 | a0reg;
 
-		if (*tok.u32++ != ',')
+		if (*tok++ != ',')
 			return error("missing comma");
 
-		if (*tok.u32 == EOL)
+		if (*tok == EOL)
 			return error("missing register list");
 
-		if (*tok.u32 == '#')
+		if (*tok == '#')
 		{
 			// ea, #<expr>
-			tok.u32++;
+			tok++;
 
 			if (abs_expr(&eval) != OK)
 				return OK;
@@ -1211,6 +1088,22 @@ int m_clra(WORD inst, WORD siz)
 }
 
 
+//
+// CLR.L Dn ==> CLR.L An or MOVEQ #0,Dx
+//
+int m_clrd(WORD inst, WORD siz)
+{
+	if (!CHECK_OPTS(OPT_CLR_DX))
+		inst |= a0reg;
+	else
+		inst = (a0reg << 9) | B16(01110000, 00000000);
+
+	D_word(inst);
+
+	return OK;
+}
+
+
 ////////////////////////////////////////
 //
 // 68020/30/40 instructions
@@ -1236,7 +1129,7 @@ int m_br30(WORD inst, WORD siz)
 	else
 	{
 		// .L
-		AddFixup(FU_LONG | FU_PCREL | FU_SEXT, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_LONG | FU_PCREL | FU_SEXT, sloc, a0expr);
 		D_word(inst);
 		return OK;
 	}
@@ -1378,21 +1271,21 @@ int m_cas(WORD inst, WORD siz)
 	}
 
 	// Dc
-	if ((*tok.u32 < KW_D0) && (*tok.u32 > KW_D7))
+	if ((*tok < KW_D0) && (*tok > KW_D7))
 		return error("CAS accepts only data registers");
 
-	inst2 = (*tok.u32++) & 7;
+	inst2 = (*tok++) & 7;
 
-	if (*tok.u32++ != ',')
+	if (*tok++ != ',')
 		return error("missing comma");
 
 	// Du
-	if ((*tok.u32 < KW_D0) && (*tok.u32 > KW_D7))
+	if ((*tok < KW_D0) && (*tok > KW_D7))
 		return error("CAS accepts only data registers");
 
-	inst2 |= ((*tok.u32++) & 7) << 6;
+	inst2 |= ((*tok++) & 7) << 6;
 
-	if (*tok.u32++ != ',')
+	if (*tok++ != ',')
 		return error("missing comma");
 
 	// ea
@@ -1402,7 +1295,7 @@ int m_cas(WORD inst, WORD siz)
 	if (modes > 1)
 		return error("too many ea fields");
 
-	if (*tok.u32 != EOL)
+	if (*tok != EOL)
 		return error("extra (unexpected) text found");
 
 	// Reject invalud ea modes
@@ -1448,71 +1341,71 @@ int m_cas2(WORD inst, WORD siz)
 	}
 
 	// Dc1
-	if ((*tok.u32 < KW_D0) && (*tok.u32 > KW_D7))
+	if ((*tok < KW_D0) && (*tok > KW_D7))
 		return error("CAS2 accepts only data registers for Dx1:Dx2 pairs");
 
-	inst2 = (*tok.u32++) & 7;
+	inst2 = (*tok++) & 7;
 
-	if (*tok.u32++ != ':')
+	if (*tok++ != ':')
 		return error("missing colon");
 
 	// Dc2
-	if ((*tok.u32 < KW_D0) && (*tok.u32 > KW_D7))
+	if ((*tok < KW_D0) && (*tok > KW_D7))
 		return error("CAS2 accepts only data registers for Dx1:Dx2 pairs");
 
-	inst3 = (*tok.u32++) & 7;
+	inst3 = (*tok++) & 7;
 
-	if (*tok.u32++ != ',')
+	if (*tok++ != ',')
 		return error("missing comma");
 
 	// Du1
-	if ((*tok.u32 < KW_D0) && (*tok.u32 > KW_D7))
+	if ((*tok < KW_D0) && (*tok > KW_D7))
 		return error("CAS2 accepts only data registers for Dx1:Dx2 pairs");
 
-	inst2 |= ((*tok.u32++) & 7) << 6;
+	inst2 |= ((*tok++) & 7) << 6;
 
-	if (*tok.u32++ != ':')
+	if (*tok++ != ':')
 		return error("missing colon");
 
 	// Du2
-	if ((*tok.u32 < KW_D0) && (*tok.u32 > KW_D7))
+	if ((*tok < KW_D0) && (*tok > KW_D7))
 		return error("CAS2 accepts only data registers for Dx1:Dx2 pairs");
 
-	inst3 |= ((*tok.u32++) & 7) << 6;
+	inst3 |= ((*tok++) & 7) << 6;
 
-	if (*tok.u32++ != ',')
+	if (*tok++ != ',')
 		return error("missing comma");
 
 	// Rn1
-	if (*tok.u32++ != '(')
+	if (*tok++ != '(')
 		return error("missing (");
-	if ((*tok.u32 >= KW_D0) && (*tok.u32 <= KW_D7))
-		inst2 |= (((*tok.u32++) & 7) << 12) | (0 << 15);
-	else if ((*tok.u32 >= KW_A0) && (*tok.u32 <= KW_A7))
-		inst2 |= (((*tok.u32++) & 7) << 12) | (1 << 15);
+	if ((*tok >= KW_D0) && (*tok <= KW_D7))
+		inst2 |= (((*tok++) & 7) << 12) | (0 << 15);
+	else if ((*tok >= KW_A0) && (*tok <= KW_A7))
+		inst2 |= (((*tok++) & 7) << 12) | (1 << 15);
 	else
 		return error("CAS accepts either data or address registers for Rn1:Rn2 pair");
 
-	if (*tok.u32++ != ')')
+	if (*tok++ != ')')
 		return error("missing (");
 
-	if (*tok.u32++ != ':')
+	if (*tok++ != ':')
 		return error("missing colon");
 
 	// Rn2
-	if (*tok.u32++ != '(')
+	if (*tok++ != '(')
 		return error("missing (");
-	if ((*tok.u32 >= KW_D0) && (*tok.u32 <= KW_D7))
-		inst3 |= (((*tok.u32++) & 7) << 12) | (0 << 15);
-	else if ((*tok.u32 >= KW_A0) && (*tok.u32 <= KW_A7))
-		inst3 |= (((*tok.u32++) & 7) << 12) | (1 << 15);
+	if ((*tok >= KW_D0) && (*tok <= KW_D7))
+		inst3 |= (((*tok++) & 7) << 12) | (0 << 15);
+	else if ((*tok >= KW_A0) && (*tok <= KW_A7))
+		inst3 |= (((*tok++) & 7) << 12) | (1 << 15);
 	else
 		return error("CAS accepts either data or address registers for Rn1:Rn2 pair");
 
-	if (*tok.u32++ != ')')
+	if (*tok++ != ')')
 		return error("missing (");
 
-	if (*tok.u32 != EOL)
+	if (*tok != EOL)
 		return error("extra (unexpected) text found");
 
 	D_word(inst);
@@ -1652,7 +1545,7 @@ int m_cpbr(WORD inst, WORD siz)
 	{
 		// .L
 		D_word(inst);
-		AddFixup(FU_LONG | FU_PCREL | FU_SEXT, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_LONG | FU_PCREL | FU_SEXT, sloc, a0expr);
 		D_long(0);
 		return OK;
 	}
@@ -1660,7 +1553,7 @@ int m_cpbr(WORD inst, WORD siz)
 	{
 		// .W
 		D_word(inst);
-		AddFixup(FU_WORD | FU_PCREL | FU_SEXT, sloc, (TOKENPTR)a0expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_SEXT, sloc, a0expr);
 		D_word(0);
 	}
 
@@ -1700,7 +1593,7 @@ int m_cpdbr(WORD inst, WORD siz)
 	}
 	else
 	{
-		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, (TOKENPTR)a1expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, a1expr);
 		D_word(0);
 	}
 
@@ -1995,6 +1888,7 @@ int m_divsl(WORD inst, WORD siz)
 	return OK;
 }
 
+
 //
 // divul.l
 //
@@ -2129,51 +2023,51 @@ int m_pack(WORD inst, WORD siz)
 	if (siz != SIZN)
 		return error("bad size suffix");
 
-	if (*tok.u32 >= KW_D0 && *tok.u32 <= KW_D7)
+	if (*tok >= KW_D0 && *tok <= KW_D7)
 	{
 		// Dx,Dy,#<adjustment>
 		inst |= (0 << 3);   // R/M
-		inst |= (*tok.u32++ & 7);
+		inst |= (*tok++ & 7);
 
-		if (*tok.u32 != ',' && tok.u32[2] != ',')
+		if (*tok != ',' && tok[2] != ',')
 			return error("missing comma");
 
-		if (tok.u32[1] < KW_D0 && tok.u32[1] > KW_D7)
+		if (tok[1] < KW_D0 && tok[1] > KW_D7)
 			return error(syntax_error);
 
-		inst |= ((tok.u32[1] & 7)<<9);
-		tok.u32 = tok.u32 + 3;
+		inst |= ((tok[1] & 7)<<9);
+		tok = tok + 3;
 		D_word(inst);
 		// Fall through for adjustment (common in both valid cases)
 	}
-	else if (*tok.u32 == '-')
+	else if (*tok == '-')
 	{
 		// -(Ax),-(Ay),#<adjustment>
 		inst |= (1 << 3);   // R/M
-		tok.u32++;  // eat the minus
+		tok++;  // eat the minus
 
-		if ((*tok.u32 != '(') && (tok.u32[2]!=')') && (tok.u32[3]!=',') && (tok.u32[4] != '-') && (tok.u32[5] != '(') && (tok.u32[7] != ')') && (tok.u32[8] != ','))
+		if ((*tok != '(') && (tok[2]!=')') && (tok[3]!=',') && (tok[4] != '-') && (tok[5] != '(') && (tok[7] != ')') && (tok[8] != ','))
 			return error(syntax_error);
 
-		if (tok.u32[1] < KW_A0 && tok.u32[1] > KW_A7)
+		if (tok[1] < KW_A0 && tok[1] > KW_A7)
 			return error(syntax_error);
 
-		if (tok.u32[5] < KW_A0 && tok.u32[6] > KW_A7)
+		if (tok[5] < KW_A0 && tok[6] > KW_A7)
 			return error(syntax_error);
 
-		inst |= ((tok.u32[1] & 7) << 0);
-		inst |= ((tok.u32[6] & 7) << 9);
-		tok.u32 = tok.u32 + 9;
+		inst |= ((tok[1] & 7) << 0);
+		inst |= ((tok[6] & 7) << 9);
+		tok = tok + 9;
 		D_word(inst);
 		// Fall through for adjustment (common in both valid cases)
 	}
 	else
 		return error("invalid syntax");
 
-	if ((*tok.u32 != CONST) && (*tok.u32 != SYMBOL) && (*tok.u32 != '-'))
+	if ((*tok != CONST) && (*tok != SYMBOL) && (*tok != '-'))
 		return error(syntax_error);
 
-	if (expr((TOKENPTR)a0expr, &a0exval, &a0exattr, &a0esym) == ERROR)
+	if (expr(a0expr, &a0exval, &a0exattr, &a0esym) == ERROR)
 		return ERROR;
 
 	if ((a0exattr & DEFINED) == 0)
@@ -2182,7 +2076,7 @@ int m_pack(WORD inst, WORD siz)
 	if (a0exval + 0x8000 > 0x10000)
 		return error("");
 
-	if (*tok.u32 != EOL)
+	if (*tok != EOL)
 		return error(extra_stuff);
 
 	D_word((a0exval & 0xFFFF));
@@ -2463,15 +2357,15 @@ int m_pflush(WORD inst, WORD siz)
 		// PFLUSH FC, MASK, < ea >
 		WORD mask, fc;
 
-		switch ((int)*tok.u32)
+		switch ((int)*tok)
 		{
 		case '#':
-			tok.u32++;
+			tok++;
 
-			if (*tok.u32 != CONST && *tok.u32 != SYMBOL)
+			if (*tok != CONST && *tok != SYMBOL)
 				return error("function code should be an expression");
 
-			if (expr((TOKENPTR)a0expr, &a0exval, &a0exattr, &a0esym) == ERROR)
+			if (expr(a0expr, &a0exval, &a0exattr, &a0esym) == ERROR)
 				return ERROR;
 
 			if ((a0exattr & DEFINED) == 0)
@@ -2490,30 +2384,30 @@ int m_pflush(WORD inst, WORD siz)
 		case KW_D5:
 		case KW_D6:
 		case KW_D7:
-			fc = (1 << 4) | (*tok.u32++ & 7);
+			fc = (1 << 4) | (*tok++ & 7);
 			break;
 		case KW_SFC:
 			fc = 0;
-			tok.u32++;
+			tok++;
 			break;
 		case KW_DFC:
 			fc = 1;
-			tok.u32++;
+			tok++;
 			break;
 		default:
 			return error(syntax_error);
 		}
 
-		if (*tok.u32++ != ',')
+		if (*tok++ != ',')
 			return error("comma exptected");
 
-		if (*tok.u32++ != '#')
+		if (*tok++ != '#')
 			return error("mask should be an immediate value");
 
-		if (*tok.u32 != CONST && *tok.u32 != SYMBOL)
+		if (*tok != CONST && *tok != SYMBOL)
 			return error("mask is supposed to be immediate");
 
-		if (expr((TOKENPTR)a0expr, &a0exval, &a0exattr, &a0esym) == ERROR)
+		if (expr(a0expr, &a0exval, &a0exattr, &a0esym) == ERROR)
 			return ERROR;
 
 		if ((a0exattr & DEFINED) == 0)
@@ -2524,7 +2418,7 @@ int m_pflush(WORD inst, WORD siz)
 
 		mask = (uint16_t)a0exval << 5;
 
-		if (*tok.u32 == EOL)
+		if (*tok == EOL)
 		{
 			// PFLUSH FC, MASK
 			D_word(inst);
@@ -2532,15 +2426,15 @@ int m_pflush(WORD inst, WORD siz)
 			D_word(inst);
 			return OK;
 		}
-		else if (*tok.u32 == ',')
+		else if (*tok == ',')
 		{
 			// PFLUSH FC, MASK, < ea >
-			tok.u32++;
+			tok++;
 
 			if (amode(0) == ERROR)
 				return ERROR;
 
-			if (*tok.u32 != EOL)
+			if (*tok != EOL)
 				return error(extra_stuff);
 
 			if (am0 == AIND || am0 == ABSW || am0 == ABSL || am0 == ADISP || am0 == ADISP || am0 == AINDEXED || am0 == ABASE || am0 == MEMPOST || am0 == MEMPRE)
@@ -2565,10 +2459,10 @@ int m_pflush(WORD inst, WORD siz)
 	{
 		// PFLUSH(An)
 		// PFLUSHN(An)
-		if (*tok.u32 != '(' && tok.u32[2] != ')')
+		if (*tok != '(' && tok[2] != ')')
 			return error(syntax_error);
 
-		if (tok.u32[1] < KW_A0 && tok.u32[1] > KW_A7)
+		if (tok[1] < KW_A0 && tok[1] > KW_A7)
 			return error("expected (An)");
 
 		if ((inst & 7) == 7)
@@ -2579,9 +2473,9 @@ int m_pflush(WORD inst, WORD siz)
 			// pflushn inside 68ktab and detect it here.
 			inst = (inst & 0xff8) | 8;
 
-		inst |= (tok.u32[1] & 7) | (5 << 8);
+		inst |= (tok[1] & 7) | (5 << 8);
 
-		if (tok.u32[3] != EOL)
+		if (tok[3] != EOL)
 			return error(extra_stuff);
 
 		D_word(inst);
@@ -2594,7 +2488,7 @@ int m_pflush(WORD inst, WORD siz)
 
 
 //
-// pflushr (68551)
+// pflushr (68851)
 //
 int m_pflushr(WORD inst, WORD siz)
 {
@@ -2650,13 +2544,12 @@ int m_pflushr(WORD inst, WORD siz)
 //
 int m_pload(WORD inst, WORD siz, WORD extension)
 {
-	// TODO: 68551 support is not added yet.
-	// None of the ST series of computers had a 68020 + 68551 socket and since
+	// TODO: 68851 support is not added yet.
+	// None of the ST series of computers had a 68020 + 68851 socket and since
 	// this is an Atari targetted assembler...
 	CHECKNO30;
 
 	inst |= am1;
-
 	D_word(inst);
 
 	switch (am0)
@@ -2689,32 +2582,33 @@ int m_pload(WORD inst, WORD siz, WORD extension)
 	return OK;
 }
 
+
 int m_ploadr(WORD inst, WORD siz)
 {
 	return m_pload(inst, siz, 1 << 9);
 }
 
+
 int m_ploadw(WORD inst, WORD siz)
 {
 	return m_pload(inst, siz, 0 << 9);
 }
 
+
 //
-// pmove (68030/68551)
+// pmove (68030/68851)
 //
 int m_pmove(WORD inst, WORD siz)
 {
 	int inst2,reg;
 
-	// TODO: 68551 support is not added yet.
-	// None of the ST series of computers had
-	// a 68020 + 68551 socket and since this is
-	// an Atari targetted assembler....
-	// (same for 68EC030)
+	// TODO: 68851 support is not added yet. None of the ST series of
+	// computers had a 68020 + 68851 socket and since this is an Atari
+	// targetted assembler.... (same for 68EC030)
 	CHECKNO30;
 
-	inst2 = inst & (1 << 8); //Copy the flush bit over to inst2 in case we're called from m_pmovefd
-	inst &= ~(1 << 8);		//And mask it out
+	inst2 = inst & (1 << 8);	// Copy the flush bit over to inst2 in case we're called from m_pmovefd
+	inst &= ~(1 << 8);			// And mask it out
 
 	if (am0 == CREG)
 	{
@@ -2746,7 +2640,6 @@ int m_pmove(WORD inst, WORD siz)
 	if ((reg == (KW_MMUSR - KW_SFC)) && ((siz != SIZW) && (siz != SIZN)))
 		return error(siz_error);
 
-
 	if (am0 == CREG)
 	{
 		inst |= am1 | a1reg;
@@ -2802,85 +2695,41 @@ int m_pmovefd(WORD inst, WORD siz)
 	return m_pmove(inst | (1 << 8), siz);
 }
 
+
 //
 // ptrapcc (68851)
 //
-#define gen_ptrapcc(name,opcode) \
-int m_##name(WORD inst, WORD siz) \
-{ \
-	CHECKNO20; \
-	if (siz == SIZW) \
-	{ \
-		D_word(inst); \
-		D_word(B8(opcode)); \
-		D_word(a0exval); \
-	} \
-	else \
-	{ \
-		inst |= 3; \
-		D_word(inst); \
-		D_word(B8(opcode)); \
-		D_long(a0exval); \
-	} \
-	return OK; \
-}\
-int m_##name##n(WORD inst, WORD siz) \
-{ \
-	CHECKNO20; \
-	D_word(inst); \
-	D_word(B8(opcode)); \
-	return OK; \
-}
-
-gen_ptrapcc(ptrapbs,00000000)
-gen_ptrapcc(ptrapbc,00000001)
-gen_ptrapcc(ptrapls,00000010)
-gen_ptrapcc(ptraplc,00000011)
-gen_ptrapcc(ptrapss,00000100)
-gen_ptrapcc(ptrapsc,00000101)
-gen_ptrapcc(ptrapas,00000110)
-gen_ptrapcc(ptrapac,00000111)
-gen_ptrapcc(ptrapws,00001000)
-gen_ptrapcc(ptrapwc,00001001)
-gen_ptrapcc(ptrapis,00001010)
-gen_ptrapcc(ptrapic,00001011)
-gen_ptrapcc(ptrapgc,00001100)
-gen_ptrapcc(ptrapgs,00001101)
-gen_ptrapcc(ptrapcs,00001110)
-gen_ptrapcc(ptrapcc,00001111)
-
-//int m_ptrapbs(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000000)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000000)); D_long(a0exval); } return OK; }
-//int m_ptrapbc(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000001)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000001)); D_long(a0exval); } return OK; }
-//int m_ptrapls(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000010)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000010)); D_long(a0exval); } return OK; }
-//int m_ptraplc(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000011)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000011)); D_long(a0exval); } return OK; }
-//int m_ptrapss(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000100)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000100)); D_long(a0exval); } return OK; }
-//int m_ptrapsc(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000101)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000101)); D_long(a0exval); } return OK; }
-//int m_ptrapas(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000110)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000110)); D_long(a0exval); } return OK; }
-//int m_ptrapac(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00000111)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00000111)); D_long(a0exval); } return OK; }
-//int m_ptrapws(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001000)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001000)); D_long(a0exval); } return OK; }
-//int m_ptrapwc(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001001)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001001)); D_long(a0exval); } return OK; }
-//int m_ptrapis(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001010)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001010)); D_long(a0exval); } return OK; }
-//int m_ptrapic(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001011)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001011)); D_long(a0exval); } return OK; }
-//int m_ptrapgc(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001100)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001100)); D_long(a0exval); } return OK; }
-//int m_ptrapgs(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001101)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001101)); D_long(a0exval); } return OK; }
-//int m_ptrapcs(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001110)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001110)); D_long(a0exval); } return OK; }
-//int m_ptrapcc(WORD inst, WORD siz) { CHECKNO20; if (siz == SIZW) { D_word(inst); D_word(B8(00001111)); D_word(a0exval); } else { inst |= 3; D_word(inst); D_word(B8(00001111)); D_long(a0exval); } return OK; }
-//int m_ptrapbsn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000000)); return OK; }
-//int m_ptrapbcn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000001)); return OK; }
-//int m_ptraplsn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000010)); return OK; }
-//int m_ptraplcn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000011)); return OK; }
-//int m_ptrapssn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000100)); return OK; }
-//int m_ptrapscn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000101)); return OK; }
-//int m_ptrapasn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000110)); return OK; }
-//int m_ptrapacn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00000111)); return OK; }
-//int m_ptrapwsn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001000)); return OK; }
-//int m_ptrapwcn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001001)); return OK; }
-//int m_ptrapisn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001010)); return OK; }
-//int m_ptrapicn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001011)); return OK; }
-//int m_ptrapgsn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001100)); return OK; }
-//int m_ptrapgcn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001101)); return OK; }
-//int m_ptrapcsn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001110)); return OK; }
-//int m_ptrapccn(WORD inst, WORD siz) { CHECKNO20; D_word(inst); D_word(B8(00001111)); return OK; }
+int m_ptrapcc(WORD inst, WORD siz)
+{
+    CHECKNO20;
+	// We stash the 5 condition bits inside the opcode in 68ktab (bits 0-4),
+	// so we need to extract them first and fill in the clobbered bits.
+	WORD opcode = inst & 0x1F;
+	inst = (inst & 0xFFE0) | (0x18);
+
+	if (siz == SIZW)
+	{
+		inst |= 2;
+		D_word(inst);
+		D_word(opcode);
+		D_word(a0exval);
+	}
+	else if (siz == SIZL)
+	{
+		inst |= 3;
+		D_word(inst);
+		D_word(opcode);
+		D_long(a0exval);
+	}
+	else if (siz == SIZN)
+	{
+		inst |= 4;
+		D_word(inst);
+		D_word(opcode);
+	}
+
+	return OK;
+}
 
 
 //
@@ -2949,7 +2798,7 @@ static inline int gen_fpu(WORD inst, WORD siz, WORD opmode, WORD emul)
 	}
 	else
 	{
-		inst |= (1 << 9);	//Bolt on FPU id
+		inst |= (1 << 9);	// Bolt on FPU id
 		D_word(inst);
 		inst = 0;
 		inst = a0reg << 10;
@@ -2978,8 +2827,8 @@ int m_fsabs(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01011000), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -2987,8 +2836,8 @@ int m_fdabs(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01011100), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -3014,8 +2863,8 @@ int m_fsadd(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01100010), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -3023,8 +2872,8 @@ int m_fdadd(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01100110), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -3087,7 +2936,7 @@ int m_fcosh(WORD inst, WORD siz)
 //
 int m_fdbcc(WORD inst, WORD siz)
 {
-	WORD opcode = inst & 0x3F;	//Grab conditional bitfield
+	WORD opcode = inst & 0x3F;	// Grab conditional bitfield
 
 	inst &= ~0x3F;
 	inst |= 1 << 3;
@@ -3111,7 +2960,7 @@ int m_fdbcc(WORD inst, WORD siz)
 	}
 	else
 	{
-		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, (TOKENPTR)a1expr);
+		AddFixup(FU_WORD | FU_PCREL | FU_ISBRA, sloc, a1expr);
 		D_word(0);
 	}
 
@@ -3132,8 +2981,8 @@ int m_fsdiv(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01100000), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -3141,8 +2990,8 @@ int m_fddiv(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01100100), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -3258,7 +3107,6 @@ int m_fmod(WORD inst, WORD siz)
 //
 int m_fmove(WORD inst, WORD siz)
 {
-
 	// EA to register
 	if ((am0 == FREG) && (am1 < AM_USP))
 	{
@@ -3283,7 +3131,6 @@ int m_fmove(WORD inst, WORD siz)
 		case SIZP:	inst |= (3 << 10);
 			// In P size we have 2 cases: {#k} where k is immediate
 			// and {Dn} where Dn=Data register
-
 			if (bfparam1)
 			{
 				// Dn
@@ -3305,7 +3152,6 @@ int m_fmove(WORD inst, WORD siz)
 			break;
 		}
 
-
 		// Destination specifier
 		inst |= (a0reg << 7);
 
@@ -3317,7 +3163,7 @@ int m_fmove(WORD inst, WORD siz)
 	}
 	else if ((am0 < AM_USP) && (am1 == FREG))
 	{
-		//ea->fpx
+		// ea->fpx
 
 		// EA
 		inst |= am0 | a0reg;
@@ -3408,8 +3254,8 @@ int m_fmovescr(WORD inst, WORD siz)
 		ea0gen(siz);
 		return OK;
 	}
-	else
-		return error("m_fmovescr says: wut?");
+
+	return error("m_fmovescr says: wut?");
 }
 
 //
@@ -3467,15 +3313,15 @@ int m_fmovem(WORD inst, WORD siz)
 	WORD regmask;
 	WORD datareg;
 
-	if (siz == SIZX || siz==SIZN)
+	if (siz == SIZX || siz == SIZN)
 	{
-		if ((*tok.u32 >= KW_FP0) && (*tok.u32 <= KW_FP7))
+		if ((*tok >= KW_FP0) && (*tok <= KW_FP7))
 		{
 			//fmovem.x <rlist>,ea
 			if (fpu_reglist_left(&regmask) < 0)
 				return OK;
 
-			if (*tok.u32++ != ',')
+			if (*tok++ != ',')
 				return error("missing comma");
 
 			if (amode(0) < 0)
@@ -3492,12 +3338,12 @@ int m_fmovem(WORD inst, WORD siz)
 			ea0gen(siz);
 			return OK;
 		}
-		else if ((*tok.u32 >= KW_D0) && (*tok.u32 <= KW_D7))
+		else if ((*tok >= KW_D0) && (*tok <= KW_D7))
 		{
 			// fmovem.x Dn,ea
-			datareg = (*tok.u32++ & 7) << 10;
+			datareg = (*tok++ & 7) << 10;
 
-			if (*tok.u32++ != ',')
+			if (*tok++ != ',')
 				return error("missing comma");
 
 			if (amode(0) < 0)
@@ -3522,10 +3368,10 @@ int m_fmovem(WORD inst, WORD siz)
 
 			inst |= am0 | a0reg;
 
-			if (*tok.u32++ != ',')
+			if (*tok++ != ',')
 				return error("missing comma");
 
-			if ((*tok.u32 >= KW_FP0) && (*tok.u32 <= KW_FP7))
+			if ((*tok >= KW_FP0) && (*tok <= KW_FP7))
 			{
 				//fmovem.x ea,<rlist>
 				if (fpu_reglist_right(&regmask) < 0)
@@ -3540,7 +3386,7 @@ int m_fmovem(WORD inst, WORD siz)
 			else
 			{
 				// fmovem.x ea,Dn
-				datareg = (*tok.u32++ & 7) << 10;
+				datareg = (*tok++ & 7) << 10;
 				D_word(inst);
 				inst = (1 << 15) | (1 << 14) | (0 << 13) | (3 << 11) | (datareg << 4);
 				D_word(inst);
@@ -3551,39 +3397,39 @@ int m_fmovem(WORD inst, WORD siz)
 	}
 	else if (siz == SIZL)
 	{
-		if ((*tok.u32 == KW_FPCR) || (*tok.u32 == KW_FPSR) || (*tok.u32 == KW_FPIAR))
+		if ((*tok == KW_FPCR) || (*tok == KW_FPSR) || (*tok == KW_FPIAR))
 		{
 			//fmovem.l <rlist>,ea
 			regmask = (1 << 15) | (1 << 13);
 fmovem_loop_1:
-			if (*tok.u32 == KW_FPCR)
+			if (*tok == KW_FPCR)
 			{
 				regmask |= (1 << 12);
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_1;
 			}
 
-			if (*tok.u32 == KW_FPSR)
+			if (*tok == KW_FPSR)
 			{
 				regmask |= (1 << 11);
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_1;
 			}
 
-			if (*tok.u32 == KW_FPIAR)
+			if (*tok == KW_FPIAR)
 			{
 				regmask |= (1 << 10);
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_1;
 			}
 
-			if ((*tok.u32 == '/') || (*tok.u32 == '-'))
+			if ((*tok == '/') || (*tok == '-'))
 			{
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_1;
 			}
 
-			if (*tok.u32++ != ',')
+			if (*tok++ != ',')
 				return error("missing comma");
 
 			if (amode(0) < 0)
@@ -3602,40 +3448,40 @@ fmovem_loop_1:
 
 			inst |= am0 | a0reg;
 
-			if (*tok.u32++ != ',')
+			if (*tok++ != ',')
 				return error("missing comma");
 
 			regmask = (1 << 15) | (0 << 13);
 
 fmovem_loop_2:
-			if (*tok.u32 == KW_FPCR)
+			if (*tok == KW_FPCR)
 			{
 				regmask |= (1 << 12);
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_2;
 			}
 
-			if (*tok.u32 == KW_FPSR)
+			if (*tok == KW_FPSR)
 			{
 				regmask |= (1 << 11);
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_2;
 			}
 
-			if (*tok.u32 == KW_FPIAR)
+			if (*tok == KW_FPIAR)
 			{
 				regmask |= (1 << 10);
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_2;
 			}
 
-			if ((*tok.u32 == '/') || (*tok.u32 == '-'))
+			if ((*tok == '/') || (*tok == '-'))
 			{
-				tok.u32++;
+				tok++;
 				goto fmovem_loop_2;
 			}
 
-			if (*tok.u32 != EOL)
+			if (*tok != EOL)
 				return error("extra (unexpected) text found");
 
 			inst |= am0 | a0reg;
@@ -3700,8 +3546,8 @@ int m_fdneg(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01011110), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -3733,201 +3579,59 @@ int m_fscale(WORD inst, WORD siz)
 
 
 //
-// FScc (6888X, 68040)
-//
-//int m_fseq  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000001)); return OK;}
-//int m_fsne  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001110)); return OK;}
-//int m_fsgt  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010010)); return OK;}
-//int m_fsngt (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011101)); return OK;}
-//int m_fsge  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010011)); return OK;}
-//int m_fsnge (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011100)); return OK;}
-//int m_fslt  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010100)); return OK;}
-//int m_fsnlt (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011011)); return OK;}
-//int m_fsle  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010101)); return OK;}
-//int m_fsnle (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011010)); return OK;}
-//int m_fsgl  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010110)); return OK;}
-//int m_fsngl (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011001)); return OK;}
-//int m_fsgle (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010111)); return OK;}
-//int m_fsngle(WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011000)); return OK;}
-//int m_fsogt (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000010)); return OK;}
-//int m_fsule (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001101)); return OK;}
-//int m_fsoge (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000011)); return OK;}
-//int m_fsult (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001100)); return OK;}
-//int m_fsolt (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000100)); return OK;}
-//int m_fsuge (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001011)); return OK;}
-//int m_fsole (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000101)); return OK;}
-//int m_fsugt (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001010)); return OK;}
-//int m_fsogl (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000110)); return OK;}
-//int m_fsueq (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001001)); return OK;}
-//int m_fsor  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000111)); return OK;}
-//int m_fsun  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001000)); return OK;}
-//int m_fsf   (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00000000)); return OK;}
-//int m_fst   (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00001111)); return OK;}
-//int m_fssf  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010000)); return OK;}
-//int m_fsst  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011111)); return OK;}
-//int m_fsseq (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00010001)); return OK;}
-//int m_fssne (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(00011110)); return OK;}
-
-#define gen_FScc(name, opcode) int m_##name  (WORD inst, WORD siz) { inst|=am0|a0reg; D_word(inst); ea0gen(siz); D_word(B8(opcode)); return OK;}
-gen_FScc(fseq  , 00000001);
-gen_FScc(fsne  , 00001110);
-gen_FScc(fsgt  , 00010010);
-gen_FScc(fsngt , 00011101);
-gen_FScc(fsge  , 00010011);
-gen_FScc(fsnge , 00011100);
-gen_FScc(fslt  , 00010100);
-gen_FScc(fsnlt , 00011011);
-gen_FScc(fsle  , 00010101);
-gen_FScc(fsnle , 00011010);
-gen_FScc(fsgl  , 00010110);
-gen_FScc(fsngl , 00011001);
-gen_FScc(fsgle , 00010111);
-gen_FScc(fsngle, 00011000);
-gen_FScc(fsogt , 00000010);
-gen_FScc(fsule , 00001101);
-gen_FScc(fsoge , 00000011);
-gen_FScc(fsult , 00001100);
-gen_FScc(fsolt , 00000100);
-gen_FScc(fsuge , 00001011);
-gen_FScc(fsole , 00000101);
-gen_FScc(fsugt , 00001010);
-gen_FScc(fsogl , 00000110);
-gen_FScc(fsueq , 00001001);
-gen_FScc(fsor  , 00000111);
-gen_FScc(fsun  , 00001000);
-gen_FScc(fsf   , 00000000);
-gen_FScc(fst   , 00001111);
-gen_FScc(fssf  , 00010000);
-gen_FScc(fsst  , 00011111);
-gen_FScc(fsseq , 00010001);
-gen_FScc(fssne , 00011110);
+// FScc (6888X, 68040), cpScc (68851, 68030), PScc (68851)
+// TODO: Add check for PScc to ensure 68020+68851 active
+// TODO: Add check for cpScc to ensure 68020+68851, 68030
+//
+int m_fscc(WORD inst, WORD siz)
+{
+	// We stash the 5 condition bits inside the opcode in 68ktab (bits 4-0),
+	// so we need to extract them first and fill in the clobbered bits.
+	WORD opcode = inst & 0x1F;
+	inst &= 0xFFE0;
+	inst |= am0 | a0reg;
+	D_word(inst);
+	ea0gen(siz);
+	D_word(opcode);
+	return OK;
+}
+
 
 //
 // FTRAPcc (6888X, 68040)
 //
-//int m_ftrapeq  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000001)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000001)); D_long(a0exval); } return OK;}
-//int m_ftrapne  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001110)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001110)); D_long(a0exval); } return OK;}
-//int m_ftrapgt  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010010)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010010)); D_long(a0exval); } return OK;}
-//int m_ftrapngt (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011101)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011101)); D_long(a0exval); } return OK;}
-//int m_ftrapge  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010011)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010011)); D_long(a0exval); } return OK;}
-//int m_ftrapnge (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011100)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011100)); D_long(a0exval); } return OK;}
-//int m_ftraplt  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010100)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010100)); D_long(a0exval); } return OK;}
-//int m_ftrapnlt (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011011)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011011)); D_long(a0exval); } return OK;}
-//int m_ftraple  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010101)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010101)); D_long(a0exval); } return OK;}
-//int m_ftrapnle (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011010)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011010)); D_long(a0exval); } return OK;}
-//int m_ftrapgl  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010110)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010110)); D_long(a0exval); } return OK;}
-//int m_ftrapngl (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011001)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011001)); D_long(a0exval); } return OK;}
-//int m_ftrapgle (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010111)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010111)); D_long(a0exval); } return OK;}
-//int m_ftrapngle(WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011000)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011000)); D_long(a0exval); } return OK;}
-//int m_ftrapogt (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000010)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000010)); D_long(a0exval); } return OK;}
-//int m_ftrapule (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001101)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001101)); D_long(a0exval); } return OK;}
-//int m_ftrapoge (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000011)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000011)); D_long(a0exval); } return OK;}
-//int m_ftrapult (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001100)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001100)); D_long(a0exval); } return OK;}
-//int m_ftrapolt (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000100)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000100)); D_long(a0exval); } return OK;}
-//int m_ftrapuge (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001011)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001011)); D_long(a0exval); } return OK;}
-//int m_ftrapole (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000101)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000101)); D_long(a0exval); } return OK;}
-//int m_ftrapugt (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001010)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001010)); D_long(a0exval); } return OK;}
-//int m_ftrapogl (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000110)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000110)); D_long(a0exval); } return OK;}
-//int m_ftrapueq (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001001)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001001)); D_long(a0exval); } return OK;}
-//int m_ftrapor  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000111)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000111)); D_long(a0exval); } return OK;}
-//int m_ftrapun  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001000)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001000)); D_long(a0exval); } return OK;}
-//int m_ftrapf   (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00000000)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00000000)); D_long(a0exval); } return OK;}
-//int m_ftrapt   (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00001111)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00001111)); D_long(a0exval); } return OK;}
-//int m_ftrapsf  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010000)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010000)); D_long(a0exval); } return OK;}
-//int m_ftrapst  (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011111)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011111)); D_long(a0exval); } return OK;}
-//int m_ftrapseq (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00010001)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00010001)); D_long(a0exval); } return OK;}
-//int m_ftrapsne (WORD inst, WORD siz) { if (siz==SIZW) { D_word(inst); D_word(B8(00011110)); D_word(a0exval); } else { inst|=3; D_word(inst); D_word(B8(00011110)); D_long(a0exval); } return OK;}
-//
-//int m_ftrapeqn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000001)); return OK;}
-//int m_ftrapnen  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001110)); return OK;}
-//int m_ftrapgtn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010010)); return OK;}
-//int m_ftrapngtn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011101)); return OK;}
-//int m_ftrapgen  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010011)); return OK;}
-//int m_ftrapngen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011100)); return OK;}
-//int m_ftrapltn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010100)); return OK;}
-//int m_ftrapnltn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011011)); return OK;}
-//int m_ftraplen  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010101)); return OK;}
-//int m_ftrapnlen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011010)); return OK;}
-//int m_ftrapgln  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010110)); return OK;}
-//int m_ftrapngln (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011001)); return OK;}
-//int m_ftrapglen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010111)); return OK;}
-//int m_ftrapnglen(WORD inst, WORD siz) { D_word(inst); D_word(B8(00011000)); return OK;}
-//int m_ftrapogtn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000010)); return OK;}
-//int m_ftrapulen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001101)); return OK;}
-//int m_ftrapogen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000011)); return OK;}
-//int m_ftrapultn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001100)); return OK;}
-//int m_ftrapoltn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000100)); return OK;}
-//int m_ftrapugen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001011)); return OK;}
-//int m_ftrapolen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000101)); return OK;}
-//int m_ftrapugtn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001010)); return OK;}
-//int m_ftrapogln (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000110)); return OK;}
-//int m_ftrapueqn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001001)); return OK;}
-//int m_ftraporn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000111)); return OK;}
-//int m_ftrapunn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001000)); return OK;}
-//int m_ftrapfn   (WORD inst, WORD siz) { D_word(inst); D_word(B8(00000000)); return OK;}
-//int m_ftraptn   (WORD inst, WORD siz) { D_word(inst); D_word(B8(00001111)); return OK;}
-//int m_ftrapsfn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010000)); return OK;}
-//int m_ftrapstn  (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011111)); return OK;}
-//int m_ftrapseqn (WORD inst, WORD siz) { D_word(inst); D_word(B8(00010001)); return OK;}
-//int m_ftrapsnen (WORD inst, WORD siz) { D_word(inst); D_word(B8(00011110)); return OK;}
-
-#define gen_FTRAPcc(name,opcode) \
-int m_##name  (WORD inst, WORD siz) \
-{ \
-	if (siz==SIZW) \
-	{ \
-		D_word(inst); \
-		D_word(B8(opcode)); \
-		D_word(a0exval); \
-	} \
-	else \
-	{ \
-		inst|=3; \
-		D_word(inst); \
-		D_word(B8(opcode)); \
-		D_long(a0exval); \
-	} \
-	return OK;\
-} \
-int m_##name##n  (WORD inst, WORD siz) \
-{ \
-	D_word(inst); \
-	D_word(B8(opcode)); \
-	return OK;\
-}
-
-gen_FTRAPcc(ftrapeq   ,00000001)
-gen_FTRAPcc(ftrapne   ,00001110)
-gen_FTRAPcc(ftrapgt   ,00010010)
-gen_FTRAPcc(ftrapngt  ,00011101)
-gen_FTRAPcc(ftrapge   ,00010011)
-gen_FTRAPcc(ftrapnge  ,00011100)
-gen_FTRAPcc(ftraplt   ,00010100)
-gen_FTRAPcc(ftrapnlt  ,00011011)
-gen_FTRAPcc(ftraple   ,00010101)
-gen_FTRAPcc(ftrapnle  ,00011010)
-gen_FTRAPcc(ftrapgl   ,00010110)
-gen_FTRAPcc(ftrapngl  ,00011001)
-gen_FTRAPcc(ftrapgle  ,00010111)
-gen_FTRAPcc(ftrapngle ,00011000)
-gen_FTRAPcc(ftrapogt  ,00000010)
-gen_FTRAPcc(ftrapule  ,00001101)
-gen_FTRAPcc(ftrapoge  ,00000011)
-gen_FTRAPcc(ftrapult  ,00001100)
-gen_FTRAPcc(ftrapolt  ,00000100)
-gen_FTRAPcc(ftrapuge  ,00001011)
-gen_FTRAPcc(ftrapole  ,00000101)
-gen_FTRAPcc(ftrapugt  ,00001010)
-gen_FTRAPcc(ftrapogl  ,00000110)
-gen_FTRAPcc(ftrapueq  ,00001001)
-gen_FTRAPcc(ftrapor   ,00000111)
-gen_FTRAPcc(ftrapun   ,00001000)
-gen_FTRAPcc(ftrapf    ,00000000)
-gen_FTRAPcc(ftrapt    ,00001111)
-gen_FTRAPcc(ftrapsf   ,00010000)
-gen_FTRAPcc(ftrapst   ,00011111)
-gen_FTRAPcc(ftrapseq  ,00010001)
-gen_FTRAPcc(ftrapsne  ,00011110)
+int m_ftrapcc(WORD inst, WORD siz)
+{
+	// We stash the 5 condition bits inside the opcode in 68ktab (bits 3-7),
+	// so we need to extract them first and fill in the clobbered bits.
+	WORD opcode = (inst >> 3) & 0x1F;
+	inst = (inst & 0xFF07) | (0xF << 3);
+
+	if (siz == SIZW)
+	{
+		inst |= 2;
+		D_word(inst);
+		D_word(opcode);
+		D_word(a0exval);
+	}
+	else if (siz == SIZL)
+	{
+		inst |= 3;
+		D_word(inst);
+		D_word(opcode);
+		D_long(a0exval);
+	}
+	else if (siz = SIZN)
+	{
+		inst |= 4;
+		D_word(inst);
+		D_word(opcode);
+		return OK;
+	}
+
+	return OK;
+}
+
 
 //
 // fsgldiv (6888X, 68040)
@@ -3961,13 +3665,20 @@ int m_fsin(WORD inst, WORD siz)
 //
 int m_fsincos(WORD inst, WORD siz)
 {
+	// Swap a1reg, a2reg as a2reg should be stored in the bitfield gen_fpu
+	// generates
+	int temp;
+	temp = a2reg;
+	a2reg = a1reg;
+	a1reg = temp;
+
 	if (gen_fpu(inst, siz, B8(00110000), FPU_FPSP) == OK)
 	{
 		chptr[-1] |= a2reg;
 		return OK;
 	}
-	else
-		return ERROR;
+
+	return ERROR;
 }
 
 
@@ -4002,8 +3713,8 @@ int m_fdfsqrt(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01000101), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -4020,8 +3731,8 @@ int m_fsfsub(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01101000), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }
 
 
@@ -4029,8 +3740,8 @@ int m_fdsub(WORD inst, WORD siz)
 {
 	if (activefpu == FPU_68040)
 		return gen_fpu(inst, siz, B8(01101100), FPU_P_EMUL);
-	else
-		return error("Unsupported in current FPU");
+
+	return error("Unsupported in current FPU");
 }