X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=2511473fb5c89953decbe40a3579943dfb84f8c0;hp=5714def294d89aa5dc21f9e3adb1c9d8ce7be97e;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=96a5cd69571096f11a3a2a40f6133374f0adc9bb

diff --git a/direct.c b/direct.c
index 5714def..2511473 100644
--- a/direct.c
+++ b/direct.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // DIRECT.C - Directive Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -11,6 +11,7 @@
 #include "amode.h"
 #include "error.h"
 #include "expr.h"
+#include "fltpoint.h"
 #include "listing.h"
 #include "mach.h"
 #include "macro.h"
@@ -24,15 +25,16 @@
 #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
+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);
@@ -77,6 +79,8 @@ int d_cstruct(void);
 int d_prgflags(void);
 int d_opt(void);
 int d_dsp(void);
+int d_objproc(void);
+void SetLargestAlignment(int);
 
 // Directive handler table
 int (*dirtab[])() = {
@@ -146,10 +150,25 @@ int (*dirtab[])() = {
 	d_68882,			// 63 .68882
 	d_56001,			// 64 .56001
 	d_nofpu,			// 65 nofpu
-	d_opt,				// 58 .opt
+	d_opt,				// 66 .opt
+	d_objproc,			// 67 .objproc
 };
 
 
+//
+// 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
 //
@@ -197,10 +216,10 @@ 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");
+	if (!rgpu && !rdsp && !robjproc && !m6502)
+		return error(".org permitted only in GPU/DSP/OP and 6502 sections");
 
 	if (abs_expr(&address) == ERROR)
 	{
@@ -208,7 +227,7 @@ int d_org(void)
 		return ERROR;
 	}
 
-	if (rgpu | rdsp)
+	if (rgpu | rdsp | robjproc)
 	{
 		orgaddr = address;
 		orgactive = 1;
@@ -250,7 +269,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];
@@ -577,6 +596,7 @@ int d_long(void)
 	unsigned lower2Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x03;
 	unsigned bytesToSkip = (0x04 - lower2Bits) & 0x03;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(4);
 
 	return 0;
 }
@@ -599,6 +619,7 @@ int d_phrase(void)
 	unsigned lower3Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x07;
 	unsigned bytesToSkip = (0x08 - lower3Bits) & 0x07;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(8);
 
 	return 0;
 }
@@ -612,6 +633,7 @@ int d_dphrase(void)
 	unsigned lower4Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x0F;
 	unsigned bytesToSkip = (0x10 - lower4Bits) & 0x0F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(16);
 
 	return 0;
 }
@@ -625,6 +647,7 @@ int d_qphrase(void)
 	unsigned lower5Bits = (rgpu || rdsp ? orgaddr : sloc) & 0x1F;
 	unsigned bytesToSkip = (0x20 - lower5Bits) & 0x1F;
 	SkipBytes(bytesToSkip);
+	SetLargestAlignment(32);
 
 	return 0;
 }
@@ -667,7 +690,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;
 
@@ -775,7 +798,7 @@ allright:
 int d_assert(void)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 
 	for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
 	{
@@ -833,13 +856,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
@@ -854,7 +877,7 @@ int d_prgflags(void)
 //
 int d_abs(void)
 {
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -867,7 +890,7 @@ int d_abs(void)
 		return 0;
 
 	SwitchSection(ABS);
-	sloc = eval;
+	sloc = (uint32_t)eval;
 	return 0;
 }
 
@@ -933,7 +956,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)
 	{
@@ -946,7 +969,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");
@@ -956,9 +979,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;
@@ -967,7 +990,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();
@@ -976,12 +999,12 @@ int d_ds(WORD siz)
 
 
 //
-// dc.b, dc.w / dc, dc.l, dc.i
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d
 //
 int d_dc(WORD siz)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 	uint8_t * p;
 
 	if ((scattr & SBSS) != 0)
@@ -1045,9 +1068,6 @@ int d_dc(WORD siz)
 		uint16_t tdb = eattr & TDB;
 		uint16_t defined = eattr & DEFINED;
 
-		if ((challoc - ch_size) < 4)
-			chcheck(4);
-
 		switch (siz)
 		{
 		case SIZB:
@@ -1092,6 +1112,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);
 
@@ -1114,6 +1135,97 @@ int d_dc(WORD siz)
 
 				D_long(eval);
 			}
+
+			break;
+		case SIZQ:
+			// 64-bit size
+			if (m6502)
+				return error(in_6502mode);
+
+			// Shamus: We only handle DC.Q type stuff, will have to add fixups
+			//         and stuff later (maybe... might not be needed...)
+			// DEFINITELY NEED FIXUPS HERE!
+			if (!defined)
+			{
+				AddFixup(FU_QUAD, sloc, exprbuf);
+				D_quad(0LL);
+			}
+			else
+			{
+				D_quad(eval);
+			}
+
+			break;
+		case SIZS:
+			// 32-bit float size
+			if (m6502)
+				return error(in_6502mode);
+
+			if (!defined)
+			{
+				AddFixup(FU_FLOATSING, sloc, exprbuf);
+				D_long(0);
+			}
+			else
+			{
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+
+				PTR ptr;
+				ptr.u64 = &eval;
+				uint32_t ieee754 = FloatToIEEE754((float)*ptr.dp);
+				D_long(ieee754);
+			}
+
+			break;
+		case SIZD:
+			// 64-bit double size
+			if (m6502)
+				return error(in_6502mode);
+
+			if (!defined)
+			{
+				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
+				D_quad(0LL);
+			}
+			else
+			{
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+				PTR ptr;
+				ptr.u64 = &eval;
+				uint64_t ieee754 = DoubleToIEEE754(*ptr.dp);
+				D_quad(ieee754);
+			}
+
+			break;
+		case SIZX:
+			if (m6502)
+				return error(in_6502mode);
+
+			uint8_t extDbl[12];
+			memset(extDbl, 0, 12);
+
+			if (!defined)
+			{
+				AddFixup(FU_FLOATEXT, sloc, exprbuf);
+				D_extend(extDbl);
+			}
+			else
+			{
+//Would this *ever* happen?
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+				PTR ptr;
+				ptr.u64 = &eval;
+				DoubleToExtended(*ptr.dp, extDbl);
+				D_extend(extDbl);
+			}
+
 			break;
 		}
 
@@ -1132,7 +1244,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); }
@@ -1152,7 +1264,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;
 }
 
@@ -1169,8 +1281,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;
 
@@ -1185,7 +1297,7 @@ int d_init(WORD def_siz)
 		// Get repeat count (defaults to 1)
 		if (*tok == '#')
 		{
-			++tok;
+			tok++;
 
 			if (abs_expr(&count) != OK)
 				return 0;
@@ -1200,7 +1312,7 @@ int d_init(WORD def_siz)
 		if (expr(exprbuf, &eval, &eattr, NULL) < 0)
 			return 0;
 
-		switch ((int)*tok++)
+		switch (*tok++)
 		{                                 // Determine size of object to deposit
 		case DOTB: siz = SIZB; break;
 		case DOTW: siz = SIZB; break;
@@ -1211,9 +1323,9 @@ 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)
+		switch (*tok)
 		{
 		case EOL:
 			return 0;
@@ -1230,7 +1342,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;
@@ -1319,7 +1431,7 @@ int d_comm(void)
 {
 	SYM * sym;
 	char * p;
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -1330,7 +1442,7 @@ int d_comm(void)
 	p = string[tok[1]];
 	tok += 2;
 
-	if (*p == '.')							// Cannot .comm a local symbol
+	if (*p == '.')						// Cannot .comm a local symbol
 		return error(locgl_error);
 
 	if ((sym = lookup(p, LABEL, 0)) == NULL)
@@ -1346,10 +1458,10 @@ int d_comm(void)
 	if (*tok++ != ',')
 		return error(comma_error);
 
-	if (abs_expr(&eval) != OK)				// Parse size of common region
+	if (abs_expr(&eval) != OK)			// Parse size of common region
 		return 0;
 
-	sym->svalue = eval;						// Install common symbol's size
+	sym->svalue = eval;					// Install common symbol's size
 	at_eol();
 	return 0;
 }
@@ -1384,7 +1496,7 @@ int d_nlist(void)
 //
 int d_68000(void)
 {
-	rgpu = rdsp = 0;
+	rgpu = rdsp = robjproc = 0;
 	// Switching from gpu/dsp sections should reset any ORG'd Address
 	orgactive = 0;
 	orgwarning = 0;
@@ -1436,29 +1548,29 @@ int d_68060(void)
 {
 	d_68000();
 	activecpu = CPU_68060;
-	activefpu = FPU_68040;
+	activefpu = FPU_68060;
 	return 0;
 }
 
 
 //
-// .68881 - Back to 68000 TEXT segment and select 68881 FPU
+// .68881 - Back to 680x0 TEXT segment and select 68881 FPU
 //
 int d_68881(void)
 {
-	d_68000();
+	//d_68000();
 	activefpu = FPU_68881;
 	return 0;
 }
 
 
 //
-// .68882 - Back to 68000 TEXT segment and select 68882 FPU
+// .68882 - Back to 680x0 TEXT segment and select 68882 FPU
 //
 int d_68882(void)
 {
-	d_68000();
-	activefpu = FPU_68881;
+	//d_68000();
+	activefpu = FPU_68882;
 	return 0;
 }
 
@@ -1493,17 +1605,16 @@ int d_gpu(void)
 		return ERROR;
 	}
 
-	// If previous section was dsp or 68000 then we need to reset ORG'd Addresses
+	// 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
+	robjproc = 0;		// Unset OP assembly
 	regbank = BANK_N;	// Set no default register bank
 	return 0;
 }
@@ -1529,6 +1640,7 @@ int d_dsp(void)
 
 	rdsp = 1;			// Set DSP assembly
 	rgpu = 0;			// Unset GPU assembly
+	robjproc = 0;		// Unset OP assembly
 	regbank = BANK_N;	// Set no default register bank
 	return 0;
 }
@@ -1546,7 +1658,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;
@@ -1661,7 +1773,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;
@@ -1779,6 +1891,32 @@ int d_cstruct(void)
 }
 
 
+//
+// Define start of OP object list (allows the use of ORG)
+//
+int d_objproc(void)
+{
+	if ((cursect != TEXT) && (cursect != DATA))
+	{
+		error(".objproc can only be used in the TEXT or DATA segments");
+		return ERROR;
+	}
+
+	// If previous section was DSP or 68000 then we need to reset ORG'd
+	// Addresses
+	if (!robjproc)
+	{
+		orgactive = 0;
+		orgwarning = 0;
+	}
+
+	robjproc = 1;		// Set OP assembly
+	rgpu = 0;			// Unset GPU assembly
+	rdsp = 0;			// Unset DSP assembly
+	return OK;
+}
+
+
 //
 // Undefine a macro - .undefmac macname [, macname...]
 //
@@ -1843,3 +1981,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;
+}
+