X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=eagen0.c;h=11e648afe845707f43b7638231acbca9d91e5e60;hp=f01b989a7454812538d397cdca29881e0fa2545d;hb=bdbf34766f4d074a5933eb1326fe4ce03d249e10;hpb=da0013df9438aa14e478544307e925462d398cb3

diff --git a/eagen0.c b/eagen0.c
index f01b989..11e648a 100644
--- a/eagen0.c
+++ b/eagen0.c
@@ -2,19 +2,20 @@
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // EAGEN0.C - Effective Address Code Generation
 //            Generated Code for eaN (Included twice by "eagen.c")
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 
 int eaNgen(WORD siz)
 {
-	VALUE vbd, v = aNexval;
+	uint32_t vbd, v = (uint32_t)aNexval;
 	WORD wbd, w = (WORD)(aNexattr & DEFINED);
 	WORD tdbbd, tdb = (WORD)(aNexattr & TDB);
-	vbd = aNbdexval;
+	vbd = (uint32_t)aNbdexval;
 	wbd = (WORD)(aNbdexattr & DEFINED);
 	tdbbd = (WORD)(aNbdexattr & TDB);
+	uint8_t extDbl[12];
 
 	switch (amN)
 	{
@@ -38,7 +39,7 @@ int eaNgen(WORD siz)
 			if (tdb)
 				MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
 
-			if ((v == 0) && optim_flags[OPT_INDIRECT_DISP] && !movep)
+			if ((v == 0) && CHECK_OPTS(OPT_INDIRECT_DISP) && !movep)
 			{
 				// If expr is 0, size optimise the opcode. Generally the lower
 				// 6 bits of the opcode for expr(ax) are 101rrr where rrr=the
@@ -86,7 +87,7 @@ int eaNgen(WORD siz)
 		{
 			// Just deposit it
 			if ((aNexattr & TDB) == cursect)
-				v -= (VALUE)sloc;
+				v -= (uint32_t)sloc;
 			else if ((aNexattr & TDB) != ABS)
 				error(rel_error);
 
@@ -136,7 +137,7 @@ int eaNgen(WORD siz)
 		{
 			// Deposit a byte...
 			if ((aNexattr & TDB) == cursect)
-				v -= (VALUE)sloc;
+				v -= (uint32_t)sloc;
 			else if ((aNexattr & TDB) != ABS)
 				error(rel_error);
 
@@ -166,7 +167,7 @@ int eaNgen(WORD siz)
 				if (v + 0x100 >= 0x200)
 					return error(range_error);
 
-				D_word(v);
+				D_word(v & 0xFF);
 			}
 			else
 			{
@@ -208,6 +209,73 @@ int eaNgen(WORD siz)
 				D_long(0);
 			}
 
+			break;
+		case SIZS:
+			// 68881/68882/68040 only
+			if (w)
+			{
+//Would a floating point value *ever* need to be fixed up as if it were an address? :-P
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
+
+				// The value passed back from expr() is an internal C double;
+				// so we have to access it as such then convert it to an
+				// IEEE-754 float so we can store it as such in the instruction
+				// stream here.
+				PTR p;
+				p.u64 = &aNexval;
+				float f = (float)*p.dp;
+				uint32_t ieee754 = FloatToIEEE754(f);
+				D_long(ieee754);
+			}
+			else
+			{
+				AddFixup(FU_FLOATSING, sloc, aNexpr);
+				D_long(0);	// IEEE-754 zero is all zeroes
+			}
+
+    		break;
+		case SIZD:
+			// 68881/68882/68040 only
+			if (w)
+			{
+//Would a floating point value *ever* need to be fixed up as if it were an address? :-P
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
+
+				PTR p;
+				p.u64 = &aNexval;
+				double d = *p.dp;
+				uint64_t ieee754 = DoubleToIEEE754(d);
+				D_quad(ieee754);
+			}
+			else
+			{
+				AddFixup(FU_FLOATDOUB, sloc, aNexpr);
+				D_quad(0LL);	// IEEE-754 zero is all zeroes
+			}
+
+			break;
+		case SIZX:
+			// 68881/68882/68040 only
+			if (w)
+			{
+//Would a floating point value *ever* need to be fixed up as if it were an address? :-P
+//				if (tdb)
+//					MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+				PTR p;
+				p.u64 = &aNexval;
+				DoubleToExtended(*p.dp, extDbl);
+				D_extend(extDbl);
+			}
+			else
+			{
+				AddFixup(FU_FLOATDOUB, sloc, aNexpr);
+				memset(extDbl, 0, 12);
+				D_extend(extDbl);
+			}
+
 			break;
 		default:
 			// IMMED size problem
@@ -253,10 +321,10 @@ int eaNgen(WORD siz)
 
 		break;
 	case DINDW:
-		D_word(0x190|(aNixreg<<12));
+		D_word((0x190 | (aNixreg << 12)));
 		break;
 	case DINDL:
-		D_word(0x990|(aNixreg<<12));
+		D_word((0x990 | (aNixreg << 12)));
 		break;
 	case ABASE:
 	case MEMPOST:
@@ -266,11 +334,11 @@ int eaNgen(WORD siz)
 	case PCMPRE:
 		D_word(aNexten);
 		// Deposit bd (if not suppressed)
-		if ((aNexten&0x0030)==EXT_BDSIZE0)
+		if ((aNexten & 0x0030) == EXT_BDSIZE0)
 		{
 			// Don't deposit anything (suppressed)
 		}
-		else if ((aNexten&0x0030)==EXT_BDSIZEW)
+		else if ((aNexten & 0x0030) == EXT_BDSIZEW)
 		{
 			// Deposit word bd
 			if (wbd)
@@ -287,7 +355,7 @@ int eaNgen(WORD siz)
 			else
 			{
 				// Arrange for fixup later on
-				AddFixup(FU_WORD|FU_SEXT, sloc, aNbexpr);
+				AddFixup(FU_WORD | FU_SEXT, sloc, aNbexpr);
 				D_word(0);
 			}
 		}
@@ -310,13 +378,13 @@ int eaNgen(WORD siz)
 			}
 		}
 		// Deposit od (if not suppressed)
-		if ((aNexten&7)==EXT_IISPRE0 || (aNexten&7)==EXT_IISPREN
-			|| (aNexten&7)==EXT_IISNOIN || (aNexten&7)==EXT_IISPOSN)
+		if ((aNexten & 7) == EXT_IISPRE0 || (aNexten & 7) == EXT_IISPREN
+			|| (aNexten & 7) == EXT_IISNOIN || (aNexten & 7) == EXT_IISPOSN)
 		{
 			// Don't deposit anything (suppressed)
 		}
-		else if ((aNexten&7)==EXT_IISPREW
-			|| (aNexten&7)==EXT_IISPOSW || (aNexten&7)==EXT_IISNOIW)
+		else if ((aNexten & 7) == EXT_IISPREW
+			|| (aNexten & 7) == EXT_IISPOSW || (aNexten & 7) == EXT_IISNOIW)
 		{
 			// Deposit word od
 			if (w)
@@ -333,7 +401,7 @@ int eaNgen(WORD siz)
 			else
 			{
 				// Arrange for fixup later on
-				AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr);
+				AddFixup(FU_WORD | FU_SEXT, sloc, aNexpr);
 				D_word(0);
 			}
 		}
@@ -351,7 +419,7 @@ int eaNgen(WORD siz)
 			else
 			{
 				// Arrange for fixup later on
-				AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr);
+				AddFixup(FU_LONG | FU_SEXT, sloc, aNexpr);
 				D_long(0);
 			}
 		}