Fix for bug #46 (thanks to ggn for reporting!).
authorShamus Hammons <jlhamm@acm.org>
Sun, 1 Nov 2015 15:14:52 +0000 (09:14 -0600)
committerShamus Hammons <jlhamm@acm.org>
Sun, 1 Nov 2015 15:14:52 +0000 (09:14 -0600)
direct.c
expr.c
version.h

index 643f0318850bcd2c7158a51c133dab287ae855af..0cee4b37640c331429b5f0c7c6134dc3ca34d91d 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -35,19 +35,19 @@ int (*dirtab[])() = {
        d_unimpl,                       // 2 .6502
        d_68000,                        // 3 .68000
        d_bss,                          // 4 bss
-       d_data,                         7// 5 data
+       d_data,                         // 5 data
        d_text,                         // 6 text
        d_abs,                          // 7 abs
        d_comm,                         // 8 comm
-       (void *)d_init,                 // 9 init
+       (void *)d_init,         // 9 init
        d_cargs,                        // 10 cargs
-       (void *)d_goto,                 // 11 goto
-       (void *)d_dc,                   // 12 dc
-       (void *)d_ds,                   // 13 ds
+       (void *)d_goto,         // 11 goto
+       (void *)d_dc,           // 12 dc
+       (void *)d_ds,           // 13 ds
        d_undmac,                       // 14 undefmac
        d_gpu,                          // 15 .gpu
        d_dsp,                          // 16 .dsp
-       (void *)d_dcb,                  // 17 dcb
+       (void *)d_dcb,          // 17 dcb
        d_unimpl,                       // 18* set
        d_unimpl,                       // 19* reg
        d_unimpl,                       // 20 dump
diff --git a/expr.c b/expr.c
index 07391acfe6f8fceb5dfaabcdaea036f1acf9b117..50d1f5ada0c2e30ef71ab0bfd1bec37f349ab8a2 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -194,7 +194,7 @@ getsym:
                        if (*tok != SYMBOL && *tok != STRING)
                                return error(str_error);
 
-                       p = string[tok[1]];
+                       p2 = string[tok[1]];
                        tok += 2;
 
                        w = (WORD)(!strcmp(p, p2));
index 92dead743bc6b3cd50d2362adb2d04f892566da9..c9199993f29762171c795c2eef2b6da0e43474c2 100644 (file)
--- a/version.h
+++ b/version.h
@@ -13,6 +13,6 @@
 
 #define MAJOR   1              // Major version number
 #define MINOR   3              // Minor version number
-#define PATCH   14             // Patch release number
+#define PATCH   15             // Patch release number
 
 #endif // __VERSION_H__