Remove all remaining traces of "as68_flag" from the codebase (issue #186)

[rmac] / parmode.h

diff --git a/parmode.h b/parmode.h
index dd3e1a2b03ee87b6bd58b0a6df3da462ab7bfe2f..8aed03ca35e9cf6566a2efe691096fcfa06d6f27 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
 //
@@ -1162,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 o10 is enabled9");
+
                                tok++;
-                               AMn = ABSL;
                        }
                        else
                        {