Partial fix for bug #108 (Fixup cleanups).
[rmac] / 6502.c
diff --git a/6502.c b/6502.c
index 8141abea67a5e0d1e09f47213738c0e74d7612f3..5978240a5bfe53be35059fb0b6820c78e6653532 100644 (file)
--- a/6502.c
+++ b/6502.c
@@ -1,5 +1,9 @@
 //
-// 6502 Assembler
+// RMAC - Reboot's Macro Assembler for all Atari computers
+// 6502.C - 6502 Assembler
+// 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
 //
 //    Init6502 initialization
 //    d_6502    handle ".6502" directive
@@ -243,7 +247,7 @@ void m6502cg(int op)
 {
        register int amode;             // (Parsed) addressing mode
        register int i;
-       VALUE eval;                             // Expression value
+       uint64_t eval;                  // Expression value
        WORD eattr;                             // Expression attributes
        int zpreq;                              // 1, optimize instr to zero-page form
        register char * p;              // (Temp) string usage
@@ -254,7 +258,7 @@ void m6502cg(int op)
        //
        zpreq = 0;
 
-       switch ((int)*tok)
+       switch (tok[0])
        {
        case EOL:
                amode = A65_IMPL;
@@ -266,6 +270,7 @@ void m6502cg(int op)
                if (*tok == '>')
                {
                        tok++;
+
                        if (expr(exprbuf, &eval, &eattr, NULL) < 0)
                                return;
 
@@ -275,6 +280,7 @@ void m6502cg(int op)
                else if (*tok == '<')
                {
                        tok++;
+
                        if (expr(exprbuf, &eval, &eattr, NULL) < 0)
                                return;
 
@@ -303,7 +309,8 @@ void m6502cg(int op)
                                tok++;
                                p = string[tok[1]];
 
-                               if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'y') // Sleazo tolower()
+                               // Sleazo tolower() -----------------vvvvvvvvvvv
+                               if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'y')
                                        goto badmode;
 
                                tok += 2;
@@ -318,7 +325,8 @@ void m6502cg(int op)
                        tok++;
                        p = string[tok[1]];
 
-                       if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'x') // Sleazo tolower()
+                       // Sleazo tolower() -----------------vvvvvvvvvvv
+                       if (*tok != SYMBOL || p[1] != EOS || (*p | 0x20) != 'x')
                                goto badmode;
 
                        tok += 2;