X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=d6d6c3f2e63499d7301253b41f9881eb72daef08;hp=7447553694944895c62c5e94dd428ba34c62ca4f;hb=HEAD;hpb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c

diff --git a/direct.c b/direct.c
index 7447553..c403b48 100644
--- a/direct.c
+++ b/direct.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
 // DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -9,6 +9,7 @@
 #include "direct.h"
 #include "6502.h"
 #include "amode.h"
+#include "dsp56k.h"
 #include "error.h"
 #include "expr.h"
 #include "fltpoint.h"
@@ -24,7 +25,15 @@
 
 #define DEF_KW
 #include "kwtab.h"
-
+#define DEF_REG56
+#define DECL_REG56
+#include "56kregs.h"
+#define DEF_REG68
+#define DECL_REG68
+#include "68kregs.h"
+#define DEF_REGRISC
+#define DECL_REGRISC
+#include "riscregs.h"
 
 TOKEN exprbuf[128];			// Expression buffer
 SYM * symbolPtr[1000000];	// Symbol pointers table
@@ -35,7 +44,6 @@ int largestAlign[3] = { 2, 2, 2 };	// Largest alignment value seen per section
 // Function prototypes
 int d_unimpl(void);
 int d_68000(void);
-int d_68000(void);
 int d_68020(void);
 int d_68030(void);
 int d_68040(void);
@@ -51,6 +59,7 @@ int d_abs(void);
 int d_comm(void);
 int d_dc(WORD);
 int d_ds(WORD);
+int d_dsm(WORD);
 int d_dcb(WORD);
 int d_globl(void);
 int d_gpu(void);
@@ -80,6 +89,8 @@ int d_cstruct(void);
 int d_prgflags(void);
 int d_opt(void);
 int d_dsp(void);
+int d_objproc(void);
+int d_align(void);
 void SetLargestAlignment(int);
 
 // Directive handler table
@@ -150,7 +161,10 @@ int (*dirtab[])() = {
 	d_68882,			// 63 .68882
 	d_56001,			// 64 .56001
 	d_nofpu,			// 65 nofpu
-	d_opt,				// 58 .opt
+	d_opt,				// 66 .opt
+	d_objproc,			// 67 .objproc
+	(void *)d_dsm,			// 68 .dsm
+	d_align				// 69 .align
 };
 
 
@@ -217,23 +231,26 @@ int d_org(void)
 {
 	uint64_t address;
 
-	if (!rgpu && !rdsp && !m6502)
-		return error(".org permitted only in gpu/dsp and 6502 sections");
+	if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001 && !(obj_format == RAW))
+		return error(".org permitted only in GPU/DSP/OP, 56001, 6502 and 68k (with -fr switch) sections");
 
-	if (abs_expr(&address) == ERROR)
+	// M56K can leave the expression off the org for some reason :-/
+	// (It's because the expression is non-standard, and so we have to look at
+	// it in isolation)
+	if (!dsp56001 && (abs_expr(&address) == ERROR))
 	{
 		error("cannot determine org'd address");
 		return ERROR;
 	}
 
-	if (rgpu | rdsp)
+	if (rgpu | rdsp | robjproc)
 	{
 		orgaddr = address;
 		orgactive = 1;
 	}
-	else
+	else if (m6502)
 	{
-		// 6502.  We also kludge `lsloc' so the listing generator doesn't try
+		// 6502.  We also kludge 'lsloc' so the listing generator doesn't try
 		// to spew out megabytes.
 		if (address > 0xFFFF)
 			return error(range_error);
@@ -250,9 +267,108 @@ int d_org(void)
 		chptr = scode->chptr + address;
 		orgaddr = address;
 		orgactive = 1;
-		at_eol();
+	}
+	else if (dsp56001)
+	{
+		// Only mark segments we actually wrote something
+		if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org)
+		{
+			dsp_currentorg->end = chptr;
+			dsp_currentorg++;
+		}
+
+		// Maybe we switched from a non-DSP section (TEXT, DATA, etc) and
+		// scode isn't initialised yet. Not that it's going to be a valid
+		// scenario, but if we try it anyhow it's going to lead to a crash. So
+		// let's fudge a value of 0 and get on with it.
+		orgaddr = (scode != NULL ? sloc : 0);
+		SaveSection();
+
+		if (tok[1] != ':')
+			return error(syntax_error);
+
+		int sectionToSwitch = 0;
+
+		switch (tok[0])
+		{
+		case REG56_X:
+			dsp_currentorg->memtype = ORG_X;
+			sectionToSwitch = M56001X;
+			break;
+
+		case REG56_Y:
+			dsp_currentorg->memtype = ORG_Y;
+			sectionToSwitch = M56001Y;
+			break;
+
+		case REG56_P:
+			dsp_currentorg->memtype = ORG_P;
+			sectionToSwitch = M56001P;
+			break;
+
+		case REG56_L:
+			dsp_currentorg->memtype = ORG_L;
+			sectionToSwitch = M56001L;
+			break;
+
+		default:
+			return error("unknown type in ORG");
+		}
+
+		if ((obj_format == LOD) || (obj_format == P56))
+			SwitchSection(sectionToSwitch);
+
+		tok += 2;
+		chcheck(3); // Ensure we got a valid address to write
+		dsp_currentorg->chunk = scode;  // Mark down which chunk this org starts from (will be needed when outputting)
+
+		if (*tok == EOL)
+		{
+			// Well, the user didn't specify an address at all so we'll have to
+			// use the last used address of that section (or 0 if there wasn't one)
+			address = orgaddr;
+			dsp_currentorg->start = chptr;
+			dsp_currentorg->orgadr = orgaddr;
+		}
+		else
+		{
+			if (abs_expr(&address) == ERROR)
+			{
+				error("cannot determine org'd address");
+				return ERROR;
+			}
+
+			dsp_currentorg->start = chptr;
+			dsp_currentorg->orgadr = (uint32_t)address;
+			sect[cursect].orgaddr = (uint32_t)address;
+		}
+
+		if (address > DSP_MAX_RAM)
+		{
+			return error(range_error);
+		}
+
+		dsp_written_data_in_current_org = 0;
+
+		// Copied from 6502 above: kludge `lsloc' so the listing generator
+		// doesn't try to spew out megabytes.
+		lsloc = sloc = (int32_t)address;
+// N.B.: It seems that by enabling this, even though it works elsewhere, will cause symbols to royally fuck up.  Will have to do some digging to figure out why.
+//		orgactive = 1;
+	}
+	else
+	{
+		// If we get here we assume it's 68k with RAW output, so this is allowed
+		if (orgactive)
+		{
+			return error("In 68k mode only one .org statement is allowed");
+		}
+
+		org68k_address = address;
+		org68k_active = 1;
 	}
 
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -275,7 +391,7 @@ int d_print(void)
 
 	while (*tok != EOL)
 	{
-		switch(*tok)
+		switch (*tok)
 		{
 		case STRING:
 			sprintf(prntstr, "%s", string[tok[1]]);
@@ -289,25 +405,40 @@ int d_print(void)
 		case '/':
 			formatting = 1;
 
-			if (tok[1] != SYMBOL)
+			// "X" & "L" get tokenized now... :-/ Probably should look into preventing this kind of thing from happening (was added with DSP56K code)
+			// Note (ggn): This is now much less severe as it's localised for 56k only
+			if ((tok[1] != SYMBOL) && (tok[1] != REG56_L) && (tok[1] != REG56_X))
 				goto token_err;
 
-//			strcpy(prntstr, (char *)tok[2]);
-			strcpy(prntstr, string[tok[2]]);
-
-			switch(prntstr[0])
+			if (tok[1] == REG56_L)
 			{
-			case 'l': case 'L': wordlong = 1; break;
-			case 'w': case 'W': wordlong = 0; break;
-			case 'x': case 'X': outtype  = 0; break;
-			case 'd': case 'D': outtype  = 1; break;
-			case 'u': case 'U': outtype  = 2; break;
-			default:
-				error("unknown print format flag");
-				return ERROR;
+				wordlong = 1;
+				tok += 2;
+			}
+			else if (tok[1] == REG56_X)
+			{
+				outtype = 0;
+				tok += 2;
+			}
+			else
+			{
+				strcpy(prntstr, string[tok[2]]);
+
+				switch (prntstr[0])
+				{
+				case 'l': case 'L': wordlong = 1; break;
+				case 'w': case 'W': wordlong = 0; break;
+				case 'x': case 'X': outtype  = 0; break;
+				case 'd': case 'D': outtype  = 1; break;
+				case 'u': case 'U': outtype  = 2; break;
+				default:
+					error("unknown print format flag");
+					return ERROR;
+				}
+
+				tok += 3;
 			}
 
-			tok += 3;
 			break;
 		case ',':
 			tok++;
@@ -348,7 +479,7 @@ int d_print(void)
 	return 0;
 
 token_err:
-	error("illegal print token");
+	error("illegal print token [@ '%s']", prntstr);
 	return ERROR;
 }
 
@@ -416,7 +547,7 @@ int d_equrundef(void)
 		{
 			// Reset the attributes of this symbol...
 			regname->sattr = 0;
-			regname->sattre &= ~(EQUATEDREG | BANK_0 | BANK_1);
+			regname->sattre &= ~EQUATEDREG;
 			regname->sattre |= UNDEF_EQUR;
 		}
 
@@ -439,13 +570,13 @@ int d_noclear(void)
 
 
 //
-// Include binary file
+// Include binary file (can add addition size & position params, comma separated)
 //
 int d_incbin(void)
 {
 	int fd;
 	int bytes = 0;
-	long pos, size, bytesRead;
+	uint64_t pos, size, bytesRead;
 	char buf1[256];
 	int i;
 
@@ -458,14 +589,16 @@ int d_incbin(void)
 
 	if (*tok != STRING)
 	{
-		error("syntax error; string missing");
+		error("syntax error; file to include missing");
 		return ERROR;
 	}
 
 	// Attempt to open the include file in the current directory, then (if that
 	// failed) try list of include files passed in the enviroment string or by
-	// the "-d" option.
-	if ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
+	// the "-i" option.
+	TOKEN filename = tok[1];
+
+	if ((fd = open(string[filename], _OPEN_INC)) < 0)
 	{
 		for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
 		{
@@ -475,29 +608,109 @@ int d_incbin(void)
 			if (fd > 0 && buf1[fd - 1] != SLASHCHAR)
 				strcat(buf1, SLASHSTRING);
 
-			strcat(buf1, string[tok[1]]);
+			strcat(buf1, string[filename]);
 
 			if ((fd = open(buf1, _OPEN_INC)) >= 0)
 				goto allright;
 		}
 
-		return error("cannot open: \"%s\"", string[tok[1]]);
+		return error("cannot open: \"%s\"", string[filename]);
 	}
 
 allright:
 
+	tok += 2;
+
 	size = lseek(fd, 0L, SEEK_END);
 	pos = lseek(fd, 0L, SEEK_SET);
+
+	if (*tok != EOL)
+	{
+		// Parse size and position parameters
+		uint64_t requested_size = -1;	// -1 means "not set" for these two
+
+		if (*tok++ != ',')
+		{
+			close(fd);
+			return error("expected comma after incbin filename");
+		}
+
+		if (*tok != EOL)
+		{
+			if (*tok != ',')
+			{
+				if (abs_expr(&requested_size) != OK)
+				{
+					close(fd);
+					return ERROR;
+				}
+
+				if ((int64_t)requested_size <= 0 || requested_size > size)
+				{
+					close(fd);
+					return error("invalid incbin size requested");
+				}
+			}
+
+			if (*tok != EOL)
+			{
+				if (*tok++ != ',')
+				{
+					close(fd);
+					return error("expected comma after size parameter");
+				}
+
+				if (*tok != EOL)
+				{
+					if (abs_expr(&pos) != OK)
+					{
+						close(fd);
+						return ERROR;
+					}
+
+					if ((int64_t)pos <= 0 || pos > size)
+					{
+						close(fd);
+						return error("invalid incbin position requested");
+					}
+				}
+			}
+
+			if (*tok != EOL)
+			{
+				close(fd);
+				return error("extra characters following incbin");
+			}
+		}
+
+		// Adjust size if the user didn't specify it via the parameter
+		if (requested_size == -1)
+		{
+			requested_size = size - pos;
+		}
+
+		// Are we going to read past the end of the file?
+		if (pos + requested_size > size)
+		{
+			close(fd);
+			return error("invalid combination of incbin position and size");
+		}
+		size = requested_size;
+
+		// All checks passed, let's seek to where the user requested, otherwise at file start
+		lseek(fd, pos, SEEK_SET);
+	}
+
 	chcheck(size);
 
-	DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); }
+	DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[filename], size); }
 
 	char * fileBuffer = (char *)malloc(size);
 	bytesRead = read(fd, fileBuffer, size);
 
 	if (bytesRead != size)
 	{
-		error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
+		error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[filename], size);
 		return ERROR;
 	}
 
@@ -520,16 +733,16 @@ allright:
 //
 int d_regbank0(void)
 {
-	// Set active register bank zero
-	regbank = BANK_0;
+	// Deprecated, it's not as if this did anything useful, ever
+	warn("regbank0 ignored");
 	return 0;
 }
 
 
 int d_regbank1(void)
 {
-	// Set active register bank one
-	regbank = BANK_1;
+	// Deprecated, it's not as if this did anything useful, ever
+	warn("regbank1 ignored");
 	return 0;
 }
 
@@ -652,6 +865,48 @@ int d_qphrase(void)
 }
 
 
+//
+// Adjust location to <alignment> bytes
+//
+int d_align(void)
+{
+	unsigned bytesToSkip;
+	uint64_t eval;
+
+	if (abs_expr(&eval) != OK)
+		return 0;
+
+	if (eval < 2)
+	{
+		return error("Invalid .align value specified");
+	}
+
+	if (dsp56001)
+	{
+		bytesToSkip = eval - sloc % eval;
+		D_ZEROFILL(bytesToSkip*3);
+		return 0;
+	}
+
+	bytesToSkip = eval - (rgpu || rdsp ? orgaddr : sloc) % eval;
+	if ( bytesToSkip != eval )
+	{
+		if ((scattr & SBSS) == 0)
+		{
+			D_ZEROFILL(bytesToSkip);
+		}
+		else
+		{
+			sloc += bytesToSkip;
+
+			if (orgactive)
+				orgaddr += bytesToSkip;
+		}
+	}
+	return 0;
+}
+
+
 //
 // Do auto-even.  This must be called ONLY if 'sloc' is odd.
 //
@@ -811,7 +1066,7 @@ int d_assert(void)
 			break;
 	}
 
-	at_eol();
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -956,22 +1211,23 @@ int d_ds(WORD siz)
 	DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
 	uint64_t eval;
+    WORD eattr;
 
-	if (cursect != M6502)
+	if ((cursect & (M6502 | M56KPXYL)) == 0)
 	{
 		if ((siz != SIZB) && (sloc & 1))	// Automatic .even
 			auto_even();
 	}
 
-	if (abs_expr(&eval) != OK)
-		return 0;
+	if (expr(exprbuf, &eval, &eattr, NULL) < 0)
+		return ERROR;
 
 	// Check to see if the value being passed in is negative (who the hell does
-	// that?--nobody does; it's the code gremlins, or rum, that does it)
-	// N.B.: Since 'eval' is of type uint32_t, if it goes negative, it will have
-	//       its high bit set.
-	if (eval & 0x80000000)
-		return error("negative sizes not allowed");
+	// that?--nobody does; it's the code gremlins, or rum, what does it)
+	// N.B.: Since 'eval' is of type uint64_t, if it goes negative, it will
+	//       have its high bit set.
+	if (eval & 0x8000000000000000)
+		return error("negative sizes not allowed in DS");
 
 	// In non-TDB section (BSS, ABS and M6502) just advance the location
 	// counter appropriately. In TDB sections, deposit (possibly large) chunks
@@ -987,18 +1243,86 @@ int d_ds(WORD siz)
 
 		just_bss = 1;					// No data deposited (8-bit CPU mode)
 	}
+	else if (cursect & M56KPXYL)
+	{
+		// Change segment instead of marking blanks.
+		// Only mark segments we actually wrote something
+		if (chptr != dsp_currentorg->start && dsp_written_data_in_current_org)
+		{
+			dsp_currentorg->end = chptr;
+			dsp_currentorg++;
+			dsp_currentorg->memtype = dsp_currentorg[-1].memtype;
+		}
+
+		listvalue((uint32_t)eval);
+		sloc += (uint32_t)eval;
+
+		// And now let's create a new segment
+		dsp_currentorg->start = chptr;
+		dsp_currentorg->chunk = scode;  // Mark down which chunk this org starts from (will be needed when outputting)
+		sect[cursect].orgaddr = sloc;
+		dsp_currentorg->orgadr = sloc;
+		dsp_written_data_in_current_org = 0;
+
+		just_bss = 1;					// No data deposited
+	}
 	else
 	{
-		dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL);
+		dep_block(eval, siz, 0, (DEFINED | ABS), NULL);
 	}
 
-	at_eol();
-	return 0;
+	ErrorIfNotAtEOL();
+	return OK;
 }
 
 
 //
-// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d
+// dsm[.siz] expression
+// Define modulo storage
+// Quoting the Motorola assembler manual:
+// "The DSM directive reserves a block of memory the length of which in words is equal to
+// the value of <expression>.If the runtime location counter is not zero, this directive first
+// advances the runtime location counter to a base address that is a multiple of 2k, where
+// 2k >= <expression>."
+// The kicker of course is written a few sentences after:
+// "<label>, if present, will be assigned the value of the runtime location counter after a valid
+// base address has been established."
+//
+int d_dsm(WORD siz)
+{
+	TOKEN * tok_current = tok;  // Keep track of where tok was when we entered this procedure
+	uint64_t eval;
+
+	if (abs_expr(&eval) != OK)
+ 		return 0;
+
+	// Round up to the next highest power of 2
+	// Nicked from https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
+	eval--;
+	eval |= eval >> 1;
+	eval |= eval >> 2;
+	eval |= eval >> 4;
+	eval |= eval >> 8;
+	eval |= eval >> 16;
+
+	int units_to_skip;
+	units_to_skip = eval + 1 - sloc;
+	sloc += units_to_skip;		// Bump up sloc - TODO: check if this goes over the RAM limits?
+
+	// If a label has been defined in the same line as dsm, its value also needs to be adjusted
+	if (label_defined)
+	{
+		SYM * label = lookup(label_defined, LABEL, 0);
+		label->svalue += units_to_skip;
+	}
+
+	tok = tok_current;		// Rewind tok back to where it was
+	return d_ds(siz);		// And let d_ds take over from here
+}
+
+
+//
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d, dc.s, dc.x
 //
 int d_dc(WORD siz)
 {
@@ -1010,7 +1334,9 @@ int d_dc(WORD siz)
 		return error("illegal initialization of section");
 
 	// Do an auto_even if it's not BYTE sized (hmm, should we be doing this???)
-	if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
+	if ((cursect != M6502) && (cursect != M56001P) && (cursect != M56001X)
+		&& (cursect != M56001Y) && (cursect != M56001L)
+		&& (siz != SIZB) && (sloc & 1))
 		auto_even();
 
 	// Check to see if we're trying to set LONGS on a non 32-bit aligned
@@ -1035,7 +1361,7 @@ int d_dc(WORD siz)
 				for(p=string[tok[1]]; *p!=EOS; p++)
 					D_byte(*p);
 			}
-			else if(*tok == STRINGA8)
+			else if (*tok == STRINGA8)
 			{
 				for(p=string[tok[1]]; *p!=EOS; p++)
 					D_byte(strtoa8[*p]);
@@ -1067,8 +1393,98 @@ int d_dc(WORD siz)
 		uint16_t tdb = eattr & TDB;
 		uint16_t defined = eattr & DEFINED;
 
-		if ((challoc - ch_size) < 4)
-			chcheck(4);
+// N.B.: This is awful.  This needs better handling, rather than just bodging something in that, while works, is basically an ugly wart on the assembler.  !!! FIX !!!
+		if (dsp56001)
+		{
+			if (cursect != M56001L)
+			{
+				if (!defined)
+				{
+					AddFixup(FU_DSPIMM24 | FU_SEXT, sloc, exprbuf);
+					D_dsp(0);
+				}
+				else
+				{
+					if (eattr & FLOAT)
+					{
+						double fval = *(double *)&eval;
+						eval = DoubleToDSPFloat(fval);
+					}
+					else
+					{
+						if ((uint32_t)eval + 0x1000000 >= 0x2000000)
+							return error(range_error);
+					}
+
+					// Deposit DSP word (24-bit)
+					D_dsp(eval);
+				}
+			}
+			else
+			{
+				// In L: we deposit stuff to both X: and Y: instead
+				// We will be a bit lazy and require that there is a 2nd value
+				// in the same source line. (Motorola's assembler can parse
+				// 12-digit hex values, which we can't do at the moment) This
+				// of course requires to parse 2 values in one pass. If there
+				// isn't another value in this line, assume X: value is 0.
+				int secondword = 0;
+				uint32_t evaly;
+l_parse_loop:
+
+				if (!defined)
+				{
+					AddFixup(FU_DSPIMM24 | FU_SEXT, sloc, exprbuf);
+					D_dsp(0);
+				}
+				else
+				{
+					if (eattr & FLOAT)
+					{
+						float fval = *(float *)&eval;
+						eval = DoubleToDSPFloat(fval);
+					}
+					else
+					{
+						if (eval + 0x1000000 >= 0x2000000)
+							return error(range_error);
+					}
+
+					// Parse 2nd value if we didn't do this yet
+					if (secondword == 0)
+					{
+						evaly = (uint32_t)eval;
+						secondword = 1;
+
+						if (*tok != ':')
+						{
+							// If we don't have a : then we're probably at EOL,
+							// which means the X: value will be 0
+							eval = 0;
+							ErrorIfNotAtEOL();
+						}
+						else
+						{
+							tok++; // Eat the comma;
+
+							if (expr(exprbuf, &eval, &eattr, NULL) != OK)
+								return 0;
+
+							defined = (WORD)(eattr & DEFINED);
+							goto l_parse_loop;
+						}
+					}
+
+					// Deposit DSP words (24-bit)
+					D_dsp(eval);
+					D_dsp(evaly);
+					sloc--; // We do write 2 DSP words but as far as L: space is concerned we actually advance our counter by one
+				}
+
+			}
+
+			goto comma;
+		}
 
 		switch (siz)
 		{
@@ -1090,6 +1506,7 @@ int d_dc(WORD siz)
 			}
 
 			break;
+
 		case SIZW:
 		case SIZN:
 			if (!defined)
@@ -1113,6 +1530,7 @@ int d_dc(WORD siz)
 			}
 
 			break;
+
 		case SIZL:
 			// Shamus: Why can't we do longs in 6502 mode?
 			if (m6502)
@@ -1120,11 +1538,7 @@ int d_dc(WORD siz)
 
 			if (!defined)
 			{
-				if (movei)
-					AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
-				else
-					AddFixup(FU_LONG, sloc, exprbuf);
-
+				AddFixup(FU_LONG | (movei ? FU_MOVEI : 0), sloc, exprbuf);
 				D_long(0);
 			}
 			else
@@ -1137,30 +1551,41 @@ int d_dc(WORD siz)
 
 				D_long(eval);
 			}
+
 			break;
+
 		case SIZQ:
 			// 64-bit size
 			if (m6502)
 				return error(in_6502mode);
 
-			// Shamus: We only handle DC.Q type stuff, will have to add fixups
-			//         and stuff later (maybe... might not be needed...)
+			// DEFINITELY NEED FIXUPS HERE!
+			if (!defined)
+			{
+				AddFixup(FU_QUAD, sloc, exprbuf);
+				eval = 0;
+			}
+
 			D_quad(eval);
 			break;
+
 		case SIZS:
 			// 32-bit float size
 			if (m6502)
 				return error(in_6502mode);
 
+/* Seems to me that if something is undefined here, then that should be an error.  Likewise for the D & X variants. */
 			if (!defined)
 			{
-				AddFixup(FU_FLOATSING, sloc, exprbuf);
-				D_long(0);
+//				AddFixup(FU_FLOATSING, sloc, exprbuf);
+//				D_long(0);
+				return error("labels not allowed in floating point expressions");
 			}
 			else
 			{
-				if (tdb)
-					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
 
 				PTR ptr;
 				ptr.u64 = &eval;
@@ -1169,6 +1594,7 @@ int d_dc(WORD siz)
 			}
 
 			break;
+
 		case SIZD:
 			// 64-bit double size
 			if (m6502)
@@ -1176,13 +1602,15 @@ int d_dc(WORD siz)
 
 			if (!defined)
 			{
-				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
-				D_quad(0LL);
+//				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+//				D_quad(0LL);
+				return error("labels not allowed in floating point expressions");
 			}
 			else
 			{
-				if (tdb)
-					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
 
 				PTR ptr;
 				ptr.u64 = &eval;
@@ -1191,6 +1619,7 @@ int d_dc(WORD siz)
 			}
 
 			break;
+
 		case SIZX:
 			if (m6502)
 				return error(in_6502mode);
@@ -1200,13 +1629,15 @@ int d_dc(WORD siz)
 
 			if (!defined)
 			{
-				AddFixup(FU_FLOATEXT, sloc, exprbuf);
-				D_extend(extDbl);
+//				AddFixup(FU_FLOATEXT, sloc, exprbuf);
+//				D_extend(extDbl);
+				return error("labels not allowed in floating point expressions");
 			}
 			else
 			{
-				if (tdb)
-					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
 
 				PTR ptr;
 				ptr.u64 = &eval;
@@ -1222,7 +1653,7 @@ comma:
 			break;
 	}
 
-	at_eol();
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -1332,11 +1763,8 @@ int d_init(WORD def_siz)
 //
 int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf)
 {
-	WORD tdb;
-	WORD defined;
-
-	tdb = (WORD)(eattr & TDB);
-	defined = (WORD)(eattr & DEFINED);
+	WORD tdb = eattr & TDB;
+	WORD defined = eattr & DEFINED;
 
 	while (count--)
 	{
@@ -1430,7 +1858,7 @@ int d_comm(void)
 	p = string[tok[1]];
 	tok += 2;
 
-	if (*p == '.')							// Cannot .comm a local symbol
+	if (*p == '.')						// Cannot .comm a local symbol
 		return error(locgl_error);
 
 	if ((sym = lookup(p, LABEL, 0)) == NULL)
@@ -1446,11 +1874,11 @@ int d_comm(void)
 	if (*tok++ != ',')
 		return error(comma_error);
 
-	if (abs_expr(&eval) != OK)				// Parse size of common region
+	if (abs_expr(&eval) != OK)			// Parse size of common region
 		return 0;
 
-	sym->svalue = (uint32_t)eval;			// Install common symbol's size
-	at_eol();
+	sym->svalue = eval;					// Install common symbol's size
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -1484,13 +1912,17 @@ int d_nlist(void)
 //
 int d_68000(void)
 {
-	rgpu = rdsp = 0;
+	rgpu = rdsp = robjproc = dsp56001 = 0;
 	// Switching from gpu/dsp sections should reset any ORG'd Address
 	orgactive = 0;
 	orgwarning = 0;
 	SaveSection();
 	SwitchSection(TEXT);
 	activecpu = CPU_68000;
+	regbase = reg68base;	// Update register DFA tables
+	regtab = reg68tab;
+	regcheck = reg68check;
+	regaccept = reg68accept;
 	return 0;
 }
 
@@ -1536,29 +1968,35 @@ int d_68060(void)
 {
 	d_68000();
 	activecpu = CPU_68060;
-	activefpu = FPU_68040;
+	activefpu = FPU_68060;
 	return 0;
 }
 
 
 //
-// .68881 - Back to 68000 TEXT segment and select 68881 FPU
+// .68881 - Back to 680x0 TEXT segment and select 68881 FPU
 //
 int d_68881(void)
 {
-	d_68000();
 	activefpu = FPU_68881;
+	regbase = reg68base;	// Update register DFA tables
+	regtab = reg68tab;
+	regcheck = reg68check;
+	regaccept = reg68accept;
 	return 0;
 }
 
 
 //
-// .68882 - Back to 68000 TEXT segment and select 68882 FPU
+// .68882 - Back to 680x0 TEXT segment and select 68882 FPU
 //
 int d_68882(void)
 {
-	d_68000();
-	activefpu = FPU_68881;
+	activefpu = FPU_68882;
+	regbase = reg68base;	// Update register DFA tables
+	regtab = reg68tab;
+	regcheck = reg68check;
+	regaccept = reg68accept;
 	return 0;
 }
 
@@ -1574,11 +2012,23 @@ int d_nofpu(void)
 
 
 //
-// DSP56001
+// .56001 - Switch to DSP56001 assembler
 //
 int d_56001(void)
 {
-	return error("Not yet, child. Be patient.");
+	dsp56001 = 1;
+	rgpu = rdsp = robjproc = 0;
+	SaveSection();
+
+	if ((obj_format == LOD) || (obj_format == P56))
+		SwitchSection(M56001P);
+
+	regbase = reg56base;	// Update register DFA tables
+	regtab = reg56tab;
+	regcheck = reg56check;
+	regaccept = reg56accept;
+	used_architectures |= M56001P | M56001X | M56001Y | M56001L;
+	return 0;
 }
 
 
@@ -1602,7 +2052,14 @@ int d_gpu(void)
 
 	rgpu = 1;			// Set GPU assembly
 	rdsp = 0;			// Unset DSP assembly
-	regbank = BANK_N;	// Set no default register bank
+	robjproc = 0;		// Unset OP assembly
+	dsp56001 = 0;		// Unset 56001 assembly
+
+	regbase = regriscbase;	// Update register DFA tables
+	regtab = regrisctab;
+	regcheck = regrisccheck;
+	regaccept = regriscaccept;
+	//used_architectures |= MGPU;	// TODO: Should GPU/DSP have their own dedicated sections in the long run?
 	return 0;
 }
 
@@ -1627,7 +2084,14 @@ int d_dsp(void)
 
 	rdsp = 1;			// Set DSP assembly
 	rgpu = 0;			// Unset GPU assembly
-	regbank = BANK_N;	// Set no default register bank
+	robjproc = 0;		// Unset OP assembly
+	dsp56001 = 0;		// Unset 56001 assembly
+
+	regbase = regriscbase;	// Update register DFA tables
+	regtab = regrisctab;
+	regcheck = regrisccheck;
+	regaccept = regriscaccept;
+	//used_architectures |= MDSP;	// TODO: Should GPU/DSP have their own dedicated sections in the long run?
 	return 0;
 }
 
@@ -1689,7 +2153,7 @@ int d_cargs(void)
 			AddToSymbolDeclarationList(symbol);
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
-			symbol->svalue = (uint32_t)eval;
+			symbol->svalue = eval;
 			tok += 2;
 
 			// What this does is eat any dot suffixes attached to a symbol. If
@@ -1706,7 +2170,7 @@ int d_cargs(void)
 
 			eval += 2;
 		}
-		else if (*tok >= KW_D0 && *tok <= KW_A7)
+		else if (*tok >= REG68_D0 && *tok <= REG68_A7)
 		{
 			if (reglist(&rlist) < 0)
 				return 0;
@@ -1721,13 +2185,13 @@ int d_cargs(void)
 		{
 			switch ((int)*tok)
 			{
-			case KW_USP:
-			case KW_SSP:
-			case KW_PC:
+			case REG68_USP:
+			case REG68_SSP:
+			case REG68_PC:
 				eval += 2;
 				// FALLTHROUGH
-			case KW_SR:
-			case KW_CCR:
+			case REG68_SR:
+			case REG68_CCR:
 				eval += 2;
 				tok++;
 				break;
@@ -1816,7 +2280,7 @@ int d_cstruct(void)
 			}
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
-			symbol->svalue = (uint32_t)eval;
+			symbol->svalue = eval;
 
 			// Check for dot suffixes and adjust space accordingly (longs and
 			// words on an odd boundary get bumped to the next word aligned
@@ -1838,7 +2302,7 @@ int d_cstruct(void)
 
 			tok++;
 		}
-		else if (*tok >= KW_D0 && *tok <= KW_A7)
+		else if (*tok >= REG68_D0 && *tok <= REG68_A7)
 		{
 			if (reglist(&rlist) < 0)
 				return 0;
@@ -1853,13 +2317,13 @@ int d_cstruct(void)
 		{
 			switch ((int)*tok)
 			{
-			case KW_USP:
-			case KW_SSP:
-			case KW_PC:
+			case REG68_USP:
+			case REG68_SSP:
+			case REG68_PC:
 				eval += 2;
 				// FALLTHROUGH
-			case KW_SR:
-			case KW_CCR:
+			case REG68_SR:
+			case REG68_CCR:
 				eval += 2;
 				tok++;
 				break;
@@ -1877,6 +2341,34 @@ int d_cstruct(void)
 }
 
 
+//
+// Define start of OP object list (allows the use of ORG)
+//
+int d_objproc(void)
+{
+	if ((cursect != TEXT) && (cursect != DATA))
+	{
+		error(".objproc can only be used in the TEXT or DATA segments");
+		return ERROR;
+	}
+
+	// If previous section was DSP or 68000 then we need to reset ORG'd
+	// Addresses
+	if (!robjproc)
+	{
+		orgactive = 0;
+		orgwarning = 0;
+	}
+
+	robjproc = 1;		// Set OP assembly
+	rgpu = 0;			// Unset GPU assembly
+	rdsp = 0;			// Unset DSP assembly
+	dsp56001 = 0;		// Unset 56001 assembly
+	//used_architectures |= MOP;	// TODO: Should OP have its own dedicated section in the long run?
+	return OK;
+}
+
+
 //
 // Undefine a macro - .undefmac macname [, macname...]
 //