X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.c;h=0ea53a843f1c4568dec445fcab7c7f3a179ed014;hp=7fcb2996bc30051a819e656b08f7ffa6db0b5e61;hb=d62ea9ab9323ed83b9feb96bd1d7df21c1bf6a63;hpb=7d364a21bf389d947bb61cc235d00b3892aca89a

diff --git a/sect.c b/sect.c
index 7fcb299..0ea53a8 100644
--- a/sect.c
+++ b/sect.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // SECT.C - Code Generation, Fixups and Section Management
-// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -450,21 +450,24 @@ int ResolveFixups(int sno)
 		// from the location (that will happen in the linker when the external
 		// reference is resolved).
 		//
-		// MWC expects PC-relative things to have the LOC subtracted from the
-		// value, if the value is external (that is, undefined at this point).
-		//
 		// PC-relative fixups must be DEFINED and either in the same section
 		// (whereupon the subtraction takes place) or ABS (with no subtract).
-		if (dw & FU_PCREL)
+		if ((dw & FU_PCREL) || (dw & FU_PCRELX))
 		{
 			if (eattr & DEFINED)
 			{
 				if (tdb == sno)
+				{
 					eval -= loc;
+
+					// In this instruction the PC is located a DWORD away
+					if (dw & FU_PCRELX)
+						eval += 2;
+				}
 				else if (tdb)
 				{
 					// Allow cross-section PCREL fixups in Alcyon mode
-					if (prg_flag)
+					if (prg_flag || (obj_format == RAW))
 					{
 						switch (tdb)
 						{
@@ -483,6 +486,10 @@ int ResolveFixups(int sno)
 						}
 
 						eval -= loc;
+
+						// In this instruction the PC is located a DWORD away
+						if (dw & FU_PCRELX)
+							eval += 2;
 					}
 					else
 					{
@@ -494,9 +501,8 @@ int ResolveFixups(int sno)
 				if (sbra_flag && (dw & FU_LBRA) && (eval + 0x80 < 0x100))
 					warn("unoptimized short branch");
 			}
-			else if (obj_format == MWC)
-				eval -= loc;
 
+			// Be sure to clear any TDB flags, since we handled it just now
 			tdb = 0;
 			eattr &= ~TDB;
 		}