]> Shamusworld >> Repos - rmac/blobdiff - eagen0.c
Fix a small buglet in the last patch. :-)
[rmac] / eagen0.c
index a9b6f7ee496a181cb43384eae8c7af2835b6dc09..2df5eceea09d11eb470232e8796d48c950bca594 100644 (file)
--- 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-2020 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;
+       uint32_t v = (uint32_t)aNexval;
        WORD w = (WORD)(aNexattr & DEFINED);
        WORD tdb = (WORD)(aNexattr & TDB);
+       uint32_t vbd = (uint32_t)aNbdexval;
+       WORD wbd = (WORD)(aNbdexattr & DEFINED);
+       WORD tdbbd = (WORD)(aNbdexattr & TDB);
+       uint8_t extDbl[12];
 
        switch (amN)
        {
@@ -27,6 +31,7 @@ int eaNgen(WORD siz)
        case AM_NONE:
                // This is a performance hit, though
                break;
+
        case ADISP:
                // expr(An)
                if (w)
@@ -35,7 +40,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
@@ -78,12 +83,13 @@ int eaNgen(WORD siz)
                }
 
                break;
+
        case PCDISP:
                if (w)
                {
                        // Just deposit it
                        if ((aNexattr & TDB) == cursect)
-                               v -= (VALUE)sloc;
+                               v -= (uint32_t)sloc;
                        else if ((aNexattr & TDB) != ABS)
                                error(rel_error);
 
@@ -100,6 +106,7 @@ int eaNgen(WORD siz)
                }
 
                break;
+
        case AINDEXED:
                // Compute ixreg and size+scale
                w = (WORD)((aNixreg << 12) | aNixsiz);
@@ -125,6 +132,7 @@ int eaNgen(WORD siz)
                }
 
                break;
+
        case PCINDEXED:
                // Compute ixreg and size+scale
                w = (WORD)((aNixreg << 12) | aNixsiz);
@@ -133,7 +141,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);
 
@@ -151,6 +159,7 @@ int eaNgen(WORD siz)
                }
 
                break;
+
        case IMMED:
                switch (siz)
                {
@@ -163,7 +172,7 @@ int eaNgen(WORD siz)
                                if (v + 0x100 >= 0x200)
                                        return error(range_error);
 
-                               D_word(v);
+                               D_word(v & 0xFF);
                        }
                        else
                        {
@@ -172,6 +181,7 @@ int eaNgen(WORD siz)
                        }
 
                        break;
+
                case SIZW:
                case SIZN:
                        if (w)
@@ -191,6 +201,7 @@ int eaNgen(WORD siz)
                        }
 
                        break;
+
                case SIZL:
                        if (w)
                        {
@@ -206,12 +217,93 @@ int eaNgen(WORD siz)
                        }
 
                        break;
+
+               case SIZS:
+                       // 68881/68882/68040 only
+                       if (w)
+                       {
+//Would a floating point value *ever* need to be fixed up as if it were an address? :-P
+//                             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)
+                       {
+//Would a floating point value *ever* need to be fixed up as if it were an address? :-P
+//                             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)
+                       {
+//Would a floating point value *ever* need to be fixed up as if it were an address? :-P
+//                             if (tdb)
+//                                     MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+                               PTR p;
+                               p.u64 = &aNexval;
+                               DoubleToExtended(*p.dp, extDbl);
+                               D_extend(extDbl);
+                       }
+                       else
+                       {
+                               // Why would this be anything other than a floating point
+                               // expression???  Even if there were an undefined symbol in
+                               // the expression, how would that be relevant?  I can't see
+                               // any use case where this would make sense.
+                               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
                {
@@ -230,9 +322,14 @@ int eaNgen(WORD siz)
                }
 
                break;
+
        case ABSL:
                if (w) // Defined
                {
+                       if (optim_pc)
+                               if (aNexattr&(DEFINED | REFERENCED | EQUATED) == DEFINED | REFERENCED)
+                                       return error("relocation not allowed");
+
                        if (tdb)
                                MarkRelocatable(cursect, sloc, tdb, MLONG, NULL);
 
@@ -245,13 +342,118 @@ int eaNgen(WORD siz)
                }
 
                break;
+
+       case DINDW:
+               D_word((0x190 | (aNixreg << 12)));
+               break;
+
+       case DINDL:
+               D_word((0x990 | (aNixreg << 12)));
+               break;
+
        case ABASE:
        case MEMPOST:
        case MEMPRE:
        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 | FU_PCRELX, 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 +470,9 @@ int eaNgen(WORD siz)
 #undef aNexpr
 #undef aNixreg
 #undef aNixsiz
+#undef aNexten
+#undef aNbexpr
+#undef aNbdexval
+#undef aNbdexattr
 #undef AnESYM