X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=eagen0.c;h=b4b58861a24425c57f695a4f824a1bcd46887d2a;hp=a9b6f7ee496a181cb43384eae8c7af2835b6dc09;hb=29b32d134bc12831a8ddd098bf9aeeda26dcfe7c;hpb=f33d7fdb41ccdda027c33c5358a3826bef83967b

diff --git a/eagen0.c b/eagen0.c
index a9b6f7e..b4b5886 100644
--- a/eagen0.c
+++ b/eagen0.c
@@ -1,17 +1,21 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// 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, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 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 v = aNexval;
-	WORD w = (WORD)(aNexattr & DEFINED);
-	WORD tdb = (WORD)(aNexattr & TDB);
+	uint32_t vbd, v = (uint32_t)aNexval;
+	WORD wbd, w = (WORD)(aNexattr & DEFINED);
+	WORD tdbbd, tdb = (WORD)(aNexattr & TDB);
+	vbd = (uint32_t)aNbdexval;
+	wbd = (WORD)(aNbdexattr & DEFINED);
+	tdbbd = (WORD)(aNbdexattr & TDB);
+	uint8_t extDbl[12];
 
 	switch (amN)
 	{
@@ -35,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
@@ -83,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);
 
@@ -133,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);
 
@@ -205,12 +209,80 @@ int eaNgen(WORD siz)
 				D_long(0);
 			}
 
+			break;
+		case SIZS:
+			// 68881/68882/68040 only
+			if (w)
+			{
+				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)
+			{
+				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)
+			{
+				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
 			interror(1);
 		}
 
+		break;
+    case SIZP:
+		// 68881/68882/68040 only
+		return error("Sorry, .p constant format is not implemented yet!");
 		break;
 	case ABSW:
 		if (w) // Defined
@@ -244,6 +316,12 @@ int eaNgen(WORD siz)
 			D_long(0);
 		}
 
+		break;
+	case DINDW:
+		D_word((0x190 | (aNixreg << 12)));
+		break;
+	case DINDL:
+		D_word((0x990 | (aNixreg << 12)));
 		break;
 	case ABASE:
 	case MEMPOST:
@@ -251,7 +329,100 @@ int eaNgen(WORD siz)
 	case PCBASE:
 	case PCMPOST:
 	case PCMPRE:
-		return error("unsupported 68020 addressing mode");
+		D_word(aNexten);
+		// Deposit bd (if not suppressed)
+		if ((aNexten & 0x0030) == EXT_BDSIZE0)
+		{
+			// Don't deposit anything (suppressed)
+		}
+		else if ((aNexten & 0x0030) == EXT_BDSIZEW)
+		{
+			// Deposit word bd
+			if (wbd)
+			{
+				// Just deposit it
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdbbd, MWORD, NULL);
+
+				if (vbd + 0x8000 >= 0x10000)
+					return error(range_error);
+
+				D_word(vbd);
+			}
+			else
+			{
+				// Arrange for fixup later on
+				AddFixup(FU_WORD | FU_SEXT, sloc, aNbexpr);
+				D_word(0);
+			}
+		}
+		else
+		{
+			// Deposit long bd
+			if (wbd)
+			{
+				// Just deposit it
+				if (tdbbd)
+					MarkRelocatable(cursect, sloc, tdbbd, MLONG, NULL);
+
+				D_long(vbd);
+			}
+			else
+			{
+				// Arrange for fixup later on
+				AddFixup(FU_LONG, sloc, aNbexpr);
+				D_long(0);
+			}
+		}
+		// Deposit od (if not suppressed)
+		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)
+		{
+			// Deposit word od
+			if (w)
+			{
+				// Just deposit it
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
+
+				if (v + 0x8000 >= 0x10000)
+					return error(range_error);
+
+				D_word(v);
+			}
+			else
+			{
+				// Arrange for fixup later on
+				AddFixup(FU_WORD | FU_SEXT, sloc, aNexpr);
+				D_word(0);
+			}
+		}
+		else
+		{
+			// Deposit long od
+			if (w)
+			{
+				// Just deposit it
+				if (tdb)
+					MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
+
+				D_long(v);
+			}
+			else
+			{
+				// Arrange for fixup later on
+				AddFixup(FU_LONG | FU_SEXT, sloc, aNexpr);
+				D_long(0);
+			}
+		}
+
+		break;
+		//return error("unsupported 68020 addressing mode");
 	default:
 		// Bad addressing mode in ea gen
 		interror(3);
@@ -268,5 +439,9 @@ int eaNgen(WORD siz)
 #undef aNexpr
 #undef aNixreg
 #undef aNixsiz
+#undef aNexten
+#undef aNbexpr
+#undef aNbdexval
+#undef aNbdexattr
 #undef AnESYM