Multiple fixes for 020+ mode, including:

[rmac] / eagen0.c

diff --git a/eagen0.c b/eagen0.c
index 16215734d167d48b2adef7df9a8cbfb9f36b9f2a..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
 //
@@ -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
@@ -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:
@@ -281,7 +287,7 @@ int eaNgen(WORD siz)
                        else
                        {
                                // Arrange for fixup later on
-                               AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr);
+                               AddFixup(FU_WORD|FU_SEXT, sloc, aNbexpr);
                                D_word(0);
                        }
                }
@@ -299,7 +305,7 @@ int eaNgen(WORD siz)
                        else
                        {
                                // Arrange for fixup later on
-                               AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr);
+                               AddFixup(FU_LONG, sloc, aNbexpr);
                                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