Multiple fixes for 020+ mode, including:

[rmac] / eagen0.c

diff --git a/eagen0.c b/eagen0.c
index 5597eb0781c58bdf95fd7ebc067bb28f320fcc78..1bb00ba7c6a372798f81625dccf24251cfedb49c 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -1,8 +1,8 @@
 //
-// 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
 //
@@ -12,9 +12,9 @@ int eaNgen(WORD siz)
        VALUE 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
@@ -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:
@@ -269,7 +275,7 @@ int eaNgen(WORD siz)
                        // 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