X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=6237ce2e418d715c464cedab0813ff6a1842b7c0;hp=77fda019a62dd459a106f98959aac8be486a769b;hb=1feb728a9eb579b6441daf0124d81483f600365c;hpb=c04128b575f2db39445b9ef6fcf0c12b3bb2c60f

diff --git a/direct.c b/direct.c
index 77fda01..6237ce2 100644
--- a/direct.c
+++ b/direct.c
@@ -3,7 +3,7 @@
 // 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"
@@ -22,9 +22,10 @@
 #include "kwtab.h"
 
 
-TOKEN exprbuf[128];			// Expression buffer 
+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
 
 
 // Directive handler table
@@ -32,52 +33,52 @@ int (*dirtab[])() = {
 	d_org,				// 0 org
 	d_even,				// 1 even
 	d_unimpl,			// 2 .6502
-	d_68000,			// 3 .68000 
+	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_data,				// 5 data
+	d_text,				// 6 text
+	d_abs,				// 7 abs
+	d_comm,				// 8 comm
+	(void *)d_init,		// 9 init
+	d_cargs,			// 10 cargs
+	(void *)d_goto,		// 11 goto
+	(void *)d_dc,		// 12 dc
+	(void *)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 
+	(void *)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_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_error,			// 47 error 
+	d_warn,				// 48 warn 
 	d_noclear,			// 49 .noclear
 	d_equrundef,		// 50 .equrundef/.regundef
 	d_ccundef,			// 51 .ccundef
@@ -86,9 +87,53 @@ int (*dirtab[])() = {
 	d_jpad,				// 54 .jpad (deprecated)
 	d_nojpad,			// 55 .nojpad (deprecated)
 	d_gpumain,			// 56 .gpumain (deprecated)
+	d_prgflags,			// 57 .prgflags
+	d_opt,				// 58 .opt
 };
 
 
+//
+// .error - Abort compilation, printing an error message
+//
+int d_error(char *str)
+{
+	if (*tok == EOL)
+		return error("error directive encountered - aborting assembling");
+	else
+	{
+		switch(*tok)
+		{
+		case STRING:
+			return error(string[tok[1]]);
+			break;
+		default:
+			return error("error directive encountered - aborting assembling");
+		}
+	}
+}
+
+
+//
+// .warn - Just display a warning on screen
+//
+int d_warn(char *str)
+{
+	if (*tok == EOL)
+		return warn("WARNING WARNING WARNING");
+	else
+	{
+		switch(*tok)
+		{
+		case STRING:
+			return warn(string[tok[1]]);
+			break;
+		default:
+			return warn("WARNING WARNING WARNING");
+		}
+	}
+}
+
+
 //
 // .org - Set origin
 //
@@ -116,19 +161,19 @@ int d_org(void)
 
 
 //
-// 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)
@@ -136,7 +181,6 @@ int d_print(void)
 		switch(*tok)
 		{
 		case STRING:
-//			sprintf(prntstr, "%s", (char *)tok[1]);
 			sprintf(prntstr, "%s", string[tok[1]]);
 			printf("%s", prntstr);
 
@@ -203,7 +247,6 @@ int d_print(void)
 	}
 
 	printf("\n");
-//	println("\n");
 
 	return 0;
 
@@ -214,7 +257,7 @@ token_err:
 
 
 //
-// Undefine an Equated Condition Code
+// Undefine an equated condition code
 //
 int d_ccundef(void)
 {
@@ -229,12 +272,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
@@ -251,7 +292,7 @@ int d_ccundef(void)
 
 
 //
-// Undefine an Equated Register
+// Undefine an equated register
 //
 int d_equrundef(void)
 {
@@ -275,7 +316,12 @@ int d_equrundef(void)
 		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;
@@ -286,16 +332,17 @@ 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)
 {
+	warn("CLR.L opcode ignored...");
 	return 0;
 }
 
 
 // 
-// Include Binary File
+// Include binary file
 //
 int d_incbin(void)
 {
@@ -303,6 +350,8 @@ int d_incbin(void)
 	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)
@@ -317,12 +366,30 @@ int d_incbin(void)
 		return ERROR;
 	}
 
-	if ((fd = open(string[tok[1]],  _OPEN_INC)) < 0)
+	// 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)
 	{
-		errors("cannot open include binary file (%s)", string[tok[1]]);
-		return ERROR;
+		for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++)
+		{
+			fd = strlen(buf1);
+
+			// Append path char if necessary
+			if (fd > 0 && buf1[fd - 1] != SLASHCHAR)
+				strcat(buf1, SLASHSTRING);
+
+			strcat(buf1, string[tok[1]]);
+
+			if ((fd = open(buf1, _OPEN_INC)) >= 0)
+				goto allright;
+		}
+
+		return errors("cannot open: \"%s\"", string[tok[1]]);
 	}
 
+allright:
+
 	size = lseek(fd, 0L, SEEK_END);
 	pos = lseek(fd, 0L, SEEK_SET);
 	chcheck(size);
@@ -354,7 +421,7 @@ int d_incbin(void)
 
 
 // 
-// Set RISC Register Banks
+// Set RISC register banks
 //
 int d_regbank0(void)
 {
@@ -396,13 +463,12 @@ static inline void SkipBytes(unsigned bytesToSkip)
 
 
 //
-// Adjust Location to an EVEN Value
+// Adjust location to an EVEN value
 //
 int d_even(void)
 {
 	unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 	
-//	if (sloc & 1)
 	if (skip)
 	{
 		if ((scattr & SBSS) == 0)
@@ -424,7 +490,7 @@ int d_even(void)
 
 
 //
-// Adjust Location to an LONG Value
+// Adjust location to a LONG value
 //
 int d_long(void)
 {
@@ -437,7 +503,7 @@ int d_long(void)
 
 
 //
-// 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
@@ -459,7 +525,7 @@ int d_phrase(void)
 
 
 //
-// Adjust Location to an DPHRASE Value
+// Adjust location to a DPHRASE value
 //
 int d_dphrase(void)
 {
@@ -472,7 +538,7 @@ int d_dphrase(void)
 
 
 //
-// Adjust Location to an QPHRASE Value
+// Adjust location to a QPHRASE value
 //
 int d_qphrase(void)
 {
@@ -497,17 +563,17 @@ int d_qphrase(void)
 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)
 {
@@ -576,23 +642,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:
@@ -683,6 +741,27 @@ int d_globl(void)
 }
 
 
+//
+// .prgflags expression
+//
+int d_prgflags(void)
+{
+	VALUE eval;
+
+	if (*tok == EOL)
+		return error("PRGFLAGS requires value");
+	else if (abs_expr(&eval) == OK)
+	{
+		PRGFLAGS=eval;
+		return 0;
+	}
+	else
+	{
+		return error("PRGFLAGS requires value");
+	}
+}
+
+
 //
 // .abs [expression]
 //
@@ -704,9 +783,8 @@ int d_abs(void)
 
 
 //
-// Switch Segments
+// Switch segments
 //
-
 int d_text(void)
 {
 	if (rgpu || rdsp)
@@ -757,8 +835,7 @@ int d_bss(void)
 //
 int d_ds(WORD siz)
 {
-if (verb_flag)
-	printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+	DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
 	VALUE eval;
 
@@ -775,9 +852,14 @@ if (verb_flag)
 	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");
+
 	// In non-TDB section (BSS, ABS and M6502) just advance the location
 	// counter appropriately. In TDB sections, deposit (possibly large) chunks
-	//of zeroed memory....
+	// of zeroed memory....
 	if (scattr & SBSS)
 	{
 		listvalue(eval);
@@ -811,15 +893,22 @@ int d_dc(WORD siz)
 	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 ((siz != SIZB) && (sloc & 1))
 		auto_even();
 
+	// Check to see if we're trying to set LONGS on a non 32-bit aligned
+	// address in a GPU or DSP section, in their local RAM
+	if ((siz == SIZL) && (orgaddr & 0x03)
+		&& ((rgpu && (orgaddr >= 0xF03000) && (orgaddr <= 0xF03FFFF))
+		|| (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF))))
+		warn("depositing LONGs on a non-long address in local RAM");
+
 	for(;; ++tok)
 	{
 		// dc.b 'string' [,] ...
 		if (siz == SIZB && *tok == STRING && (tok[2] == ',' || tok[2] == EOL))
 		{
-//			i = strlen((const char*)tok[1]);
 			i = strlen(string[tok[1]]);
 
 			if ((challoc - ch_size) < i) 
@@ -863,7 +952,10 @@ int d_dc(WORD siz)
 					return error("non-absolute byte value");
 
 				if (eval + 0x100 >= 0x200)
-					return error(range_error);
+				{
+					sprintf(buffer, "%s (value = $%X)", range_error, eval);
+					return error(buffer);
+				}
 
 				D_byte(eval);
 			}
@@ -930,6 +1022,8 @@ int d_dcb(WORD siz)
 	VALUE 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); }
+
 	if ((scattr & SBSS) != 0)
 		return error("illegal initialization of section");
 
@@ -1110,7 +1204,6 @@ int d_comm(void)
 	if (*tok != SYMBOL)
 		return error("missing symbol");
 
-//	p = (char *)tok[1];
 	p = string[tok[1]];
 	tok += 2;
 
@@ -1179,7 +1272,7 @@ int d_68000(void)
 
 
 //
-// .gpu - Switch to GPU Assembler
+// .gpu - Switch to GPU assembler
 //
 int d_gpu(void)
 {
@@ -1206,7 +1299,7 @@ int d_gpu(void)
 
 
 //
-// .dsp - Switch to DSP Assembler
+// .dsp - Switch to DSP assembler
 //
 int d_dsp(void)
 {
@@ -1269,18 +1362,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)
@@ -1292,8 +1377,7 @@ int d_cargs(void)
 				return errors("multiply-defined label '%s'", p);
 
 			// Put symbol in "order of definition" list
-			if (!(symbol->sattr & SDECLLIST))
-				AddToSymbolOrderList(symbol);
+			AddToSymbolDeclarationList(symbol);
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
 			symbol->svalue = eval;
@@ -1318,7 +1402,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)
@@ -1410,8 +1493,7 @@ int d_cstruct(void)
 				return errors("multiply-defined label '%s'", symbolName);
 
 			// Put symbol in "order of definition" list
-			if (!(symbol->sattr & SDECLLIST))
-				AddToSymbolOrderList(symbol);
+			AddToSymbolDeclarationList(symbol);
 
 			tok += 2;
 
@@ -1528,3 +1610,30 @@ int d_gpumain(void)
 	return error("What the hell? Do you think we adhere to the Goof standard?");
 }
 
+
+//
+// .opt - turn a specific (or all) optimisation on or off
+//
+int d_opt(void)
+{
+	while (*tok != EOL)
+	{
+		if (*tok == STRING)
+		{
+			tok++;
+			char * tmpstr = string[*tok++];
+
+			if (ParseOptimization(tmpstr) != OK)
+			{
+				char temperr[256];
+				sprintf(temperr, "unknown optimisation flag '%s'", tmpstr);
+				return error(temperr);
+			}
+		}
+		else
+			return error(".opt directive needs every switch enclosed inside quotation marks");
+	}
+
+	return OK;
+}
+