X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=mark.c;h=53eaf871854bb87bcd7e32f6a36e519ebcf8250f;hp=7495c71c1eeecf571b26b7031dba32ae97495495;hb=9153334781cd2e23750f4dc002e847606c07a1f0;hpb=d1f5f1caccb26da6a3da7fc00b94b79000a55302

diff --git a/mark.c b/mark.c
index 7495c71..53eaf87 100644
--- a/mark.c
+++ b/mark.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // MARK.C - A record of things that are defined relative to any of the sections
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -221,7 +221,7 @@ uint32_t MarkImage(register uint8_t * mp, uint32_t siz, uint32_t tsize, int okfl
 
 					w |= symbol->senv << 3;
 					*wp++ = w >> 8;
-					*wp = w;
+					*wp = (uint8_t)w;
 				}
 			}
 			else
@@ -377,6 +377,12 @@ printf(" validsegment: raddr = $%08X\n", loc);
 			if (w & MMOVEI)
 				rflag |= 0x00000001;
 
+			// This tells the linker to do a WORD relocation (otherwise it
+			// defaults to doing a LONG, throwing things off for WORD sized
+			// fixups)
+			if (!(w & MLONG))
+				rflag |= 0x00000002;
+
 			if (symbol != NULL)
 			{
 				// Deposit external reference
@@ -414,7 +420,7 @@ printf("  validsegment(3): rflag = $%08X\n", rflag);
 					if (from == DATA)
 						dp += tsize;
 
-					uint32_t diff = GETBE32(dp, 0);
+					uint32_t diff = (rflag & 0x02 ? GETBE16(dp, 0) : GETBE32(dp, 0));
 					DEBUG printf("diff=%uX ==> ", diff);
 #ifdef DEBUG_IMAGE_MARKING
 printf("  validsegment(4): diff = $%08X --> ", diff);
@@ -430,7 +436,21 @@ printf("  validsegment(4): diff = $%08X --> ", diff);
 					if (rflag & 0x01)
 						diff = WORDSWAP32(diff);
 
-					SETBE32(dp, 0, diff);
+					// Make sure to deposit the correct size payload
+					// N.B.: The braces around the SETBExx macros are needed
+					//       because the macro supplies its own set of braces,
+					//       thus leaving a naked semicolon afterwards to
+					//       screw up the if/else structure. This is the price
+					//       you pay when using macros pretending to be code.
+					if (rflag & 0x02)
+					{
+						SETBE16(dp, 0, diff);
+					}
+					else
+					{
+						SETBE32(dp, 0, diff);
+					}
+
 					DEBUG printf("%uX\n", diff);
 #ifdef DEBUG_IMAGE_MARKING
 printf("$%08X\n", diff);
@@ -463,6 +483,7 @@ uint32_t CreateELFRelocationRecord(uint8_t * buf, uint8_t * secBuf, uint16_t sec
 
 	// Setup pointer for D_long/word/byte macros
 	chptr = buf;
+	ch_size = 0;
 
 	for(MCHUNK * mch=firstmch; mch!=NULL; mch=mch->mcnext)
 	{