X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=b3f51f3c3b73356c638a0dc9b087cc20f67ab58d;hp=15ce236287200236f9ce403ef7db7c5055144f65;hb=4205233c8397c581b4d27ab36ab81ec896ef3dd0;hpb=052be802baa4836564801c780b1d432cfe17c576

diff --git a/direct.c b/direct.c
index 15ce236..b3f51f3 100644
--- a/direct.c
+++ b/direct.c
@@ -1,37 +1,94 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 
 #include "direct.h"
-#include "sect.h"
-#include "riscasm.h"
+#include "6502.h"
+#include "amode.h"
+#include "dsp56k.h"
 #include "error.h"
-#include "token.h"
-#include "procln.h"
 #include "expr.h"
-#include "mach.h"
+#include "fltpoint.h"
 #include "listing.h"
+#include "mach.h"
+#include "macro.h"
 #include "mark.h"
+#include "procln.h"
+#include "riscasm.h"
+#include "sect.h"
 #include "symbol.h"
+#include "token.h"
 
 #define DEF_KW
 #include "kwtab.h"
 
+
 TOKEN exprbuf[128];			// Expression buffer
 SYM * symbolPtr[1000000];	// Symbol pointers table
 static long unused;			// For supressing 'write' warnings
 char buffer[256];			// Scratch buffer for messages
-
+int largestAlign[3] = { 2, 2, 2 };	// Largest alignment value seen per section
+
+// Function prototypes
+int d_unimpl(void);
+int d_68000(void);
+int d_68020(void);
+int d_68030(void);
+int d_68040(void);
+int d_68060(void);
+int d_68881(void);
+int d_68882(void);
+int d_56001(void);
+int d_nofpu(void);
+int d_bss(void);
+int d_data(void);
+int d_text(void);
+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);
+int d_dsp(void);
+int d_assert(void);
+int d_include(void);
+int d_list(void);
+int d_nlist(void);
+int d_error(char *);
+int d_warn(char *);
+int d_org(void);
+int d_init(WORD);
+int d_cargs(void);
+int d_undmac(void);
+int d_regbank0(void);
+int d_regbank1(void);
+int d_incbin(void);
+int d_noclear(void);
+int d_equrundef(void);
+int d_ccundef(void);
+int d_print(void);
+int d_gpumain(void);
+int d_jpad(void);
+int d_nojpad(void);
+int d_fail(void);
+int d_cstruct(void);
+int d_prgflags(void);
+int d_opt(void);
+int d_dsp(void);
+int d_objproc(void);
+void SetLargestAlignment(int);
 
 // Directive handler table
 int (*dirtab[])() = {
 	d_org,				// 0 org
 	d_even,				// 1 even
-	d_6502,			    // 2 .6502
+	d_6502,				// 2 .6502
 	d_68000,			// 3 .68000
 	d_bss,				// 4 bss
 	d_data,				// 5 data
@@ -87,10 +144,34 @@ int (*dirtab[])() = {
 	d_nojpad,			// 55 .nojpad (deprecated)
 	d_gpumain,			// 56 .gpumain (deprecated)
 	d_prgflags,			// 57 .prgflags
-	d_opt,				// 58 .opt
+	d_68020,			// 58 .68020
+	d_68030,			// 59 .68030
+	d_68040,			// 60 .68040
+	d_68060,			// 61 .68060
+	d_68881,			// 62 .68881
+	d_68882,			// 63 .68882
+	d_56001,			// 64 .56001
+	d_nofpu,			// 65 nofpu
+	d_opt,				// 66 .opt
+	d_objproc,			// 67 .objproc
+	d_dsm,				// 68 .dsm
 };
 
 
+//
+// Set the largest alignment seen in the current section
+//
+void SetLargestAlignment(int size)
+{
+	if ((scattr & TEXT) && (largestAlign[0] < size))
+		largestAlign[0] = size;
+	else if ((scattr & DATA) && (largestAlign[1] < size))
+		largestAlign[1] = size;
+	else if ((scattr & BSS) && (largestAlign[2] < size))
+		largestAlign[2] = size;
+}
+
+
 //
 // .error - Abort compilation, printing an error message
 //
@@ -106,7 +187,7 @@ int d_error(char *str)
 			return error(string[tok[1]]);
 			break;
 		default:
-			return error("error directive encountered - aborting assembling");
+			return error("error directive encountered--aborting assembly");
 		}
 	}
 }
@@ -138,53 +219,136 @@ int d_warn(char *str)
 //
 int d_org(void)
 {
-    VALUE address;
-    
-    if (!rgpu && !rdsp && !m6502)
-    	return error(".org permitted only in gpu/dsp and 6502 sections");
-    
-    if (rgpu | rdsp)
-    {
-        orgaddr = 0;
-
-        if (abs_expr(&address) == ERROR)
-        {
-            error("cannot determine org'd address");
-            return ERROR;
-        }
-
-        orgaddr = address;
-        orgactive = 1;
-        //printf("ORG: address = $%08X...\n", orgaddr);
-
-        return 0;
-    }
-    else
-    {
-        // 6502
-        // We also kludge `lsloc' so the listing generator doesn't
-        // try to spew out megabytes.
-	    VALUE eval;
-
-	    //if (m6502 == 0) return error(".org permitted only in .6502 section");
-	    if (abs_expr(&eval) < 0) return 0;
-	    if (eval >= 0x10000L) return error(range_error);
-
-        if (sloc != currentorg[0])
-        {
-            currentorg[1] = sloc;
-            currentorg += 2;
-        }
-
-        currentorg[0] = eval;
-	    ch_size = 0;
-	    lsloc = sloc = eval;
-	    chptr = scode->chptr + eval;
-    	orgactive = 1;
-    	orgaddr = eval;
-	    at_eol();
-        return 0;
-    }
+	uint64_t address;
+
+	if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001)
+		return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections");
+
+	// 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 | robjproc)
+	{
+		orgaddr = address;
+		orgactive = 1;
+	}
+	else if (m6502)
+	{
+		// 6502.  We also kludge 'lsloc' so the listing generator doesn't try
+		// to spew out megabytes.
+		if (address > 0xFFFF)
+			return error(range_error);
+
+		if (sloc != currentorg[0])
+		{
+			currentorg[1] = sloc;
+			currentorg += 2;
+		}
+
+		currentorg[0] = address;
+		ch_size = 0;
+		lsloc = sloc = address;
+		chptr = scode->chptr + address;
+		orgaddr = address;
+		orgactive = 1;
+	}
+	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 KW_X:
+			dsp_currentorg->memtype = ORG_X;
+			sectionToSwitch = M56001X;
+			break;
+
+		case KW_Y:
+			dsp_currentorg->memtype = ORG_Y;
+			sectionToSwitch = M56001Y;
+			break;
+
+		case KW_P:
+			dsp_currentorg->memtype = ORG_P;
+			sectionToSwitch = M56001P;
+			break;
+
+		case KW_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;
+	}
+
+	ErrorIfNotAtEOL();
+	return 0;
 }
 
 
@@ -199,14 +363,14 @@ int d_print(void)
 	int wordlong = 0;			// WORD = 0, LONG = 1
 	int outtype = 0;			// 0:hex, 1:decimal, 2:unsigned
 
-	VALUE eval;					// Expression value
+	uint64_t eval;				// Expression value
 	WORD eattr;					// Expression attributes
 	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];
 
 	while (*tok != EOL)
 	{
-		switch(*tok)
+		switch (*tok)
 		{
 		case STRING:
 			sprintf(prntstr, "%s", string[tok[1]]);
@@ -220,25 +384,39 @@ 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)
+			if ((tok[1] != SYMBOL) && (tok[1] != KW_L) && (tok[1] != KW_X))
 				goto token_err;
 
-//			strcpy(prntstr, (char *)tok[2]);
-			strcpy(prntstr, string[tok[2]]);
-
-			switch(prntstr[0])
+			if (tok[1] == KW_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] == KW_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++;
@@ -279,7 +457,7 @@ int d_print(void)
 	return 0;
 
 token_err:
-	error("illegal print token");
+	error("illegal print token [@ '%s']", prntstr);
 	return ERROR;
 }
 
@@ -377,20 +555,19 @@ int d_incbin(void)
 	int fd;
 	int bytes = 0;
 	long pos, size, bytesRead;
-	char msg[256];
 	char buf1[256];
 	int i;
 
 	// Check to see if we're in BSS, and, if so, throw an error
 	if (scattr & SBSS)
 	{
-		errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
+		error("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
 		return ERROR;
 	}
 
 	if (*tok != STRING)
 	{
-		error("syntax error; string missing");
+		error("syntax error; file to include missing");
 		return ERROR;
 	}
 
@@ -413,7 +590,7 @@ int d_incbin(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", string[tok[1]]);
+		return error("cannot open: \"%s\"", string[tok[1]]);
 	}
 
 allright:
@@ -429,8 +606,7 @@ allright:
 
 	if (bytesRead != size)
 	{
-		sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
-		error(msg);
+		error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
 		return ERROR;
 	}
 
@@ -495,8 +671,8 @@ static inline void SkipBytes(unsigned bytesToSkip)
 //
 int d_even(void)
 {
-    if (m6502)
-        return error(in_6502mode);
+	if (m6502)
+		return error(in_6502mode);
 
 	unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 
@@ -528,6 +704,7 @@ int d_long(void)
 	unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
 	unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(4);
 
 	return 0;
 }
@@ -550,6 +727,7 @@ int d_phrase(void)
 	unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
 	unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(8);
 
 	return 0;
 }
@@ -563,6 +741,7 @@ int d_dphrase(void)
 	unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
 	unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(16);
 
 	return 0;
 }
@@ -576,6 +755,7 @@ int d_qphrase(void)
 	unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
 	unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(32);
 
 	return 0;
 }
@@ -593,16 +773,16 @@ int d_qphrase(void)
 //
 void auto_even(void)
 {
-  if (cursect != M6502)
-  {    
-	if (scattr & SBSS)
-		sloc++;				// Bump BSS section
-	else
-		D_byte(0);			// Deposit 0.b in non-BSS
+	if (cursect != M6502)
+	{
+		if (scattr & SBSS)
+			sloc++;				// Bump BSS section
+		else
+			D_byte(0);			// Deposit 0.b in non-BSS
 
-	if (lab_sym != NULL)	// Bump label if we have to
-		lab_sym->svalue++;
-  }
+		if (lab_sym != NULL)	// Bump label if we have to
+			lab_sym->svalue++;
+	}
 }
 
 
@@ -618,7 +798,7 @@ int d_unimpl(void)
 //
 // Return absolute (not TDB) and defined expression or return an error
 //
-int abs_expr(VALUE * a_eval)
+int abs_expr(uint64_t * a_eval)
 {
 	WORD eattr;
 
@@ -690,7 +870,7 @@ int d_include(void)
 	// Make sure the user didn't try anything like:
 	// .include equates.s
 	if (*++tok != EOL)
-		return error("extra stuff after filename -- enclose it in quotes");
+		return error("extra stuff after filename--enclose it in quotes");
 
 	// 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
@@ -711,7 +891,7 @@ int d_include(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", fn);
+		return error("cannot open: \"%s\"", fn);
 	}
 
 allright:
@@ -726,7 +906,7 @@ allright:
 int d_assert(void)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 
 	for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
 	{
@@ -740,7 +920,7 @@ int d_assert(void)
 			break;
 	}
 
-	at_eol();
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -771,8 +951,8 @@ int globl1(char * p)
 
 int d_globl(void)
 {
-  if (m6502)
-    return error(in_6502mode);
+	if (m6502)
+		return error(in_6502mode);
 
 	symlist(globl1);
 	return 0;
@@ -784,13 +964,13 @@ int d_globl(void)
 //
 int d_prgflags(void)
 {
-	VALUE eval;
+	uint64_t eval;
 
 	if (*tok == EOL)
 		return error("PRGFLAGS requires value");
 	else if (abs_expr(&eval) == OK)
 	{
-		PRGFLAGS=eval;
+		PRGFLAGS = (uint32_t)eval;
 		return 0;
 	}
 	else
@@ -805,11 +985,11 @@ int d_prgflags(void)
 //
 int d_abs(void)
 {
-	VALUE eval;
+	uint64_t eval;
+
+	if (m6502)
+		return error(in_6502mode);
 
-    if (m6502)
-        return error(in_6502mode);
-    
 	SaveSection();
 
 	if (*tok == EOL)
@@ -818,7 +998,7 @@ int d_abs(void)
 		return 0;
 
 	SwitchSection(ABS);
-	sloc = eval;
+	sloc = (uint32_t)eval;
 	return 0;
 }
 
@@ -830,8 +1010,8 @@ int d_text(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
-    if (m6502)
-        return error(in_6502mode);
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != TEXT)
 	{
@@ -847,8 +1027,8 @@ int d_data(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
-    if (m6502)
-        return error(in_6502mode);
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != DATA)
 	{
@@ -864,8 +1044,8 @@ int d_bss(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
-    if (m6502)
-        return error(in_6502mode);
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != BSS)
 	{
@@ -884,57 +1064,132 @@ int d_ds(WORD siz)
 {
 	DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
-	VALUE eval;
+	uint64_t eval;
 
-    if (cursect != M6502)
-    {
-	    if ((siz != SIZB) && (sloc & 1))	// Automatic .even
-		    auto_even();
-    }
+	if ((cursect & (M6502 | M56KPXYL)) == 0)
+	{
+		if ((siz != SIZB) && (sloc & 1))	// Automatic .even
+			auto_even();
+	}
 
 	if (abs_expr(&eval) != OK)
 		return 0;
 
 	// 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)
-	if (eval < 0)
-		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
 	// of zeroed memory....
 	if ((scattr & SBSS) || cursect == M6502)
 	{
-		listvalue(eval);
+		listvalue((uint32_t)eval);
 		eval *= siz;
-		sloc += eval;
-        if (cursect == M6502) chptr += eval;
+		sloc += (uint32_t)eval;
+
+		if (cursect == M6502)
+			chptr += eval;
+
 		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, (VALUE)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
+// 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)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 	uint8_t * p;
 
 	if ((scattr & SBSS) != 0)
 		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
@@ -947,15 +1202,27 @@ int d_dc(WORD siz)
 	for(;; tok++)
 	{
 		// dc.b 'string' [,] ...
-		if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
+		if (siz == SIZB && (*tok == STRING || *tok == STRINGA8) && (tok[2] == ',' || tok[2] == EOL))
 		{
 			uint32_t i = strlen(string[tok[1]]);
 
 			if ((challoc - ch_size) < i)
 				chcheck(i);
 
-			for(p=string[tok[1]]; *p!=EOS; p++)
-				D_byte(*p);
+			if (*tok == STRING)
+			{
+				for(p=string[tok[1]]; *p!=EOS; p++)
+					D_byte(*p);
+			}
+			else if (*tok == STRINGA8)
+			{
+				for(p=string[tok[1]]; *p!=EOS; p++)
+					D_byte(strtoa8[*p]);
+			}
+			else
+			{
+				error("String format not supported... yet");
+			}
 
 			tok += 2;
 			goto comma;
@@ -979,8 +1246,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)
 		{
@@ -992,19 +1349,17 @@ int d_dc(WORD siz)
 			}
 			else
 			{
-				if (eval + 0x100 >= 0x200)
-				{
-					sprintf(buffer, "%s (value = $%X)", range_error, eval);
-					return error(buffer);
-				}
-
 				if (tdb)
 					return error("non-absolute byte value");
 
+				if (eval + 0x100 >= 0x200)
+					return error("%s (value = $%X)", range_error, eval);
+
 				D_byte(eval);
 			}
 
 			break;
+
 		case SIZW:
 		case SIZN:
 			if (!defined)
@@ -1021,29 +1376,22 @@ int d_dc(WORD siz)
 					MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
 
 				// Deposit 68000 or 6502 (byte-reversed) word
-	            if (cursect != M6502)
-		        {
-		            D_word(eval);
-		        }
-	            else
-		        {
-		            D_rword(eval);
-		        }
-        
+				if (cursect != M6502)
+					D_word(eval)
+				else
+					D_rword(eval)
 			}
 
 			break;
+
 		case SIZL:
-	        if (m6502)
-	            return error(in_6502mode);
+			// Shamus: Why can't we do longs in 6502 mode?
+			if (m6502)
+				return error(in_6502mode);
 
 			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
@@ -1056,6 +1404,100 @@ int d_dc(WORD siz)
 
 				D_long(eval);
 			}
+
+			break;
+
+		case SIZQ:
+			// 64-bit size
+			if (m6502)
+				return error(in_6502mode);
+
+			// 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);
+				return error("labels not allowed in floating point expressions");
+			}
+			else
+			{
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+
+				PTR ptr;
+				ptr.u64 = &eval;
+				uint32_t ieee754 = FloatToIEEE754((float)*ptr.dp);
+				D_long(ieee754);
+			}
+
+			break;
+
+		case SIZD:
+			// 64-bit double size
+			if (m6502)
+				return error(in_6502mode);
+
+			if (!defined)
+			{
+//				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+//				D_quad(0LL);
+				return error("labels not allowed in floating point expressions");
+			}
+			else
+			{
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+				PTR ptr;
+				ptr.u64 = &eval;
+				uint64_t ieee754 = DoubleToIEEE754(*ptr.dp);
+				D_quad(ieee754);
+			}
+
+			break;
+
+		case SIZX:
+			if (m6502)
+				return error(in_6502mode);
+
+			uint8_t extDbl[12];
+			memset(extDbl, 0, 12);
+
+			if (!defined)
+			{
+//				AddFixup(FU_FLOATEXT, sloc, exprbuf);
+//				D_extend(extDbl);
+				return error("labels not allowed in floating point expressions");
+			}
+			else
+			{
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+				PTR ptr;
+				ptr.u64 = &eval;
+				DoubleToExtended(*ptr.dp, extDbl);
+				D_extend(extDbl);
+			}
+
 			break;
 		}
 
@@ -1064,7 +1506,7 @@ comma:
 			break;
 	}
 
-	at_eol();
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -1074,7 +1516,7 @@ comma:
 //
 int d_dcb(WORD siz)
 {
-	VALUE evalc, eval;
+	uint64_t evalc, eval;
 	WORD eattr;
 
 	DEBUG { printf("dcb: section is %s%s%s (scattr=$%X)\n", (cursect & TEXT ? "TEXT" : ""), (cursect & DATA ? " DATA" : ""), (cursect & BSS ? "BSS" : ""), scattr); }
@@ -1094,7 +1536,7 @@ int d_dcb(WORD siz)
 	if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
 		auto_even();
 
-	dep_block(evalc, siz, eval, eattr, exprbuf);
+	dep_block((uint32_t)evalc, siz, (uint32_t)eval, eattr, exprbuf);
 	return 0;
 }
 
@@ -1111,8 +1553,8 @@ int d_dcb(WORD siz)
 //
 int d_init(WORD def_siz)
 {
-	VALUE count;
-	VALUE eval;
+	uint64_t count;
+	uint64_t eval;
 	WORD eattr;
 	WORD siz;
 
@@ -1127,7 +1569,7 @@ int d_init(WORD def_siz)
 		// Get repeat count (defaults to 1)
 		if (*tok == '#')
 		{
-			++tok;
+			tok++;
 
 			if (abs_expr(&count) != OK)
 				return 0;
@@ -1142,7 +1584,7 @@ int d_init(WORD def_siz)
 		if (expr(exprbuf, &eval, &eattr, NULL) < 0)
 			return 0;
 
-		switch ((int)*tok++)
+		switch (*tok++)
 		{                                 // Determine size of object to deposit
 		case DOTB: siz = SIZB; break;
 		case DOTW: siz = SIZB; break;
@@ -1153,9 +1595,9 @@ int d_init(WORD def_siz)
 			break;
 		}
 
-		dep_block(count, siz, eval, eattr, exprbuf);
+		dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf);
 
-		switch ((int)*tok)
+		switch (*tok)
 		{
 		case EOL:
 			return 0;
@@ -1172,13 +1614,10 @@ int d_init(WORD def_siz)
 //
 // Deposit 'count' values of size 'siz' in the current (non-BSS) segment
 //
-int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
+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--)
 	{
@@ -1222,13 +1661,9 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
 
 				// Deposit 68000 or 6502 (byte-reversed) word
 				if (cursect != M6502)
-				{
-					D_word(eval);
-				}
+					D_word(eval)
 				else
-				{
-					D_rword(eval);
-				}
+					D_rword(eval)
 
 			}
 
@@ -1236,7 +1671,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
 		case SIZL:
 			if (m6502)
 				return error(in_6502mode);
-            
+
 			if (!defined)
 			{
 				AddFixup(FU_LONG, sloc, exprbuf);
@@ -1265,7 +1700,7 @@ int d_comm(void)
 {
 	SYM * sym;
 	char * p;
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -1276,7 +1711,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)
@@ -1292,11 +1727,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 = eval;						// Install common symbol's size
-	at_eol();
+	sym->svalue = eval;					// Install common symbol's size
+	ErrorIfNotAtEOL();
 	return 0;
 }
 
@@ -1330,12 +1765,107 @@ 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;
+	return 0;
+}
+
+
+//
+// .68020 - Back to 68000 TEXT segment and select 68020
+//
+int d_68020(void)
+{
+	d_68000();
+	activecpu = CPU_68020;
+	return 0;
+}
+
+
+//
+// .68030 - Back to 68000 TEXT segment and select 68030
+//
+int d_68030(void)
+{
+	d_68000();
+	activecpu = CPU_68030;
+	return 0;
+}
+
+
+//
+// .68040 - Back to 68000 TEXT segment and select 68040
+//
+int d_68040(void)
+{
+	d_68000();
+	activecpu = CPU_68040;
+	activefpu = FPU_68040;
+	return 0;
+}
+
+
+//
+// .68060 - Back to 68000 TEXT segment and select 68060
+//
+int d_68060(void)
+{
+	d_68000();
+	activecpu = CPU_68060;
+	activefpu = FPU_68060;
+	return 0;
+}
+
+
+//
+// .68881 - Back to 680x0 TEXT segment and select 68881 FPU
+//
+int d_68881(void)
+{
+	//d_68000();
+	activefpu = FPU_68881;
+	return 0;
+}
+
+
+//
+// .68882 - Back to 680x0 TEXT segment and select 68882 FPU
+//
+int d_68882(void)
+{
+	//d_68000();
+	activefpu = FPU_68882;
+	return 0;
+}
+
+
+//
+// nofpu - Deselect FPUs.
+//
+int d_nofpu(void)
+{
+	activefpu = FPU_NONE;
+	return 0;
+}
+
+
+//
+// .56001 - Switch to DSP56001 assembler
+//
+int d_56001(void)
+{
+	dsp56001 = 1;
+	rgpu = rdsp = robjproc = 0;
+	SaveSection();
+
+	if ((obj_format == LOD) || (obj_format == P56))
+		SwitchSection(M56001P);
+
 	return 0;
 }
 
@@ -1351,17 +1881,17 @@ int d_gpu(void)
 		return ERROR;
 	}
 
-	// If previous section was dsp or 68000 then we need to reset ORG'd Addresses
+	// If previous section was DSP or 68000 then we need to reset ORG'd Addresses
 	if (!rgpu)
 	{
-//printf("Resetting ORG...\n");
 		orgactive = 0;
 		orgwarning = 0;
 	}
-//else printf("NOT resetting ORG!\n");
 
 	rgpu = 1;			// Set GPU assembly
 	rdsp = 0;			// Unset DSP assembly
+	robjproc = 0;		// Unset OP assembly
+	dsp56001 = 0;		// Unset 56001 assembly
 	regbank = BANK_N;	// Set no default register bank
 	return 0;
 }
@@ -1387,6 +1917,8 @@ int d_dsp(void)
 
 	rdsp = 1;			// Set DSP assembly
 	rgpu = 0;			// Unset GPU assembly
+	robjproc = 0;		// Unset OP assembly
+	dsp56001 = 0;		// Unset 56001 assembly
 	regbank = BANK_N;	// Set no default register bank
 	return 0;
 }
@@ -1404,7 +1936,7 @@ int d_dsp(void)
 //
 int d_cargs(void)
 {
-	VALUE eval = 4;		// Default to 4 if no offset specified (to account for
+	uint64_t eval = 4;	// Default to 4 if no offset specified (to account for
 						// return address)
 	WORD rlist;
 	SYM * symbol;
@@ -1443,7 +1975,7 @@ int d_cargs(void)
 				symbol->sattr = 0;
 			}
 			else if (symbol->sattr & DEFINED)
-				return errors("multiply-defined label '%s'", p);
+				return error("multiply-defined label '%s'", p);
 
 			// Put symbol in "order of definition" list
 			AddToSymbolDeclarationList(symbol);
@@ -1519,7 +2051,7 @@ int d_cargs(void)
 //
 int d_cstruct(void)
 {
-	VALUE eval = 0;		// Default, if no offset specified, is zero
+	uint64_t eval = 0;	// Default, if no offset specified, is zero
 	WORD rlist;
 	SYM * symbol;
 	char * symbolName;
@@ -1559,7 +2091,7 @@ int d_cstruct(void)
 				symbol->sattr = 0;
 			}
 			else if (symbol->sattr & DEFINED)
-				return errors("multiply-defined label '%s'", symbolName);
+				return error("multiply-defined label '%s'", symbolName);
 
 			// Put symbol in "order of definition" list
 			AddToSymbolDeclarationList(symbol);
@@ -1637,6 +2169,33 @@ 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
+	return OK;
+}
+
+
 //
 // Undefine a macro - .undefmac macname [, macname...]
 //
@@ -1692,11 +2251,7 @@ int d_opt(void)
 			char * tmpstr = string[*tok++];
 
 			if (ParseOptimization(tmpstr) != OK)
-			{
-				char temperr[256];
-				sprintf(temperr, "unknown optimization flag '%s'", tmpstr);
-				return error(temperr);
-			}
+				return error("unknown optimization flag '%s'", tmpstr);
 		}
 		else
 			return error(".opt directive needs every switch enclosed inside quotation marks");
@@ -1705,3 +2260,78 @@ int d_opt(void)
 	return OK;
 }
 
+
+//
+// .if, Start conditional assembly
+//
+int d_if(void)
+{
+	WORD eattr;
+	uint64_t eval;
+	SYM * esym;
+	IFENT * rif = f_ifent;
+
+	// Alloc an IFENTRY
+	if (rif == NULL)
+		rif = (IFENT *)malloc(sizeof(IFENT));
+	else
+		f_ifent = rif->if_prev;
+
+	rif->if_prev = ifent;
+	ifent = rif;
+
+	if (!disabled)
+	{
+		if (expr(exprbuf, &eval, &eattr, &esym) != OK)
+			return 0;
+
+		if ((eattr & DEFINED) == 0)
+			return error(undef_error);
+
+		disabled = !eval;
+	}
+
+	rif->if_state = (WORD)disabled;
+	return 0;
+}
+
+
+//
+// .else, Do alternate case for .if
+//
+int d_else(void)
+{
+	IFENT * rif = ifent;
+
+	if (rif->if_prev == NULL)
+		return error("mismatched .else");
+
+	if (disabled)
+		disabled = rif->if_prev->if_state;
+	else
+		disabled = 1;
+
+	rif->if_state = (WORD)disabled;
+	return 0;
+}
+
+
+//
+// .endif, End of conditional assembly block
+// This is also called by fpop() to pop levels of IFENTs in case a macro or
+// include file exits early with `exitm' or `end'.
+//
+int d_endif(void)
+{
+	IFENT * rif = ifent;
+
+	if (rif->if_prev == NULL)
+		return error("mismatched .endif");
+
+	ifent = rif->if_prev;
+	disabled = rif->if_prev->if_state;
+	rif->if_prev = f_ifent;
+	f_ifent = rif;
+	return 0;
+}
+