Multiple fixes for 020+ mode, including:

[rmac] / eagen0.c

diff --git a/eagen0.c b/eagen0.c
index 1c359b9d4d056108123165e8edfd846a3b699620..1bb00ba7c6a372798f81625dccf24251cfedb49c 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -1,17 +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 v = aNexval;
-       WORD w = (WORD)(aNexattr & DEFINED);
-       WORD tdb = (WORD)(aNexattr & TDB);
+       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);
 
        switch (amN)
        {
@@ -35,7 +38,7 @@ int eaNgen(WORD siz)
                        if (tdb)
                                MarkRelocatable(cursect, sloc, tdb, MWORD, NULL);
 
-                       if ((v == 0) && optim_flags[OPT_INDIRECT_DISP])
+                       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
@@ -211,6 +214,10 @@ int eaNgen(WORD siz)
                        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 +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:
@@ -251,7 +264,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 +374,9 @@ int eaNgen(WORD siz)
 #undef aNexpr
 #undef aNixreg
 #undef aNixsiz
+#undef aNexten
+#undef aNbexpr
+#undef aNbdexval
+#undef aNbdexattr
 #undef AnESYM