X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=54c09d694118c1de435a8097956e0478cc08f34c;hp=7076358cf0db46c2fa2384a0791b0761391b22ce;hb=d1f5f1caccb26da6a3da7fc00b94b79000a55302;hpb=5cd8a4814b805f1ef8ce689423eb5eeba12573c5

diff --git a/direct.c b/direct.c
index 7076358..54c09d6 100644
--- a/direct.c
+++ b/direct.c
@@ -1,13 +1,14 @@
 //
-// 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
 //
 
 #include "direct.h"
 #include "6502.h"
+#include "amode.h"
 #include "error.h"
 #include "expr.h"
 #include "listing.h"
@@ -27,10 +28,20 @@ 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_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);
@@ -67,6 +78,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[])() = {
@@ -140,6 +152,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
 //
@@ -155,7 +181,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");
 		}
 	}
 }
@@ -187,7 +213,7 @@ int d_warn(char *str)
 //
 int d_org(void)
 {
-	VALUE address;
+	uint32_t address;
 
 	if (!rgpu && !rdsp && !m6502)
 		return error(".org permitted only in gpu/dsp and 6502 sections");
@@ -240,7 +266,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
+	uint32_t eval;					// Expression value
 	WORD eattr;					// Expression attributes
 	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];
@@ -418,14 +444,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;
 	}
 
@@ -454,7 +479,7 @@ int d_incbin(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", string[tok[1]]);
+		return error("cannot open: \"%s\"", string[tok[1]]);
 	}
 
 allright:
@@ -470,8 +495,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;
 	}
 
@@ -569,6 +593,7 @@ int d_long(void)
 	unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
 	unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(4);
 
 	return 0;
 }
@@ -591,6 +616,7 @@ int d_phrase(void)
 	unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
 	unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(8);
 
 	return 0;
 }
@@ -604,6 +630,7 @@ int d_dphrase(void)
 	unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
 	unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(16);
 
 	return 0;
 }
@@ -617,6 +644,7 @@ int d_qphrase(void)
 	unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
 	unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(32);
 
 	return 0;
 }
@@ -659,7 +687,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(uint32_t * a_eval)
 {
 	WORD eattr;
 
@@ -731,7 +759,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
@@ -752,7 +780,7 @@ int d_include(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", fn);
+		return error("cannot open: \"%s\"", fn);
 	}
 
 allright:
@@ -767,7 +795,7 @@ allright:
 int d_assert(void)
 {
 	WORD eattr;
-	VALUE eval;
+	uint32_t eval;
 
 	for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
 	{
@@ -825,7 +853,7 @@ int d_globl(void)
 //
 int d_prgflags(void)
 {
-	VALUE eval;
+	uint32_t eval;
 
 	if (*tok == EOL)
 		return error("PRGFLAGS requires value");
@@ -846,7 +874,7 @@ int d_prgflags(void)
 //
 int d_abs(void)
 {
-	VALUE eval;
+	uint32_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -925,7 +953,7 @@ int d_ds(WORD siz)
 {
 	DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
-	VALUE eval;
+	uint32_t eval;
 
 	if (cursect != M6502)
 	{
@@ -938,7 +966,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");
@@ -959,7 +987,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();
@@ -973,7 +1001,7 @@ int d_ds(WORD siz)
 int d_dc(WORD siz)
 {
 	WORD eattr;
-	VALUE eval;
+	uint32_t eval;
 	uint8_t * p;
 
 	if ((scattr & SBSS) != 0)
@@ -1054,10 +1082,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);
 			}
@@ -1127,7 +1152,7 @@ comma:
 //
 int d_dcb(WORD siz)
 {
-	VALUE evalc, eval;
+	uint32_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); }
@@ -1164,8 +1189,8 @@ int d_dcb(WORD siz)
 //
 int d_init(WORD def_siz)
 {
-	VALUE count;
-	VALUE eval;
+	uint32_t count;
+	uint32_t eval;
 	WORD eattr;
 	WORD siz;
 
@@ -1225,7 +1250,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;
@@ -1314,7 +1339,7 @@ int d_comm(void)
 {
 	SYM * sym;
 	char * p;
-	VALUE eval;
+	uint32_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -1385,81 +1410,89 @@ int d_68000(void)
 	orgwarning = 0;
 	SaveSection();
 	SwitchSection(TEXT);
-	activecpu=CPU_68000;
+	activecpu = CPU_68000;
 	return 0;
 }
 
+
 //
 // .68020 - Back to 68000 TEXT segment and select 68020
 //
 int d_68020(void)
 {
 	d_68000();
-	activecpu=CPU_68020;
+	activecpu = CPU_68020;
 	return 0;
 }
 
+
 //
 // .68030 - Back to 68000 TEXT segment and select 68030
 //
 int d_68030(void)
 {
 	d_68000();
-	activecpu=CPU_68030;
+	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;
+	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_68040;
+	activecpu = CPU_68060;
+	activefpu = FPU_68040;
 	return 0;
 }
 
+
 //
 // .68881 - Back to 68000 TEXT segment and select 68881 FPU
 //
 int d_68881(void)
 {
 	d_68000();
-	activefpu=FPU_68881;
+	activefpu = FPU_68881;
 	return 0;
 }
 
+
 //
 // .68882 - Back to 68000 TEXT segment and select 68882 FPU
 //
 int d_68882(void)
 {
 	d_68000();
-	activefpu=FPU_68881;
+	activefpu = FPU_68881;
 	return 0;
 }
 
+
 //
 // nofpu - Deselect FPUs.
 //
 int d_nofpu(void)
 {
-	activefpu=FPU_NONE;
+	activefpu = FPU_NONE;
 	return 0;
 }
 
+
 //
 // DSP56001
 //
@@ -1468,6 +1501,7 @@ int d_56001(void)
 	return error("Not yet, child. Be patient.");
 }
 
+
 //
 // .gpu - Switch to GPU assembler
 //
@@ -1532,7 +1566,7 @@ int d_dsp(void)
 //
 int d_cargs(void)
 {
-	VALUE eval = 4;		// Default to 4 if no offset specified (to account for
+	uint32_t eval = 4;		// Default to 4 if no offset specified (to account for
 						// return address)
 	WORD rlist;
 	SYM * symbol;
@@ -1571,7 +1605,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);
@@ -1647,7 +1681,7 @@ int d_cargs(void)
 //
 int d_cstruct(void)
 {
-	VALUE eval = 0;		// Default, if no offset specified, is zero
+	uint32_t eval = 0;		// Default, if no offset specified, is zero
 	WORD rlist;
 	SYM * symbol;
 	char * symbolName;
@@ -1687,7 +1721,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);
@@ -1820,11 +1854,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");
@@ -1833,3 +1863,78 @@ int d_opt(void)
 	return OK;
 }
 
+
+//
+// .if, Start conditional assembly
+//
+int d_if(void)
+{
+	WORD eattr;
+	uint32_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;
+}
+