X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=155fa3fb360821bc945bb0e8e3a79ffd6fe973a9;hp=54c09d694118c1de435a8097956e0478cc08f34c;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=cfd001aea60f54e49d9beae0f941c513f45c202b

diff --git a/direct.c b/direct.c
index 54c09d6..155fa3f 100644
--- a/direct.c
+++ b/direct.c
@@ -20,10 +20,13 @@
 #include "sect.h"
 #include "symbol.h"
 #include "token.h"
+#include "math.h"
+#include "sect.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
@@ -213,7 +216,7 @@ int d_warn(char *str)
 //
 int d_org(void)
 {
-	uint32_t address;
+	uint64_t address;
 
 	if (!rgpu && !rdsp && !m6502)
 		return error(".org permitted only in gpu/dsp and 6502 sections");
@@ -266,7 +269,7 @@ int d_print(void)
 	int wordlong = 0;			// WORD = 0, LONG = 1
 	int outtype = 0;			// 0:hex, 1:decimal, 2:unsigned
 
-	uint32_t eval;					// Expression value
+	uint64_t eval;				// Expression value
 	WORD eattr;					// Expression attributes
 	SYM * esym;					// External symbol involved in expr.
 	TOKEN r_expr[EXPRSIZE];
@@ -687,7 +690,7 @@ int d_unimpl(void)
 //
 // Return absolute (not TDB) and defined expression or return an error
 //
-int abs_expr(uint32_t * a_eval)
+int abs_expr(uint64_t * a_eval)
 {
 	WORD eattr;
 
@@ -795,7 +798,7 @@ allright:
 int d_assert(void)
 {
 	WORD eattr;
-	uint32_t eval;
+	uint64_t eval;
 
 	for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok)
 	{
@@ -853,13 +856,13 @@ int d_globl(void)
 //
 int d_prgflags(void)
 {
-	uint32_t 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
@@ -874,7 +877,7 @@ int d_prgflags(void)
 //
 int d_abs(void)
 {
-	uint32_t eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -887,7 +890,7 @@ int d_abs(void)
 		return 0;
 
 	SwitchSection(ABS);
-	sloc = eval;
+	sloc = (uint32_t)eval;
 	return 0;
 }
 
@@ -953,7 +956,7 @@ int d_ds(WORD siz)
 {
 	DEBUG { printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc); }
 
-	uint32_t eval;
+	uint64_t eval;
 
 	if (cursect != M6502)
 	{
@@ -976,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;
@@ -996,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;
-	uint32_t eval;
+	uint64_t eval;
 	uint8_t * p;
 
 	if ((scattr & SBSS) != 0)
@@ -1112,6 +1115,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);
 
@@ -1134,6 +1138,77 @@ 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...)
+			D_quad(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
+			{
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+				double 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
+			{
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+				float vv = *(double *)&eval;
+				D_extend(vv);
+			}
+
 			break;
 		}
 
@@ -1152,7 +1227,7 @@ comma:
 //
 int d_dcb(WORD siz)
 {
-	uint32_t 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); }
@@ -1172,7 +1247,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;
 }
 
@@ -1189,8 +1264,8 @@ int d_dcb(WORD siz)
 //
 int d_init(WORD def_siz)
 {
-	uint32_t count;
-	uint32_t eval;
+	uint64_t count;
+	uint64_t eval;
 	WORD eattr;
 	WORD siz;
 
@@ -1205,7 +1280,7 @@ int d_init(WORD def_siz)
 		// Get repeat count (defaults to 1)
 		if (*tok == '#')
 		{
-			++tok;
+			tok++;
 
 			if (abs_expr(&count) != OK)
 				return 0;
@@ -1220,7 +1295,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;
@@ -1231,9 +1306,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;
@@ -1339,7 +1414,7 @@ int d_comm(void)
 {
 	SYM * sym;
 	char * p;
-	uint32_t eval;
+	uint64_t eval;
 
 	if (m6502)
 		return error(in_6502mode);
@@ -1369,7 +1444,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;
 }
@@ -1513,14 +1588,12 @@ 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
@@ -1566,7 +1639,7 @@ int d_dsp(void)
 //
 int d_cargs(void)
 {
-	uint32_t 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;
@@ -1611,7 +1684,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
@@ -1681,7 +1754,7 @@ int d_cargs(void)
 //
 int d_cstruct(void)
 {
-	uint32_t 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;
@@ -1738,7 +1811,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
@@ -1870,7 +1943,7 @@ int d_opt(void)
 int d_if(void)
 {
 	WORD eattr;
-	uint32_t eval;
+	uint64_t eval;
 	SYM * esym;
 	IFENT * rif = f_ifent;