X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=c9a82d938714730471728f4868820e47ace156c0;hp=e9eb8ac3aa6b8dde78fffae0ddc943893a59f64c;hb=05d0350b35a6a6b255cb2a3fab7796f5d4ee4d02;hpb=0d4ab16ff12046dfaf5f51dc0add2a9bbe777573

diff --git a/direct.c b/direct.c
index e9eb8ac..c9a82d9 100644
--- a/direct.c
+++ b/direct.c
@@ -1,38 +1,88 @@
 //
-// 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 "sect.h"
-#include "riscasm.h"
+#include "6502.h"
+#include "amode.h"
 #include "error.h"
-#include "token.h"
-#include "procln.h"
 #include "expr.h"
-#include "mach.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
 
+// 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);
+int d_abs(void);
+int d_comm(void);
+int d_dc(WORD);
+int d_ds(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);
 
 // Directive handler table
 int (*dirtab[])() = {
 	d_org,				// 0 org
 	d_even,				// 1 even
-	d_unimpl,			// 2 .6502
+	d_6502,				// 2 .6502
 	d_68000,			// 3 .68000
 	d_bss,				// 4 bss
 	d_data,				// 5 data
@@ -88,6 +138,14 @@ int (*dirtab[])() = {
 	d_nojpad,			// 55 .nojpad (deprecated)
 	d_gpumain,			// 56 .gpumain (deprecated)
 	d_prgflags,			// 57 .prgflags
+	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,				// 58 .opt
 };
 
@@ -107,7 +165,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");
 		}
 	}
 }
@@ -141,10 +199,8 @@ int d_org(void)
 {
 	VALUE address;
 
-	if (!rgpu && !rdsp)
-		return error(".org permitted only in gpu/dsp section");
-
-	orgaddr = 0;
+	if (!rgpu && !rdsp && !m6502)
+		return error(".org permitted only in gpu/dsp and 6502 sections");
 
 	if (abs_expr(&address) == ERROR)
 	{
@@ -152,9 +208,32 @@ int d_org(void)
 		return ERROR;
 	}
 
-	orgaddr = address;
-	orgactive = 1;
-//printf("ORG: address = $%08X...\n", orgaddr);
+	if (rgpu | rdsp)
+	{
+		orgaddr = address;
+		orgactive = 1;
+	}
+	else
+	{
+		// 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;
+		at_eol();
+	}
 
 	return 0;
 }
@@ -349,14 +428,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;
 	}
 
@@ -385,7 +463,7 @@ int d_incbin(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", string[tok[1]]);
+		return error("cannot open: \"%s\"", string[tok[1]]);
 	}
 
 allright:
@@ -401,8 +479,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;
 	}
 
@@ -467,6 +544,9 @@ static inline void SkipBytes(unsigned bytesToSkip)
 //
 int d_even(void)
 {
+	if (m6502)
+		return error(in_6502mode);
+
 	unsigned skip = (rgpu || rdsp ? orgaddr : sloc) & 0x01;
 
 	if (skip)
@@ -562,13 +642,16 @@ int d_qphrase(void)
 //
 void auto_even(void)
 {
-	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++;
+	}
 }
 
 
@@ -656,7 +739,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
@@ -677,7 +760,7 @@ int d_include(void)
 				goto allright;
 		}
 
-		return errors("cannot open: \"%s\"", fn);
+		return error("cannot open: \"%s\"", fn);
 	}
 
 allright:
@@ -737,6 +820,9 @@ int globl1(char * p)
 
 int d_globl(void)
 {
+	if (m6502)
+		return error(in_6502mode);
+
 	symlist(globl1);
 	return 0;
 }
@@ -770,6 +856,9 @@ int d_abs(void)
 {
 	VALUE eval;
 
+	if (m6502)
+		return error(in_6502mode);
+
 	SaveSection();
 
 	if (*tok == EOL)
@@ -790,6 +879,8 @@ int d_text(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != TEXT)
 	{
@@ -805,6 +896,8 @@ int d_data(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != DATA)
 	{
@@ -820,6 +913,8 @@ int d_bss(void)
 {
 	if (rgpu || rdsp)
 		return error("directive forbidden in gpu/dsp mode");
+	else if (m6502)
+		return error(in_6502mode);
 
 	if (cursect != BSS)
 	{
@@ -840,25 +935,34 @@ int d_ds(WORD siz)
 
 	VALUE eval;
 
-	if ((siz != SIZB) && (sloc & 1))	// Automatic .even
-		auto_even();
+	if (cursect != M6502)
+	{
+		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)
+	// N.B.: Since VALUE 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");
 
 	// 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) || cursect == M6502)
 	{
 		listvalue(eval);
 		eval *= siz;
 		sloc += eval;
+
+		if (cursect == M6502)
+			chptr += eval;
+
 		just_bss = 1;					// No data deposited (8-bit CPU mode)
 	}
 	else
@@ -884,7 +988,7 @@ int d_dc(WORD siz)
 		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))
+	if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
 		auto_even();
 
 	// Check to see if we're trying to set LONGS on a non 32-bit aligned
@@ -897,15 +1001,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;
@@ -942,15 +1058,12 @@ 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);
 			}
 
@@ -971,11 +1084,17 @@ int d_dc(WORD siz)
 					MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
 
 				// Deposit 68000 or 6502 (byte-reversed) word
-				D_word(eval);
+				if (cursect != M6502)
+					D_word(eval)
+				else
+					D_rword(eval)
 			}
 
 			break;
 		case SIZL:
+			if (m6502)
+				return error(in_6502mode);
+
 			if (!defined)
 			{
 				if (movei)
@@ -1030,7 +1149,7 @@ int d_dcb(WORD siz)
 	if (expr(exprbuf, &eval, &eattr, NULL) < 0)
 		return 0;
 
-	if ((siz != SIZB) && (sloc & 1))
+	if (cursect != M6502 && (siz != SIZB) && (sloc & 1))
 		auto_even();
 
 	dep_block(evalc, siz, eval, eattr, exprbuf);
@@ -1160,11 +1279,18 @@ int dep_block(VALUE count, WORD siz, VALUE eval, WORD eattr, TOKEN * exprbuf)
 					return error(range_error);
 
 				// Deposit 68000 or 6502 (byte-reversed) word
-				D_word(eval);
+				if (cursect != M6502)
+					D_word(eval)
+				else
+					D_rword(eval)
+
 			}
 
 			break;
 		case SIZL:
+			if (m6502)
+				return error(in_6502mode);
+
 			if (!defined)
 			{
 				AddFixup(FU_LONG, sloc, exprbuf);
@@ -1195,6 +1321,9 @@ int d_comm(void)
 	char * p;
 	VALUE eval;
 
+	if (m6502)
+		return error(in_6502mode);
+
 	if (*tok != SYMBOL)
 		return error("missing symbol");
 
@@ -1261,10 +1390,98 @@ int d_68000(void)
 	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_68040;
+	return 0;
+}
+
+
+//
+// .68881 - Back to 68000 TEXT segment and select 68881 FPU
+//
+int d_68881(void)
+{
+	d_68000();
+	activefpu = FPU_68881;
+	return 0;
+}
+
+
+//
+// .68882 - Back to 68000 TEXT segment and select 68882 FPU
+//
+int d_68882(void)
+{
+	d_68000();
+	activefpu = FPU_68881;
+	return 0;
+}
+
+
+//
+// nofpu - Deselect FPUs.
+//
+int d_nofpu(void)
+{
+	activefpu = FPU_NONE;
+	return 0;
+}
+
+
+//
+// DSP56001
+//
+int d_56001(void)
+{
+	return error("Not yet, child. Be patient.");
+}
+
+
 //
 // .gpu - Switch to GPU assembler
 //
@@ -1368,7 +1585,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);
@@ -1484,7 +1701,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);
@@ -1617,11 +1834,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");
@@ -1630,3 +1843,78 @@ int d_opt(void)
 	return OK;
 }
 
+
+//
+// .if, Start conditional assembly
+//
+int d_if(void)
+{
+	WORD eattr;
+	VALUE 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;
+}
+