X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=3146c5345599c18d9703daa1c787ce157e961ceb;hp=3471742ea179a28ca817d232b46501e5887ac41b;hb=d0c28c349ddfb8393568037f68bddbe8979ce0df;hpb=49dca3f4aa9df6022a2902be0246b6e8d93def66

diff --git a/direct.c b/direct.c
index 3471742..3146c53 100644
--- a/direct.c
+++ b/direct.c
@@ -3,12 +3,12 @@
 // DIRECT.C - Directive Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "direct.h"
 #include "sect.h"
-#include "risca.h"
+#include "riscasm.h"
 #include "error.h"
 #include "token.h"
 #include "procln.h"
@@ -21,65 +21,71 @@
 #define DEF_KW
 #include "kwtab.h"
 
+
 TOKEN exprbuf[128];			// Expression buffer 
 SYM * symbolPtr[1000000];	// Symbol pointers table
+static long unused;			// For supressing 'write' warnings
+
 
 // Directive handler table
 int (*dirtab[])() = {
-   d_org,				// 0 org
-   d_even,				// 1 even
-   d_unimpl,			// 2 .6502
-   d_68000,				// 3 .68000 
-   d_bss,				// 4 bss
-   d_data,				// 5 data 
-   d_text,				// 6 text 
-   d_abs,				// 7 abs 
-   d_comm,				// 8 comm 
-   d_init,				// 9 init 
-   d_cargs,				// 10 cargs 
-   d_goto,				// 11 goto 
-   d_dc,				// 12 dc 
-   d_ds,				// 13 ds 
-   d_undmac,			// 14 undefmac 
-   d_gpu,				// 15 .gpu
-   d_dsp,				// 16 .dsp
-   d_dcb,				// 17 dcb 
-   d_unimpl,			// 18* set 
-   d_unimpl,			// 19* reg 
-   d_unimpl,			// 20 dump 
-   d_incbin,			// 21 .incbin //load 
-   d_unimpl,			// 22 disable 
-   d_unimpl,			// 23 enable 
-   d_globl,				// 24 globl 
-   d_regbank0,			// 25 .regbank0
-   d_regbank1,			// 26 .regbank1
-   d_unimpl,			// 27 xdef 
-   d_assert,			// 28 assert 
-   d_unimpl,			// 29* if 
-   d_unimpl,			// 30* endif 
-   d_unimpl,			// 31* endc 
-   d_unimpl,			// 32* iif 
-   d_include,			// 33 include 
-   fpop,				// 34 end 
-   d_unimpl,			// 35* macro 
-   ExitMacro,			// 36* exitm 
-   d_unimpl,			// 37* endm 
-   d_list,				// 38 list 
-   d_nlist,				// 39 nlist 
-   d_long,				// 40* rept 
-   d_phrase,			// 41* endr 
-   d_dphrase,			// 42 struct 
-   d_qphrase,			// 43 ends 
-   d_title,				// 44 title 
-   d_subttl,			// 45 subttl 
-   eject,				// 46 eject 
-   d_unimpl,			// 47 error 
-   d_unimpl,			// 48 warn 
-   d_noclear,			// 49 .noclear
-   d_equrundef,			// 50 .equrundef/.regundef
-   d_ccundef,			// 51 .ccundef
-   d_print,				// 52 .print
-   d_cstruct,			// 53 .cstruct
+	d_org,				// 0 org
+	d_even,				// 1 even
+	d_unimpl,			// 2 .6502
+	d_68000,			// 3 .68000 
+	d_bss,				// 4 bss
+	d_data,				// 5 data 
+	d_text,				// 6 text 
+	d_abs,				// 7 abs 
+	d_comm,				// 8 comm 
+	d_init,				// 9 init 
+	d_cargs,			// 10 cargs 
+	d_goto,				// 11 goto 
+	d_dc,				// 12 dc 
+	d_ds,				// 13 ds 
+	d_undmac,			// 14 undefmac 
+	d_gpu,				// 15 .gpu
+	d_dsp,				// 16 .dsp
+	d_dcb,				// 17 dcb 
+	d_unimpl,			// 18* set 
+	d_unimpl,			// 19* reg 
+	d_unimpl,			// 20 dump 
+	d_incbin,			// 21 .incbin //load 
+	d_unimpl,			// 22 disable 
+	d_unimpl,			// 23 enable 
+	d_globl,			// 24 globl 
+	d_regbank0,			// 25 .regbank0
+	d_regbank1,			// 26 .regbank1
+	d_unimpl,			// 27 xdef 
+	d_assert,			// 28 assert 
+	d_unimpl,			// 29* if 
+	d_unimpl,			// 30* endif 
+	d_unimpl,			// 31* endc 
+	d_unimpl,			// 32* iif 
+	d_include,			// 33 include 
+	fpop,				// 34 end 
+	d_unimpl,			// 35* macro 
+	ExitMacro,			// 36* exitm 
+	d_unimpl,			// 37* endm 
+	d_list,				// 38 list 
+	d_nlist,			// 39 nlist 
+	d_long,				// 40* rept 
+	d_phrase,			// 41* endr 
+	d_dphrase,			// 42 struct 
+	d_qphrase,			// 43 ends 
+	d_title,			// 44 title 
+	d_subttl,			// 45 subttl 
+	eject,				// 46 eject 
+	d_unimpl,			// 47 error 
+	d_unimpl,			// 48 warn 
+	d_noclear,			// 49 .noclear
+	d_equrundef,		// 50 .equrundef/.regundef
+	d_ccundef,			// 51 .ccundef
+	d_print,			// 52 .print
+	d_cstruct,			// 53 .cstruct
+	d_jpad,				// 54 .jpad (deprecated)
+	d_nojpad,			// 55 .nojpad (deprecated)
+	d_gpumain,			// 56 .gpumain (deprecated)
 };
 
 
@@ -102,26 +108,27 @@ int d_org(void)
 	}
 
 	orgaddr = address;
-	orgactive = 1;  
+	orgactive = 1;
+//printf("ORG: address = $%08X...\n", orgaddr);
 
 	return 0;
 }
 
 
 //
-// Print Directive
+// Print directive
 //
 int d_print(void)
 {
-	char prntstr[LNSIZ];                                     // String for PRINT directive
-	char format[LNSIZ];                                      // Format for PRINT directive
-	int formatting = 0;                                      // Formatting on/off
-	int wordlong = 0;                                        // WORD = 0, LONG = 1
-	int outtype = 0;                                         // 0:hex, 1:decimal, 2:unsigned
-
-	VALUE eval;                                              // Expression value
-	WORD eattr;                                              // Expression attributes
-	SYM * esym;                                              // External symbol involved in expr.
+	char prntstr[LNSIZ];		// String for PRINT directive
+	char format[LNSIZ];			// Format for PRINT directive
+	int formatting = 0;			// Formatting on/off
+	int wordlong = 0;			// WORD = 0, LONG = 1
+	int outtype = 0;			// 0:hex, 1:decimal, 2:unsigned
+
+	VALUE eval;					// Expression value
+	WORD eattr;					// Expression attributes
+	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];
 
 	while (*tok != EOL)
@@ -129,12 +136,11 @@ int d_print(void)
 		switch(*tok)
 		{
 		case STRING:
-//			sprintf(prntstr, "%s", (char *)tok[1]);
 			sprintf(prntstr, "%s", string[tok[1]]);
 			printf("%s", prntstr);
 
 			if (list_fd) 
-				write(list_fd, prntstr, (LONG)strlen(prntstr));
+				unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
 			tok += 2;
 			break;
@@ -184,7 +190,7 @@ int d_print(void)
 				printf("%s", prntstr);
 
 				if (list_fd) 
-					write(list_fd, prntstr, (LONG)strlen(prntstr));
+					unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
 
 				formatting = 0;
 				wordlong = 0;
@@ -196,7 +202,6 @@ int d_print(void)
 	}
 
 	printf("\n");
-	println("\n");
 
 	return 0;
 
@@ -207,7 +212,7 @@ token_err:
 
 
 //
-// Undefine an Equated Condition Code
+// Undefine an equated condition code
 //
 int d_ccundef(void)
 {
@@ -222,11 +227,10 @@ int d_ccundef(void)
 
 	if (*tok != SYMBOL)
 	{
-		error(syntax_error);
+		error("syntax error; expected symbol");
 		return ERROR;
 	}
 
-//	ccname = lookup((char *)tok[1], LABEL, 0);
 	ccname = lookup(string[tok[1]], LABEL, 0);
 
 	// Make sure symbol is a valid ccdef
@@ -243,7 +247,7 @@ int d_ccundef(void)
 
 
 //
-// Undefine an Equated Register
+// Undefine an equated register
 //
 int d_equrundef(void)
 {
@@ -251,30 +255,28 @@ int d_equrundef(void)
 
 	// Check that we are in a RISC section
 	if (!rgpu && !rdsp)
-	{
-		error(".equrundef/.regundef must be defined in .gpu/.dsp section");
-		return ERROR;
-	}
+		return error(".equrundef/.regundef must be defined in .gpu/.dsp section");
 
 	while (*tok != EOL)
 	{
-		// Skip preceeding or seperating commas
+		// Skip preceeding or seperating commas (if any)
 		if (*tok == ',')
 			tok++;
 
 		// Check we are dealing with a symbol
 		if (*tok != SYMBOL)
-		{
-			error(syntax_error);
-			return ERROR;
-		}
+			return error("syntax error; expected symbol");
 
 		// Lookup and undef if equated register
-//		regname = lookup((char *)tok[1], LABEL, 0);
 		regname = lookup(string[tok[1]], LABEL, 0);
 
 		if (regname && (regname->sattre & EQUATEDREG))
+		{
+			// Reset the attributes of this symbol...
+			regname->sattr = 0;
+			regname->sattre &= ~(EQUATEDREG | BANK_0 | BANK_1);
 			regname->sattre |= UNDEF_EQUR;
+		}
 
 		// Skip over symbol token and address
 		tok += 2;
@@ -285,7 +287,7 @@ int d_equrundef(void)
 
 
 //
-// Do Not Allow the Use of the CLR.L Opcode
+// Do not allow use of the CLR.L opcode
 //
 int d_noclear(void)
 {
@@ -294,61 +296,66 @@ int d_noclear(void)
 
 
 // 
-// Include Binary File
+// Include binary file
 //
 int d_incbin(void)
 {
-	int i, j;
+	int fd;
 	int bytes = 0;
-	long pos, size;
-	char buf;
+	long pos, size, bytesRead;
+	char msg[256];
 
 	// 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]]);
+		errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
 		return ERROR;
 	}
 
 	if (*tok != STRING)
 	{
-		error(syntax_error);
+		error("syntax error; string missing");
 		return ERROR;
 	}
 
-//	if ((j = open((char *)tok[1],  _OPEN_INC)) >= 0)
-	if ((j = open(string[tok[1]],  _OPEN_INC)) >= 0)
+	if ((fd = open(string[tok[1]],  _OPEN_INC)) < 0)
 	{
-		size = lseek(j, 0L, SEEK_END);
-		chcheck(size);
-		pos = lseek(j, 0L, SEEK_SET);
+		errors("cannot open include binary file (%s)", string[tok[1]]);
+		return ERROR;
+	}
 
-		DEBUG
-		{
-			printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size);
-		}
+	size = lseek(fd, 0L, SEEK_END);
+	pos = lseek(fd, 0L, SEEK_SET);
+	chcheck(size);
 
-		for(i=0; i<size; i++)
-		{
-			buf = '\0';
-			bytes = read(j, &buf, 1);
-			D_byte(buf);
-		}
-	}
-	else
+	DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); }
+
+	char * fileBuffer = (char *)malloc(size);
+	bytesRead = read(fd, fileBuffer, size);
+
+	if (bytesRead != size)
 	{
-//		errors("cannot open include binary file (%s)", (char *)tok[1]);
-		errors("cannot open include binary file (%s)", string[tok[1]]);
+		sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
+		error(msg);
 		return ERROR;
 	}
 
-	close(j);
+	memcpy(chptr, fileBuffer, size);
+	chptr += size;
+	sloc += size;
+	ch_size += size;
+
+	if (orgactive)
+		orgaddr += size;
+
+	free(fileBuffer);
+	close(fd);
 	return 0;
 }
 
 
 // 
-// Set RISC Register Banks
+// Set RISC register banks
 //
 int d_regbank0(void)
 {
@@ -367,11 +374,36 @@ int d_regbank1(void)
 
 
 //
-// Adjust Location to an EVEN Value
+// Helper function, to cut down on mistakes & typing
+//
+static inline void SkipBytes(unsigned bytesToSkip)
+{
+	if (!bytesToSkip)
+		return;
+
+	if ((scattr & SBSS) == 0)
+	{
+		chcheck(bytesToSkip);
+		D_ZEROFILL(bytesToSkip);
+	}
+	else
+	{
+		sloc += bytesToSkip;
+
+		if (orgactive)
+			orgaddr += bytesToSkip;
+	}
+}
+
+
+//
+// Adjust location to an EVEN value
 //
 int d_even(void)
 {
-	if (sloc & 1)
+	unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
+	
+	if (skip)
 	{
 		if ((scattr & SBSS) == 0)
 		{
@@ -380,7 +412,10 @@ int d_even(void)
 		}
 		else
 		{
-			++sloc;
+			sloc++;
+
+			if (orgactive)
+				orgaddr++;
 		}
 	}
 
@@ -389,137 +424,61 @@ int d_even(void)
 
 
 //
-// Adjust Location to an LONG Value
+// Adjust location to a LONG value
 //
 int d_long(void)
 {
-	unsigned i;
-	unsigned val = 4;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
+	unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
 
 
 //
-// Adjust Location to an PHRASE Value
+// Adjust location to a PHRASE value
+//
+// N.B.: We have to handle the GPU/DSP cases separately because you can embed
+//       RISC code in the middle of a regular 68K section. Also note that all
+//       of the alignment pseudo-ops will have to be fixed this way.
+//
+// This *must* behave differently when in a RISC section, as following sloc
+// (instead of orgaddr) will fuck things up royally. Note that we do it this
+// way because you can embed RISC code in a 68K section, and have the origin
+// pointing to a different alignment in the RISC section than the 68K section.
 //
 int d_phrase(void)
 {
-	unsigned i;
-	unsigned val = 8;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
+	unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
 
 
 //
-// Adjust Location to an DPHRASE Value
+// Adjust location to a DPHRASE value
 //
 int d_dphrase(void)
 {
-	unsigned i;
-	unsigned val = 16;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
+	unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
 
 
 //
-// Adjust Location to an QPHRASE Value
+// Adjust location to a QPHRASE value
 //
 int d_qphrase(void)
 {
-	unsigned i;
-	unsigned val = 32;
-			
-	i = sloc & ~(val - 1);
-
-	if (i != sloc)
-		val = val - (sloc - i); 
-	else
-		val = 0;
-
-	if (val)
-	{
-		if ((scattr & SBSS) == 0)
-		{
-			savsect();
-			chcheck(val);
-
-			for(i=0; i<val; i++) 
-				D_byte(0);
-		}
-		else
-		{
-			sloc += val;
-		}
-	}
+	unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
+	unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
+	SkipBytes(bytesToSkip);
 
 	return 0;
 }
@@ -533,20 +492,22 @@ int d_qphrase(void)
 // which is OK since multiple labels are only allowed in AS68 kludge mode, and
 // the C compiler is VERY paranoid and uses ".even" whenever it can
 //
+// N.B.: This probably needs the same fixes as above...
+//
 void auto_even(void)
 {
 	if (scattr & SBSS)
-		++sloc;                                               // Bump BSS section
+		sloc++;				// Bump BSS section
 	else
-		D_byte(0)                                             // Deposit 0.b in non-BSS
+		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++;
 }
 
 
 //
-// Unimplemened Directive Error
+// Unimplemened directive error
 //
 int d_unimpl(void)
 {
@@ -579,18 +540,14 @@ int abs_expr(VALUE * a_eval)
 //
 int symlist(int(* func)())
 {
-	char * em = "symbol list syntax";
+	const char * em = "symbol list syntax";
 
 	for(;;)
 	{
 		if (*tok != SYMBOL)
 			return error(em);
 
-#if 0
-		if ((*func)(tok[1]) != OK)
-#else
 		if ((*func)(string[tok[1]]) != OK)
-#endif
 			break;
 
 		tok += 2;
@@ -601,7 +558,7 @@ int symlist(int(* func)())
 		if (*tok != ',')
 			return error(em);
 
-		++tok;
+		tok++;
 	}
 
 	return 0;
@@ -619,23 +576,15 @@ int d_include(void)
 	char buf[128];
 	char buf1[128];
 
-	if (*tok == STRING)							// Leave strings ALONE 
-#if 0
-		fn = (char *)*++tok;
-#else
+	if (*tok == STRING)			// Leave strings ALONE 
 		fn = string[*++tok];
-#endif
-	else if (*tok == SYMBOL)					// Try to append ".s" to symbols
+	else if (*tok == SYMBOL)	// Try to append ".s" to symbols
 	{
-#if 0
-		strcpy(buf, (char *)*++tok);
-#else
 		strcpy(buf, string[*++tok]);
-#endif
 		fext(buf, ".s", 0);
 		fn = &buf[0];
 	}
-	else										// Punt if no STRING or SYMBOL 
+	else						// Punt if no STRING or SYMBOL 
 		return error("missing filename");
 
 	// Make sure the user didn't try anything like:
@@ -700,7 +649,7 @@ int d_assert(void)
 //
 int globl1(char * p)
 {
-	SYM *sy;
+	SYM * sy;
 
 	if (*p == '.')
 		return error("cannot .globl local symbol");
@@ -710,6 +659,7 @@ int globl1(char * p)
 		sy = NewSymbol(p, LABEL, 0);
 		sy->svalue = 0;
 		sy->sattr = GLOBAL;
+//printf("glob1: Making global symbol: attr=%04X, eattr=%08X, %s\n", sy->sattr, sy->sattre, sy->sname);
 	}
 	else 
 		sy->sattr |= GLOBAL;
@@ -732,23 +682,22 @@ int d_abs(void)
 {
 	VALUE eval;
 
-	savsect();
+	SaveSection();
 
 	if (*tok == EOL)
 		eval = 0;
 	else if (abs_expr(&eval) != OK)
 		return 0;
 
-	switchsect(ABS);
+	SwitchSection(ABS);
 	sloc = eval;
 	return 0;
 }
 
 
 //
-// Switch Segments
+// Switch segments
 //
-
 int d_text(void)
 {
 	if (rgpu || rdsp)
@@ -756,8 +705,8 @@ int d_text(void)
 
 	if (cursect != TEXT)
 	{
-		savsect();
-		switchsect(TEXT);
+		SaveSection();
+		SwitchSection(TEXT);
 	}
 
 	return 0;
@@ -771,8 +720,8 @@ int d_data(void)
 
 	if (cursect != DATA)
 	{
-		savsect();
-		switchsect(DATA);
+		SaveSection();
+		SwitchSection(DATA);
 	}
 
 	return 0;
@@ -786,8 +735,8 @@ int d_bss(void)
 
 	if (cursect != BSS)
 	{
-		savsect();
-		switchsect(BSS);
+		SaveSection();
+		SwitchSection(BSS);
 	}
 
 	return 0;
@@ -799,6 +748,9 @@ int d_bss(void)
 //
 int d_ds(WORD siz)
 {
+if (verb_flag)
+	printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+
 	VALUE eval;
 
 	// This gets kind of stupid.  This directive is disallowed in normal 68000
@@ -817,7 +769,7 @@ int d_ds(WORD siz)
 	// 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))
+	if (scattr & SBSS)
 	{
 		listvalue(eval);
 		eval *= siz;
@@ -826,7 +778,7 @@ int d_ds(WORD siz)
 	}
 	else
 	{
-		dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED|ABS), NULL);
+		dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL);
 	}
 
 	at_eol();
@@ -893,7 +845,7 @@ int d_dc(WORD siz)
 		case SIZB:
 			if (!defined)
 			{
-				fixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
+				AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
 				D_byte(0);
 			}
 			else
@@ -912,7 +864,7 @@ int d_dc(WORD siz)
 		case SIZN:
 			if (!defined)
 			{
-				fixup(FU_WORD | FU_SEXT, sloc, exprbuf);
+				AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
 				D_word(0);
 			}
 			else
@@ -932,9 +884,9 @@ int d_dc(WORD siz)
 			if (!defined)
 			{
 				if (movei)
-					fixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
+					AddFixup(FU_LONG | FU_MOVEI, sloc, exprbuf);
 				else
-					fixup(FU_LONG, sloc, exprbuf);
+					AddFixup(FU_LONG, sloc, exprbuf);
 
 				D_long(0);
 			}
@@ -1080,7 +1032,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
 		case SIZB:
 			if (!defined)
 			{
-				fixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
+				AddFixup(FU_BYTE | FU_SEXT, sloc, exprbuf);
 				D_byte(0);
 			}
 			else
@@ -1099,7 +1051,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
 		case SIZN:
 			if (!defined)
 			{
-				fixup(FU_WORD | FU_SEXT, sloc, exprbuf);
+				AddFixup(FU_WORD | FU_SEXT, sloc, exprbuf);
 				D_word(0);
 			}
 			else
@@ -1118,7 +1070,7 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
 		case SIZL:
 			if (!defined)
 			{
-				fixup(FU_LONG, sloc, exprbuf);
+				AddFixup(FU_LONG, sloc, exprbuf);
 				D_long(0);
 			}
 			else
@@ -1149,7 +1101,6 @@ int d_comm(void)
 	if (*tok != SYMBOL)
 		return error("missing symbol");
 
-//	p = (char *)tok[1];
 	p = string[tok[1]];
 	tok += 2;
 
@@ -1211,14 +1162,14 @@ int d_68000(void)
 	// Switching from gpu/dsp sections should reset any ORG'd Address
 	orgactive = 0;                               
 	orgwarning = 0;
-	savsect();
-	switchsect(TEXT);
+	SaveSection();
+	SwitchSection(TEXT);
 	return 0;
 }
 
 
 //
-// .gpu - Switch to GPU Assembler
+// .gpu - Switch to GPU assembler
 //
 int d_gpu(void)
 {
@@ -1231,9 +1182,11 @@ int d_gpu(void)
 	// 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
@@ -1243,7 +1196,7 @@ int d_gpu(void)
 
 
 //
-// .dsp - Switch to DSP Assembler
+// .dsp - Switch to DSP assembler
 //
 int d_dsp(void)
 {
@@ -1306,18 +1259,10 @@ int d_cargs(void)
 	{
 		if (*tok == SYMBOL)
 		{
-//			p = (char *)tok[1];
 			p = string[tok[1]];
 
-#if 0
-			if (*p == '.')
-				env = curenv;			// Label is local
-			else
-				env = 0;				// Label is global
-#else
 			// Set env to either local (dot prefixed) or global scope
 			env = (*p == '.' ? curenv : 0);
-#endif
 			symbol = lookup(p, LABEL, env);
 
 			if (symbol == NULL)
@@ -1329,8 +1274,7 @@ int d_cargs(void)
 				return errors("multiply-defined label '%s'", p);
 
 			// Put symbol in "order of definition" list
-			if (!(symbol->sattr & SDECLLIST))
-				sym_decl(symbol);
+			AddToSymbolDeclarationList(symbol);
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
 			symbol->svalue = eval;
@@ -1355,7 +1299,6 @@ int d_cargs(void)
 			if (reglist(&rlist) < 0)
 				return 0;
 
-//			for(i=0; i++<16; rlist>>=1)
 			for(i=0; i<16; i++, rlist>>=1)
 			{
 				if (rlist & 1)
@@ -1447,8 +1390,7 @@ int d_cstruct(void)
 				return errors("multiply-defined label '%s'", symbolName);
 
 			// Put symbol in "order of definition" list
-			if (!(symbol->sattr & SDECLLIST))
-				sym_decl(symbol);
+			AddToSymbolDeclarationList(symbol);
 
 			tok += 2;
 
@@ -1545,3 +1487,23 @@ int d_undmac(void)
 	return 0;
 }
 
+
+int d_jpad(void)
+{
+	warn("JPAD directive is deprecated/non-functional");
+	return OK;
+}
+
+
+int d_nojpad(void)
+{
+	warn("NOJPAD directive is deprecated/non-functional");
+	return OK;
+}
+
+
+int d_gpumain(void)
+{
+	return error("What the hell? Do you think we adhere to the Goof standard?");
+}
+