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

diff --git a/direct.c b/direct.c
index c9a82d9..7c48035 100644
--- a/direct.c
+++ b/direct.c
@@ -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
 //
@@ -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];
@@ -577,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;
 }
@@ -599,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;
 }
@@ -612,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;
 }
@@ -625,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;
 }
@@ -667,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;
 
@@ -775,7 +797,7 @@ allright:
 int d_assert(void)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 
 	for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
 	{
@@ -833,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
@@ -854,7 +876,7 @@ int d_prgflags(void)
 //
 int d_abs(void)
 {
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -867,7 +889,7 @@ int d_abs(void)
 		return 0;
 
 	SwitchSection(ABS);
-	sloc = eval;
+	sloc = (uint32_t)eval;
 	return 0;
 }
 
@@ -933,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)
 	{
@@ -946,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");
@@ -956,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;
@@ -967,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();
@@ -981,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)
@@ -1036,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);
+
+            goto comma;
+        }
 
-		uint16_t tdb = eattr & TDB;
-		uint16_t defined = eattr & DEFINED;
+		tdb = (WORD)(eattr & TDB);
+		defined = (WORD)(eattr & DEFINED);
 
 		if ((challoc - ch_size) < 4)
 			chcheck(4);
@@ -1092,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);
 
@@ -1115,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;
@@ -1132,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); }
@@ -1152,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;
 }
 
@@ -1169,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;
 
@@ -1211,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)
 		{
@@ -1230,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;
@@ -1319,7 +1419,7 @@ int d_comm(void)
 {
 	SYM * sym;
 	char * p;
-	VALUE eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -1349,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;
 }
@@ -1546,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;
@@ -1591,7 +1691,7 @@ int d_cargs(void)
 			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
@@ -1661,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;
@@ -1718,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
@@ -1850,7 +1950,7 @@ int d_opt(void)
 int d_if(void)
 {
 	WORD eattr;
-	VALUE eval;
+	uint64_t eval;
 	SYM * esym;
 	IFENT * rif = f_ifent;