Patch to fix lack of WORD sized symbol relocations by SainT.

[rmac] / eagen0.c

diff --git a/eagen0.c b/eagen0.c
index f01b989a7454812538d397cdca29881e0fa2545d..e7f388512ab35d48c3d588f7fd5b08b551757132 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -9,7 +9,7 @@
 
 int eaNgen(WORD siz)
 {
-       VALUE vbd, v = aNexval;
+       uint32_t vbd, v = aNexval;
        WORD wbd, w = (WORD)(aNexattr & DEFINED);
        WORD tdbbd, tdb = (WORD)(aNexattr & TDB);
        vbd = aNbdexval;
@@ -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
@@ -86,7 +86,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 +136,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);
 
@@ -253,10 +253,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 +266,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)