Minor tweaking from last round of patching, version bump. :-)
authorShamus Hammons <jlhamm@acm.org>
Fri, 21 Apr 2017 21:36:06 +0000 (16:36 -0500)
committerShamus Hammons <jlhamm@acm.org>
Fri, 21 Apr 2017 21:36:06 +0000 (16:36 -0500)
direct.c
direct.h
mark.c
rmac.h
token.c
version.h

index 900c629a3b686d392b207cf4e36bad04adab8991..8d3d804330ad71f8080f232c0d2ef640fdd5cb39 100644 (file)
--- 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;
                }
index d4b22ce923267c45aa381c4b957ede35299abf35..27219e54f6198f7433b58feb4d04afe0606f4aaf 100644 (file)
--- 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 6c065b52e83928cfdd9589d970a2f79a5958c138..70f90fde4ab4e3fd26fdb2134fd22e645bb191e5 100644 (file)
--- 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 f5d3e7456855b1c16a5bbbbfa597288156a2fb82..dcfbe5c1eebc2de576e499d8847a164523f06435 100644 (file)
--- a/rmac.h
+++ b/rmac.h
 #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 629f8a6f98a18bb8afeb90bb86461b8f37600caa..0887d93b1b47bc29e0d24cf9064c6e5cf96c8c71 100644 (file)
--- 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;)
                                {
index 48316aeddc340a557378eeb18f5d740126aaf994..c87b6fe5649c944f46e0530c44daf3016d423954 100644 (file)
--- 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__