X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=eagen0.c;h=e7f388512ab35d48c3d588f7fd5b08b551757132;hp=5597eb0781c58bdf95fd7ebc067bb28f320fcc78;hb=ada93ab0c3763d4a4ab607cbc73c24d74bc94ff4;hpb=5cd8a4814b805f1ef8ce689423eb5eeba12573c5

diff --git a/eagen0.c b/eagen0.c
index 5597eb0..e7f3885 100644
--- a/eagen0.c
+++ b/eagen0.c
@@ -1,20 +1,20 @@
 //
-// 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 vbd, v = aNexval;
+	uint32_t vbd, v = aNexval;
 	WORD wbd, w = (WORD)(aNexattr & DEFINED);
 	WORD tdbbd, tdb = (WORD)(aNexattr & TDB);
-    vbd = aNbdexval;
-    wbd = (WORD)(aNbdexattr & DEFINED);
-    tdbbd = (WORD)(aNbdexattr & TDB);
+	vbd = aNbdexval;
+	wbd = (WORD)(aNbdexattr & DEFINED);
+	tdbbd = (WORD)(aNbdexattr & TDB);
 
 	switch (amN)
 	{
@@ -38,7 +38,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 +86,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 +136,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);
 
@@ -216,9 +216,9 @@ int eaNgen(WORD siz)
 
 		break;
     case SIZP:
-            // 68881/68882/68040 only
-            return error("Sorry, .p constant format is not implemented yet!");
-            break;
+		// 68881/68882/68040 only
+		return error("Sorry, .p constant format is not implemented yet!");
+		break;
 	case ABSW:
 		if (w) // Defined
 		{
@@ -251,6 +251,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:
@@ -260,16 +266,16 @@ 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)
 			{
-				// Just deposit it 
+				// Just deposit it
 				if (tdb)
 					MarkRelocatable(cursect, sloc, tdbbd, MWORD, NULL);
 
@@ -280,8 +286,8 @@ int eaNgen(WORD siz)
 			}
 			else
 			{
-				// Arrange for fixup later on 
-				AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr);
+				// Arrange for fixup later on
+				AddFixup(FU_WORD|FU_SEXT, sloc, aNbexpr);
 				D_word(0);
 			}
 		}
@@ -290,7 +296,7 @@ int eaNgen(WORD siz)
 			// Deposit long bd
 			if (wbd)
 			{
-				// Just deposit it 
+				// Just deposit it
 				if (tdbbd)
 					MarkRelocatable(cursect, sloc, tdbbd, MLONG, NULL);
 
@@ -298,13 +304,13 @@ int eaNgen(WORD siz)
 			}
 			else
 			{
-				// Arrange for fixup later on 
-				AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr);
+				// 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 
+		if ((aNexten&7)==EXT_IISPRE0 || (aNexten&7)==EXT_IISPREN
 			|| (aNexten&7)==EXT_IISNOIN || (aNexten&7)==EXT_IISPOSN)
 		{
 			// Don't deposit anything (suppressed)
@@ -315,7 +321,7 @@ int eaNgen(WORD siz)
 			// Deposit word od
 			if (w)
 			{
-				// Just deposit it 
+				// Just deposit it
 				if (tdb)
 					MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
 
@@ -326,7 +332,7 @@ int eaNgen(WORD siz)
 			}
 			else
 			{
-				// Arrange for fixup later on 
+				// Arrange for fixup later on
 				AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr);
 				D_word(0);
 			}
@@ -336,7 +342,7 @@ int eaNgen(WORD siz)
 			// Deposit long od
 			if (w)
 			{
-				// Just deposit it 
+				// Just deposit it
 				if (tdb)
 					MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
 
@@ -344,7 +350,7 @@ int eaNgen(WORD siz)
 			}
 			else
 			{
-				// Arrange for fixup later on 
+				// Arrange for fixup later on
 				AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr);
 				D_long(0);
 			}
@@ -369,6 +375,7 @@ int eaNgen(WORD siz)
 #undef aNixreg
 #undef aNixsiz
 #undef aNexten
+#undef aNbexpr
 #undef aNbdexval
 #undef aNbdexattr
 #undef AnESYM