Fix for bad division in expressions. Thanks to A. Seed for reporting!

[rmac] / parmode.h

diff --git a/parmode.h b/parmode.h
index 4637d72dda1bca9613a2484de82f4bf68ffb9f4c..543701ace549f4bb9e9ee4c879888a1f6cab2c70 100644 (file)
--- a/parmode.h
+++ b/parmode.h
@@ -3,7 +3,7 @@
 // PARMODE.C - Addressing Modes Parser Include
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 // This file is included (twice) to parse two addressing modes, into slightly
@@ -24,7 +24,8 @@
        }
        else if (*tok == '#')
        {
-               ++tok;
+               tok++;
+
                if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
                        return ERROR;
 
@@ -44,7 +45,7 @@
        // ([bd,PC,Xn],od)
        else if (*tok == '(')
        {
-               ++tok;
+               tok++;
 
                if ((*tok >= KW_A0) && (*tok <= KW_A7))
                {
@@ -52,11 +53,11 @@
 
                        if (*tok == ')')
                        {
-                               ++tok;
+                               tok++;
 
                                if (*tok == '+')
                                {
-                                       ++tok;
+                                       tok++;
                                        AMn = APOSTINC;
                                }
                                else
@@ -70,7 +71,7 @@
                }
                else if (*tok == KW_PC)
                {                            // (PC,Xn[.siz][*scale]) 
-                       ++tok;
+                       tok++;
                        AMn = PCINDEXED;
 
                        // Common index handler; enter here with `tok' pointing at the comma.
@@ -93,13 +94,13 @@
                        switch ((int)*tok)
                        {                                // Index reg size: <empty> | .W | .L 
                        case DOTW:
-                               ++tok;
+                               tok++;
                        default:
                                AnIXSIZ = 0;
                                break;
                        case DOTL:
                                AnIXSIZ = 0x0800;
-                               ++tok;
+                               tok++;
                                break;
                        case DOTB:                                      // .B not allowed here...
                                goto badmode;
@@ -107,7 +108,8 @@
 
                        if (*tok == '*')
                        {                                  // scale: *1, *2, *4, *8 
-                               ++tok;
+                               tok++;
+
                                if (*tok++ != CONST || *tok > 8)
                                        goto badmode;
 
@@ -149,7 +151,7 @@
                        if ((*tok >= KW_A0) && (*tok <= KW_A7))
                        {
                                AnREG = *tok & 7;
-                               ++tok;
+                               tok++;
 
                                if (*tok == ',')
                                {
@@ -159,7 +161,7 @@
                                else if (*tok == ')')
                                {
                                        AMn = ADISP;
-                                       ++tok;
+                                       tok++;
                                        goto AnOK;
                                }
                                else
@@ -175,7 +177,7 @@
                                else if (*tok == ')')
                                {
                                        AMn = PCDISP;                                // expr(PC) 
-                                       ++tok;
+                                       tok++;
                                        goto AnOK;
                                }
                                else
@@ -194,19 +196,19 @@
        else if (*tok == KW_CCR)
        {
                AMn = AM_CCR;
-               ++tok;
+               tok++;
                goto AnOK;
        }
        else if (*tok == KW_SR)
        {
                AMn = AM_SR;
-               ++tok;
+               tok++;
                goto AnOK;
        }
        else if (*tok == KW_USP)
        {
                AMn = AM_USP;
-               ++tok;
+               tok++;
                goto AnOK;
        }
        // expr
@@ -222,29 +224,33 @@
                        return ERROR;
 
                if (*tok == DOTW)
-               {                                    // expr.W 
-                       ++tok;
+               {
+                       // expr.W 
+                       tok++;
                        AMn = ABSW;
                        goto AnOK;
                }
                else if (*tok != '(')
-               {                              // expr[.L]
+               {
+                       // expr[.L]
                        AMn = ABSL;
-                       // Defined, absolute values from $FFFF8000..$00007FFF get optimized to absolute short
 
+                       // Defined, absolute values from $FFFF8000..$00007FFF get optimized
+                       // to absolute short
                        if ((AnEXATTR & (TDB|DEFINED)) == DEFINED && (AnEXVAL + 0x8000) < 0x10000)
                                AMn = ABSW;
 
+                       // Is .L forced here?
                        if (*tok == DOTL)
-                       {                                 // force .L 
-                               ++tok;
+                       {
+                               tok++;
                                AMn = ABSL;
                        }
 
                        goto AnOK;
                }
 
-               ++tok;
+               tok++;
 
                if ((*tok >= KW_A0) && (*tok <= KW_A7))
                {
@@ -253,7 +259,7 @@
                        if (*tok == ')')
                        {
                                AMn = ADISP;
-                               ++tok;
+                               tok++;
                                goto AnOK;
                        }
 
@@ -265,7 +271,7 @@
                        if (*++tok == ')')
                        {
                                AMn = PCDISP;
-                               ++tok;
+                               tok++;
                                goto AnOK;
                        }