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

diff --git a/direct.c b/direct.c
index 7c48035..9e39719 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"
@@ -20,12 +21,11 @@
 #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
@@ -35,7 +35,6 @@ 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);
@@ -998,15 +997,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;
 	uint64_t eval;
-	WORD tdb;
-	WORD defined;
-	uint64_t val64;
 	uint8_t * p;
 
 	if ((scattr & SBSS) != 0)
@@ -1061,26 +1057,14 @@ 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;
-        }
-
-		tdb = (WORD)(eattr & TDB);
-		defined = (WORD)(eattr & DEFINED);
+		uint16_t tdb = eattr & TDB;
+		uint16_t defined = eattr & DEFINED;
 
 		if ((challoc - ch_size) < 4)
 			chcheck(4);
@@ -1153,70 +1137,85 @@ 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:
+			// 32-bit float size
 			if (m6502)
 				return error(in_6502mode);
 
 			if (!defined)
 			{
-				float vv = 0;
 				AddFixup(FU_FLOATSING, sloc, exprbuf);
-
-				D_single(vv);
+				D_long(0);
 			}
 			else
 			{
 				if (tdb)
 					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
 
-				D_single(eval);
+				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)
 			{
-				double vv = 0;
 				AddFixup(FU_FLOATDOUB, sloc, exprbuf);
-
-				D_double(vv);
+				D_quad(0LL);
 			}
 			else
 			{
-				double vv;
 				if (tdb)
 					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
 
-				vv = *(double *)&eval;
-				D_double(vv);
+				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)
 			{
-				double vv = 0;
 				AddFixup(FU_FLOATEXT, sloc, exprbuf);
-
-				D_extend(vv);
+				D_extend(extDbl);
 			}
 			else
 			{
-				float vv;
 				if (tdb)
 					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
 
-				vv = *(double *)&eval;
-				D_extend(vv);
+				PTR ptr;
+				ptr.u64 = &eval;
+				DoubleToExtended(*ptr.dp, extDbl);
+				D_extend(extDbl);
 			}
+
 			break;
 		}
 
-
 comma:
 		if (*tok != ',')
 			break;
@@ -1285,7 +1284,7 @@ int d_init(WORD def_siz)
 		// Get repeat count (defaults to 1)
 		if (*tok == '#')
 		{
-			++tok;
+			tok++;
 
 			if (abs_expr(&count) != OK)
 				return 0;
@@ -1300,7 +1299,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;
@@ -1313,7 +1312,7 @@ int d_init(WORD def_siz)
 
 		dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf);
 
-		switch ((int)*tok)
+		switch (*tok)
 		{
 		case EOL:
 			return 0;
@@ -1430,7 +1429,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)
@@ -1446,10 +1445,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 = (uint32_t)eval;			// Install common symbol's size
+	sym->svalue = eval;					// Install common symbol's size
 	at_eol();
 	return 0;
 }
@@ -1536,29 +1535,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;
 }
 
@@ -1593,14 +1592,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
@@ -1691,7 +1688,7 @@ int d_cargs(void)
 			AddToSymbolDeclarationList(symbol);
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
-			symbol->svalue = (uint32_t)eval;
+			symbol->svalue = eval;
 			tok += 2;
 
 			// What this does is eat any dot suffixes attached to a symbol. If
@@ -1818,7 +1815,7 @@ int d_cstruct(void)
 			}
 
 			symbol->sattr |= (ABS | DEFINED | EQUATED);
-			symbol->svalue = (uint32_t)eval;
+			symbol->svalue = eval;
 
 			// Check for dot suffixes and adjust space accordingly (longs and
 			// words on an odd boundary get bumped to the next word aligned