Lots of fixes for floating point handling; version now at 1.11.0.

[rmac] / eagen0.c

diff --git a/eagen0.c b/eagen0.c
index 1bb00ba7c6a372798f81625dccf24251cfedb49c..b4b58861a24425c57f695a4f824a1bcd46887d2a 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -9,12 +9,13 @@
 
 int eaNgen(WORD siz)
 {
-       VALUE vbd, v = aNexval;
+       uint32_t vbd, v = (uint32_t)aNexval;
        WORD wbd, w = (WORD)(aNexattr & DEFINED);
        WORD tdbbd, tdb = (WORD)(aNexattr & TDB);
-       vbd = aNbdexval;
+       vbd = (uint32_t)aNbdexval;
        wbd = (WORD)(aNbdexattr & DEFINED);
        tdbbd = (WORD)(aNbdexattr & TDB);
+       uint8_t extDbl[12];
 
        switch (amN)
        {
@@ -86,7 +87,7 @@ int eaNgen(WORD siz)
                {
                        // Just deposit it
                        if ((aNexattr & TDB) == cursect)
-                               v -= (VALUE)sloc;
+                               v -= (uint32_t)sloc;
                        else if ((aNexattr & TDB) != ABS)
                                error(rel_error);
 
@@ -136,7 +137,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);
 
@@ -208,6 +209,70 @@ int eaNgen(WORD siz)
                                D_long(0);
                        }
 
+                       break;
+               case SIZS:
+                       // 68881/68882/68040 only
+                       if (w)
+                       {
+                               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)
+                       {
+                               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)
+                       {
+                               if (tdb)
+                                       MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
+
+                               PTR p;
+                               p.u64 = &aNexval;
+                               DoubleToExtended(*p.dp, extDbl);
+                               D_extend(extDbl);
+                       }
+                       else
+                       {
+                               AddFixup(FU_FLOATDOUB, sloc, aNexpr);
+                               memset(extDbl, 0, 12);
+                               D_extend(extDbl);
+                       }
+
                        break;
                default:
                        // IMMED size problem
@@ -253,10 +318,10 @@ int eaNgen(WORD siz)
 
                break;
        case DINDW:
-               D_word(0x190|(aNixreg<<12));
+               D_word((0x190 | (aNixreg << 12)));
                break;
        case DINDL:
-               D_word(0x990|(aNixreg<<12));
+               D_word((0x990 | (aNixreg << 12)));
                break;
        case ABASE:
        case MEMPOST:
@@ -266,11 +331,11 @@ int eaNgen(WORD siz)
        case PCMPRE:
                D_word(aNexten);
                // Deposit bd (if not suppressed)
-               if ((aNexten&0x0030)==EXT_BDSIZE0)
+               if ((aNexten & 0x0030) == EXT_BDSIZE0)
                {
                        // Don't deposit anything (suppressed)
                }
-               else if ((aNexten&0x0030)==EXT_BDSIZEW)
+               else if ((aNexten & 0x0030) == EXT_BDSIZEW)
                {
                        // Deposit word bd
                        if (wbd)
@@ -287,7 +352,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);
                        }
                }
@@ -310,13 +375,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)
@@ -333,7 +398,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);
                        }
                }
@@ -351,7 +416,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);
                        }
                }