Version bump for last patch; now at v1.13.4.

[rmac] / eagen0.c

diff --git a/eagen0.c b/eagen0.c
index 62e686c144859631a44d8f5026a84e9828d16300..5b3c4ab5b35df2e34043b50364407d6bc5fe01c2 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -2,7 +2,7 @@
 // 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, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -15,6 +15,7 @@ int eaNgen(WORD siz)
        vbd = (uint32_t)aNbdexval;
        wbd = (WORD)(aNbdexattr & DEFINED);
        tdbbd = (WORD)(aNbdexattr & TDB);
+       uint8_t extDbl[12];
 
        switch (amN)
        {
@@ -166,7 +167,7 @@ int eaNgen(WORD siz)
                                if (v + 0x100 >= 0x200)
                                        return error(range_error);
 
-                               D_word(v);
+                               D_word(v & 0xFF);
                        }
                        else
                        {
@@ -213,20 +214,24 @@ int eaNgen(WORD siz)
                        // 68881/68882/68040 only
                        if (w)
                        {
-                               float vv;
-                               if (tdb)
-                                       MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL);
-
-                               vv = (float)v;
-
-                               D_single(vv);
+//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
                        {
-                               float vv = 0;
                                AddFixup(FU_FLOATSING, sloc, aNexpr);
-
-                               D_single(vv);
+                               D_long(0);      // IEEE-754 zero is all zeroes
                        }
 
                break;
@@ -234,26 +239,20 @@ int eaNgen(WORD siz)
                        // 68881/68882/68040 only
                        if (w)
                        {
-                               double vv;
-                               unsigned long long vvv;
-                               if (tdb)
-                                       MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
-
-                               // We want to store the IEE754 float into ram from a generic
-                               // 32-bit int. First, convert it to double float, then cast
-                               // that to 64-bit, then convert to big endian (if needed)
-                               // and then store it (phew!)
-                               vv = *(float *)&aNexval;
-                               vvv = BYTESWAP64(*(unsigned long long *)&vv);
-
-                               D_double(vvv);
+//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
                        {
-                               unsigned long long vvv = 0;
                                AddFixup(FU_FLOATDOUB, sloc, aNexpr);
-
-                               D_double(vvv);
+                               D_quad(0LL);    // IEEE-754 zero is all zeroes
                        }
 
                        break;
@@ -261,25 +260,20 @@ int eaNgen(WORD siz)
                        // 68881/68882/68040 only
                        if (w)
                        {
-                               long double vv;
-                               if (tdb)
-                                       MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
-
-                               // We want to store the IEE754 float into ram from a generic
-                               // 32-bit int. First, convert it to double float, then cast
-                               // that to 96-bit, then convert to big endian (if needed)
-                               // and then store it (phew!)
-                               vv = (double)aNexval;
-
-                               //*chptr++ = (char)((*(unsigned long long *)&vv) >> 32) | 0x80 /* assume that the number is normalised */;
-                               D_extend(vv);
+//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
                        {
-                               long double vvv = 0;
                                AddFixup(FU_FLOATDOUB, sloc, aNexpr);
-
-                               D_extend(vvv);
+                               memset(extDbl, 0, 12);
+                               D_extend(extDbl);
                        }
 
                        break;
@@ -361,7 +355,7 @@ int eaNgen(WORD siz)
                        else
                        {
                                // Arrange for fixup later on
-                               AddFixup(FU_WORD|FU_SEXT, sloc, aNbexpr);
+                               AddFixup(FU_WORD | FU_SEXT, sloc, aNbexpr);
                                D_word(0);
                        }
                }
@@ -384,13 +378,13 @@ int eaNgen(WORD siz)
                        }
                }
                // Deposit od (if not suppressed)
-               if ((aNexten&7)==EXT_IISPRE0 || (aNexten&7)==EXT_IISPREN
-                       || (aNexten&7)==EXT_IISNOIN || (aNexten&7)==EXT_IISPOSN)
+               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)
+               else if ((aNexten & 7) == EXT_IISPREW
+                       || (aNexten & 7) == EXT_IISPOSW || (aNexten & 7) == EXT_IISNOIW)
                {
                        // Deposit word od
                        if (w)
@@ -407,7 +401,7 @@ int eaNgen(WORD siz)
                        else
                        {
                                // Arrange for fixup later on
-                               AddFixup(FU_WORD|FU_SEXT, sloc, aNexpr);
+                               AddFixup(FU_WORD | FU_SEXT, sloc, aNexpr);
                                D_word(0);
                        }
                }
@@ -425,7 +419,7 @@ int eaNgen(WORD siz)
                        else
                        {
                                // Arrange for fixup later on
-                               AddFixup(FU_LONG|FU_SEXT, sloc, aNexpr);
+                               AddFixup(FU_LONG | FU_SEXT, sloc, aNexpr);
                                D_long(0);
                        }
                }