From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 21 Apr 2017 21:36:06 +0000 (-0500)
Subject: Minor tweaking from last round of patching, version bump. :-)
X-Git-Tag: v2.1.0~131
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=commitdiff_plain;h=751aa148a93f2830cf0a56ab9f662a0416127ddc

Minor tweaking from last round of patching, version bump. :-)
---

diff --git a/direct.c b/direct.c
index 900c629..8d3d804 100644
--- a/direct.c
+++ b/direct.c
@@ -1004,7 +1004,6 @@ int d_dc(WORD siz)
 				error("String format not supported... yet");
 			}
 
-
 			tok += 2;
 			goto comma;
 		}
diff --git a/direct.h b/direct.h
index d4b22ce..27219e5 100644
--- a/direct.h
+++ b/direct.h
@@ -15,7 +15,6 @@
 extern TOKEN exprbuf[];
 extern SYM * symbolPtr[];
 extern int (* dirtab[])();
-extern int stringtype;
 
 // Exported functions
 void auto_even(void);
diff --git a/mark.c b/mark.c
index 6c065b5..70f90fd 100644
--- a/mark.c
+++ b/mark.c
@@ -527,21 +527,7 @@ uint32_t CreateELFRelocationRecord(uint8_t * buf, uint8_t * secBuf, uint16_t sec
 				else
 					r_type = 1;  // R_68K_32
 
-#ifdef DEBUG_IMAGE_MARKING
-if (symbol)
-{
-	printf("CreateELFReloc: symbol-svalue = $%08X\n", symbol->svalue);
-}
-
-printf("CreateELFReloc: deposited value = $%08X\n", GETBE32(secBuf + r_offset, 0));
-
-#endif
-//Turns out this is pretty much bollocks. So now we punt all the time :-)
-//N.B.: Once this is proved out, this will go for good.
-//				if (symbol != NULL)
-//					r_addend = symbol->svalue;    // Mark offset into section
-//				else
-					r_addend = GETBE32(secBuf + r_offset, 0);
+				r_addend = GETBE32(secBuf + r_offset, 0);
 
 				// Deposit the relocation record
 				D_long(r_offset);
diff --git a/rmac.h b/rmac.h
index f5d3e74..dcfbe5c 100644
--- a/rmac.h
+++ b/rmac.h
@@ -168,7 +168,7 @@
 #define CONST        'a'			// CONST <value>
 #define ACONST       'A'			// ACONST <value> <attrib>
 #define STRING       'b'			// STRING <address>
-#define STRINGA8     'S'            // Atari 800 internal STRING <address>
+#define STRINGA8     'S'			// Atari 800 internal STRING <address>
 #define SYMBOL       'c'			// SYMBOL <address>
 #define EOL          'e'			// End of line
 #define TKEOF        'f'			// End of file (or macro)
diff --git a/token.c b/token.c
index 629f8a6..0887d93 100644
--- a/token.c
+++ b/token.c
@@ -1177,25 +1177,19 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 				continue;
 			case '\'':		// 'string'
 				if (m6502)
-                {
-					*tk++ = STRINGA8; // hardcoded for now, maybe this will change in the future
-                    goto dostring;
-                }
+				{
+					// Hardcoded for now, maybe this will change in the future
+					*tk++ = STRINGA8;
+					goto dostring;
+				}
 				// Fall through
 			case '\"':		// "string"
 				*tk++ = STRING;
 dostring:
 				c1 = ln[-1];
-//#warning
-// More char * stuffing (8 bytes) into the space of 4 (TOKEN).
-// Need to figure out how to fix this crap.
-#if 0
-				*tk++ = (TOKEN)ln;
-#else
 				string[stringNum] = ln;
 				*tk++ = stringNum;
 				stringNum++;
-#endif
 
 				for(p=ln; *ln!=EOS && *ln!=c1;)
 				{
diff --git a/version.h b/version.h
index 48316ae..c87b6fe 100644
--- a/version.h
+++ b/version.h
@@ -15,7 +15,7 @@
 
 #define MAJOR   1		// Major version number
 #define MINOR   6		// Minor version number
-#define PATCH   2		// Patch release number
+#define PATCH   4		// Patch release number
 
 #endif // __VERSION_H__