X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=7c480357c4e801b9420dd1ea1ad4b873a211a454;hp=10189a65a3ec1d4c2d35e83c0e75a54eb0a37f97;hb=582df8950c285e1746d0c4a9e3ead6545c962dc8;hpb=5f23454f7155f0c77ea1bede3f9e60b39da99fa8

diff --git a/direct.c b/direct.c
index 10189a6..7c48035 100644
--- a/direct.c
+++ b/direct.c
@@ -1,7 +1,7 @@
 //
-// 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-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -20,6 +20,8 @@
 #include "sect.h"
 #include "symbol.h"
 #include "token.h"
+#include "math.h"
+#include "sect.h"
 
 #define DEF_KW
 #include "kwtab.h"
@@ -28,6 +30,7 @@ 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);
@@ -77,6 +80,7 @@ int d_cstruct(void);
 int d_prgflags(void);
 int d_opt(void);
 int d_dsp(void);
+void SetLargestAlignment(int);
 
 // Directive handler table
 int (*dirtab[])() = {
@@ -150,6 +154,20 @@ int (*dirtab[])() = {
 };
 
 
+//
+// 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
 //
@@ -165,7 +183,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");
 		}
 	}
 }
@@ -197,7 +215,7 @@ int d_warn(char *str)
 //
 int d_org(void)
 {
-	VALUE address;
+	uint64_t address;
 
 	if (!rgpu && !rdsp && !m6502)
 		return error(".org permitted only in gpu/dsp and 6502 sections");
@@ -250,7 +268,7 @@ 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];
@@ -428,14 +446,13 @@ 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;
 	}
 
@@ -464,7 +481,7 @@ int d_incbin(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", string[tok[1]]);
+		return error("cannot open: \"%s\"", string[tok[1]]);
 	}
 
 allright:
@@ -480,8 +497,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;
 	}
 
@@ -579,6 +595,7 @@ int d_long(void)
 	unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
 	unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(4);
 
 	return 0;
 }
@@ -601,6 +618,7 @@ int d_phrase(void)
 	unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
 	unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(8);
 
 	return 0;
 }
@@ -614,6 +632,7 @@ int d_dphrase(void)
 	unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
 	unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(16);
 
 	return 0;
 }
@@ -627,6 +646,7 @@ int d_qphrase(void)
 	unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
 	unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(32);
 
 	return 0;
 }
@@ -669,7 +689,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;
 
@@ -741,7 +761,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
@@ -762,7 +782,7 @@ int d_include(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", fn);
+		return error("cannot open: \"%s\"", fn);
 	}
 
 allright:
@@ -777,7 +797,7 @@ allright:
 int d_assert(void)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 
 	for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
 	{
@@ -835,13 +855,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
@@ -856,7 +876,7 @@ int d_prgflags(void)
 //
 int d_abs(void)
 {
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -869,7 +889,7 @@ int d_abs(void)
 		return 0;
 
 	SwitchSection(ABS);
-	sloc = eval;
+	sloc = (uint32_t)eval;
 	return 0;
 }
 
@@ -935,7 +955,7 @@ int d_ds(WORD siz)
 {
 	DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
-	VALUE eval;
+	uint64_t eval;
 
 	if (cursect != M6502)
 	{
@@ -948,7 +968,7 @@ int d_ds(WORD siz)
 
 	// 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 VALUE is of type uint32_t, if it goes negative, it will have
+	// 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");
@@ -958,9 +978,9 @@ int d_ds(WORD siz)
 	// of zeroed memory....
 	if ((scattr & SBSS) || cursect == M6502)
 	{
-		listvalue(eval);
+		listvalue((uint32_t)eval);
 		eval *= siz;
-		sloc += eval;
+		sloc += (uint32_t)eval;
 
 		if (cursect == M6502)
 			chptr += eval;
@@ -969,7 +989,7 @@ int d_ds(WORD siz)
 	}
 	else
 	{
-		dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL);
+		dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL);
 	}
 
 	at_eol();
@@ -983,7 +1003,10 @@ int d_ds(WORD siz)
 int d_dc(WORD siz)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
+	WORD tdb;
+	WORD defined;
+	uint64_t val64;
 	uint8_t * p;
 
 	if ((scattr & SBSS) != 0)
@@ -1038,14 +1061,26 @@ int d_dc(WORD siz)
 			siz = SIZL;
 		}
 
+		if (siz != SIZQ)
+		{
 		// dc.x <expression>
 		SYM * esym = 0;
 
 		if (expr(exprbuf, &eval, &eattr, &esym) != OK)
 			return 0;
+		}
+		else
+		{
+			val64 = *(uint64_t *)(tok);
+			tok = tok + 2;
+			D_long((uint32_t)(val64 >> 32));
+			D_long((uint32_t)val64);
 
-		uint16_t tdb = eattr & TDB;
-		uint16_t defined = eattr & DEFINED;
+            goto comma;
+        }
+
+		tdb = (WORD)(eattr & TDB);
+		defined = (WORD)(eattr & DEFINED);
 
 		if ((challoc - ch_size) < 4)
 			chcheck(4);
@@ -1064,10 +1099,7 @@ int d_dc(WORD siz)
 					return error("non-absolute byte value");
 
 				if (eval + 0x100 >= 0x200)
-				{
-					sprintf(buffer, "%s (value = $%X)", range_error, eval);
-					return error(buffer);
-				}
+					return error("%s (value = $%X)", range_error, eval);
 
 				D_byte(eval);
 			}
@@ -1097,6 +1129,7 @@ int d_dc(WORD siz)
 
 			break;
 		case SIZL:
+			// Shamus: Why can't we do longs in 6502 mode?
 			if (m6502)
 				return error(in_6502mode);
 
@@ -1120,8 +1153,70 @@ int d_dc(WORD siz)
 				D_long(eval);
 			}
 			break;
+		case SIZS:
+			if (m6502)
+				return error(in_6502mode);
+
+			if (!defined)
+			{
+				float vv = 0;
+				AddFixup(FU_FLOATSING, sloc, exprbuf);
+
+				D_single(vv);
+			}
+			else
+			{
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+
+				D_single(eval);
+			}
+			break;
+		case SIZD:
+			if (m6502)
+				return error(in_6502mode);
+
+			if (!defined)
+			{
+				double vv = 0;
+				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+
+				D_double(vv);
+			}
+			else
+			{
+				double vv;
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+				vv = *(double *)&eval;
+				D_double(vv);
+			}
+			break;
+		case SIZX:
+			if (m6502)
+				return error(in_6502mode);
+
+			if (!defined)
+			{
+				double vv = 0;
+				AddFixup(FU_FLOATEXT, sloc, exprbuf);
+
+				D_extend(vv);
+			}
+			else
+			{
+				float vv;
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+				vv = *(double *)&eval;
+				D_extend(vv);
+			}
+			break;
 		}
 
+
 comma:
 		if (*tok != ',')
 			break;
@@ -1137,7 +1232,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); }
@@ -1157,7 +1252,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;
 }
 
@@ -1174,8 +1269,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;
 
@@ -1216,7 +1311,7 @@ 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)
 		{
@@ -1235,7 +1330,7 @@ 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;
@@ -1324,7 +1419,7 @@ int d_comm(void)
 {
 	SYM * sym;
 	char * p;
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -1354,7 +1449,7 @@ int d_comm(void)
 	if (abs_expr(&eval) != OK)				// Parse size of common region
 		return 0;
 
-	sym->svalue = eval;						// Install common symbol's size
+	sym->svalue = (uint32_t)eval;			// Install common symbol's size
 	at_eol();
 	return 0;
 }
@@ -1551,7 +1646,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;
@@ -1590,13 +1685,13 @@ 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);
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
-			symbol->svalue = eval;
+			symbol->svalue = (uint32_t)eval;
 			tok += 2;
 
 			// What this does is eat any dot suffixes attached to a symbol. If
@@ -1666,7 +1761,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;
@@ -1706,7 +1801,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);
@@ -1723,7 +1818,7 @@ int d_cstruct(void)
 			}
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
-			symbol->svalue = eval;
+			symbol->svalue = (uint32_t)eval;
 
 			// Check for dot suffixes and adjust space accordingly (longs and
 			// words on an odd boundary get bumped to the next word aligned
@@ -1839,11 +1934,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");
@@ -1852,3 +1943,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;
+}
+