Fix for ^^filesize (these kind of hacks need to go in the long game)

[rmac] / parmode.h

diff --git a/parmode.h b/parmode.h
index 7e31545b16f36955b8a7e114910269870f14be08..bf835b2007b1f2315c771cedb4774d8dcbccbce7 100644 (file)
--- a/parmode.h
+++ b/parmode.h
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
 // PARMODE.C - Addressing Modes Parser Include
-// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -354,7 +354,7 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
                                                        AnEXTEN |= EXT_BDSIZEW;
 
                                                        if (optim_warn_flag)
-                                                               warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
+                                                               warn("o5: absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
                                                }
                                                else
                                                {
@@ -367,8 +367,8 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
                                        tok++;
                        }
 
-                       // Check for address register or PC, 
-                       // suppress base register otherwise
+                       // Check for address register or PC, suppress base register
+                       // otherwise
 
                        if (*tok == KW_PC)
                        {                                       // ([bd,PC,...
@@ -571,7 +571,7 @@ AMn_IXN:                 // Handle any indexed (tok -> a comma)
                                        default:
                                                goto badmode;
                                        }
-                                       
+
                                }
 
                                // Check for od
@@ -616,13 +616,15 @@ CHECKODn:
                                        if (*tok == DOTL)
                                                tok++;                          // Doesn't matter, we're going for .L anyway
 
+                                       WORD od_ea = 0;
+
                                        // od.L
                                        if (!(AnEXTEN & EXT_BS))
-                                               AnEXTEN |= EXT_IISPOSL; // Long outer displacement
+                                               od_ea = EXT_IISPOSL; // Long outer displacement
                                        else
                                        {
                                                // bd is suppressed, so sticking the od size in bd
-                                               AnEXTEN |= EXT_BDSIZEL;
+                                               od_ea = EXT_BDSIZEL;
                                                // And of course the expression has to be copied to
                                                // AnBEXPR instead of AnEXPR. Yay. :-/
                                                int i = 0;
@@ -631,7 +633,8 @@ CHECKODn:
                                                {
                                                        AnBEXPR[i] = AnEXPR[i];
                                                        i++;
-                                               } while (AnEXPR[i] != 'E');
+                                               }
+                                               while (AnEXPR[i] != 'E');
 
                                                AnBEXPR[i] = 'E';
                                        }
@@ -644,11 +647,13 @@ CHECKODn:
                                                && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
                                                && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
                                        {
-                                               AnEXTEN |= EXT_IISPOSW; // Word outer displacement
+                                               od_ea = EXT_IISPOSW; // Word outer displacement
                                                AMn = MEMPOST + ea_PC;
+
                                                if (optim_warn_flag)
-                                                       warn("absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
+                                                       warn("o5: absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
                                        }
+                                       AnEXTEN |= od_ea;
                                }
 
                                // Check for final closing parenthesis
@@ -718,7 +723,7 @@ IS_SUPPRESSEDn:
                                        {
                                                //AnEXTEN|=EXT_IISNOIW; // Word outer displacement with IS suppressed
                                                if (optim_warn_flag)
-                                                       warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+                                                       warn("o5: outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
                                        }
                                }
 
@@ -883,7 +888,7 @@ IS_SUPPRESSEDn:
                                                        expr_size = EXT_IISPREW;
 
                                                        if (optim_warn_flag)
-                                                               warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+                                                               warn("o5: outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
                                                }
                                        }
 
@@ -1157,16 +1162,15 @@ CHK_FOR_DISPn:
                        // expr[.L]
                        AMn = ABSL;
 
-                       // When PC relative is enforced, check for any symbols that aren't
-                       // EQU'd, in this case it's an illegal mode
-                       if ((CHECK_OPTS(OPT_PC_RELATIVE)) && (AnEXATTR & REFERENCED) && (AnEXATTR & DEFINED) && (!(AnEXATTR & EQUATED)))
-                               return error("relocation not allowed");
-
                        // .L is forced here
                        if (*tok == DOTL)
                        {
+                               // When PC relative is enforced, check for any symbols that aren't
+                               // EQU'd, in this case it's an illegal mode
+                               if ((CHECK_OPTS(OPT_PC_RELATIVE)) && (AnEXATTR & (DEFINED | REFERENCED | EQUATED) == (DEFINED | REFERENCED)))
+                                       return error("relocation not allowed when o30 is enabled");
+
                                tok++;
-                               AMn = ABSL;
                        }
                        else
                        {
@@ -1179,7 +1183,7 @@ CHK_FOR_DISPn:
                                        AMn = ABSW;
 
                                        if (optim_warn_flag)
-                                               warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+                                               warn("o0: absolute value from $FFFF8000..$00007FFF optimised to absolute short");
                                }
                        }