]> Shamusworld >> Repos - rmac/blobdiff - parmode.h
Added floating point support to expression evaluator, introduced FLOAT token, fixup...
[rmac] / parmode.h
index b116427da7cff908d2a3269bdb58651de4ce8677..e5e0b91606ed1e3256c5919e210b2d35c1ea1b91 100644 (file)
--- a/parmode.h
+++ b/parmode.h
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // PARMODE.C - Addressing Modes Parser Include
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -78,6 +78,7 @@
                {
                        //Since index register isn't used here, store register number in this field
                        AnIXREG = *tok++ & 7;                                // (Dn)
+
                        if (*tok == ')')
                        {
                                tok++;
                                AnEXTEN |= EXT_BS;          // Base register suppressed
                                AnEXTEN |= EXT_BDSIZE0;     // Base displacement null
                                AnEXTEN |= EXT_IISPOSN;     // Indirect Postindexed with Null Outer Displacement
-                               AMn= MEMPOST;
+                               AMn = MEMPOST;
                                AnREG = 6 << 3;         // stuff 110 to mode field
                                goto AnOK;
                        }
                        else if (*tok == 'L')
                        {
                                // TODO: does DINDL gets used at all?
-                               //AMn=DINDL;                                     // (Dn.l)
-                               //AnEXTEN = 1 << 1;   // Long index size
-                               //tok++;
+                               AMn = DINDL;                                     // (Dn.l)
+                               AnEXTEN = 1 << 1;   // Long index size
+                               tok++;
                        }
                        else if (*tok == 'W')                                // (Dn.w)
                        {
                                // TODO: does DINDW gets used at all?
-                               //AMn=DINDW;
-                               //AnEXTEN = 1 << 1;   // Word index size
-                               //tok++;
+                               AMn = DINDW;
+                               AnEXTEN = 1 << 1;   // Word index size
+                               tok++;
                        }
                        else if (*tok == ',')
                        {
                                goto CHECKODn;
                        }
                        else
+                       {
                                return error("(Dn) error");
+                       }
+
+                       if (*tok == '*')
+                       {                        // scale: *1, *2, *4, *8
+                               tok++;
+
+                               if (*tok == SYMBOL)
+                               {
+                                       if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+                                               return error("scale factor expression must evaluate");
+
+                                       switch (AnEXVAL)
+                                       {
+                                       case 1:
+                                               break;
+                                       case 2:
+                                               AnIXSIZ |= TIMES2;
+                                               break;
+                                       case 4:
+                                               AnIXSIZ |= TIMES4;
+                                               break;
+                                       case 8:
+                                               AnIXSIZ |= TIMES8;
+                                               break;
+                                       default:
+                                               goto badmode;
+                                       }
+                               }
+                               else if (*tok++ != CONST || *tok > 8)
+                                       goto badmode;
+                               else
+                               {
+                                       switch ((int)*tok++)
+                                       {
+                                       case 1:
+                                               break;
+                                       case 2:
+                                               AnIXSIZ |= TIMES2;
+                                               break;
+                                       case 4:
+                                               AnIXSIZ |= TIMES4;
+                                               break;
+                                       case 8:
+                                               AnIXSIZ |= TIMES8;
+                                               break;
+                                       default:
+                                               goto badmode;
+                                       }
+                               }
+                       }
 
                        if (*tok == ')')
                        {
                                AMn = MEMPOST;
                                goto AnOK;
                        }
+                       else if (*tok==',')
+                       {
+                               tok++;  // eat the comma
+                               // It might be (Dn[.wl][*scale],od)
+                               // Maybe this is wrong and we have to write some code here
+                               // instead of reusing that path...
+                               AnEXTEN |= EXT_BDSIZE0;     // Base displacement null - suppressed
+                               goto CHECKODn;
+                       }
                        else
                                return error("unhandled so far");
                }
                        {                        // scale: *1, *2, *4, *8
                                tok++;
 
-                               if (*tok++ != CONST || *tok > 8)
-                                       goto badmode;
-
-                               switch ((int)*tok++)
+                               if (*tok == SYMBOL)
                                {
-                               case 1:
-                                       break;
-                               case 2:
-                                       AnIXSIZ |= TIMES2;
-                                       break;
-                               case 4:
-                                       AnIXSIZ |= TIMES4;
-                                       break;
-                               case 8:
-                                       AnIXSIZ |= TIMES8;
-                                       break;
-                               default:
+                                       if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+                                               return error("scale factor expression must evaluate");
+                                       switch (AnEXVAL)
+                                       {
+                                       case 1:
+                                               break;
+                                       case 2:
+                                               AnIXSIZ |= TIMES2;
+                                               break;
+                                       case 4:
+                                               AnIXSIZ |= TIMES4;
+                                               break;
+                                       case 8:
+                                               AnIXSIZ |= TIMES8;
+                                               break;
+                                       default:
+                                               goto badmode;
+                                       }
+                               }
+                               else if (*tok++ != CONST || *tok > 8)
                                        goto badmode;
+                               else
+                               {
+                                       switch ((int)*tok++)
+                                       {
+                                       case 1:
+                                               break;
+                                       case 2:
+                                               AnIXSIZ |= TIMES2;
+                                               break;
+                                       case 4:
+                                               AnIXSIZ |= TIMES4;
+                                               break;
+                                       case 8:
+                                               AnIXSIZ |= TIMES8;
+                                               break;
+                                       default:
+                                               goto badmode;
+                                       }
                                }
                        }
 
+                       if (*tok == ',')
+                       {
+                               // If we got here we didn't get any [] stuff
+                               // so let's suppress base displacement before
+                               // branching off
+                               tok++;
+                               AnEXTEN |= EXT_BDSIZE0;     // Base displacement null - suppressed
+                               goto CHECKODn;
+                       }
                        if (*tok++ != ')')         // final ")"
                                goto badmode;
 
                else if (*tok == '[')
                {                              // ([...
                        tok++;
-                       AnEXTEN|=EXT_FULLWORD;     //Definitely using full extension format, so set bit 8
+                       AnEXTEN |= EXT_FULLWORD;     // Definitely using full extension format, so set bit 8
+
                        // Check to see if base displacement is present
-                       //WARNING("expr will return a bad expression error here but this is expected, it needs to be silenced!");
-                       if (*tok!=CONST && *tok !=SYMBOL)
-                       //if (expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM) != OK)
+                       if (*tok != CONST && *tok != SYMBOL)
                        {
-                               AnEXTEN|=EXT_BDSIZE0;
-                               //tok++;
-                               //tok--;                 //Rewind tok since expr advances it forward
+                               AnEXTEN |= EXT_BDSIZE0;
                        }
                        else
                        {
                                expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM);
-                               if (optim_flags[OPT_BASE_DISP] && AnBEXVAL==0 && AnEXATTR!=0)
+                               if (CHECK_OPTS(OPT_BASE_DISP) && AnBEXVAL == 0 && AnEXATTR != 0)
                                {
                                        // bd=0 so let's optimise it out
                                        AnEXTEN|=EXT_BDSIZE0;
                                }
                                else if (*tok==DOTL)
-                               {                                                  // ([bd.l,...
-                                               AnEXTEN|=EXT_BDSIZEL;
+                               {                                               // ([bd.l,...
+                                               AnEXTEN |= EXT_BDSIZEL;
                                                tok++;
                                }
                                else
-                               {                                                  // ([bd[.w],... or ([bd,...
+                               {                                               // ([bd[.w],... or ([bd,...
                                        // Is .W forced here?
                                        if (*tok == DOTW)
                                        {
-                                       AnEXTEN|=EXT_BDSIZEW;
+                                               AnEXTEN |= EXT_BDSIZEW;
                                                tok++;
                                        }
                                        else
                                        {
                                                // Defined, absolute values from $FFFF8000..$00007FFF get optimized
                                                // to absolute short
-                                               if (optim_flags[OPT_ABS_SHORT]
+                                               if (CHECK_OPTS(OPT_ABS_SHORT)
                                                        && ((AnBEXATTR & (TDB | DEFINED)) == DEFINED)
-                                                       && ((AnBEXVAL + 0x8000) < 0x10000))
+                                                       && (((uint32_t)AnBEXVAL + 0x8000) < 0x10000))
                                                {
                                                        AnEXTEN |= EXT_BDSIZEW;
                                                        warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
                        }
                        else if ((*tok >= KW_A0) && (*tok <= KW_A7))
                        {                                       // ([bd,An,...
-                               AnREG = (6<<3)|*tok & 7;
+                               AnREG = (6 << 3) | *tok & 7;
                                tok++;
                        }
                        else if ((*tok >= KW_D0) && (*tok <= KW_D7))
 
                                // Check for size
                                {
-                                       // ([bd,An/PC],Xn.W/L...)
-                                       switch ((int)*tok)
-                                       {
-                                       // Index reg size: <empty> | .W | .L
-                                       case DOTW:
-                                               tok++;
-                                               break;
-                                       default:
-                                               break;
-                                       case DOTL:
-                                               AnEXTEN |= EXT_L;
-                                               tok++;
-                                               break;
-                                       case DOTB:
-                                               // .B not allowed here...
-                                               goto badmode;
-                                       }
+                               // ([bd,An/PC],Xn.W/L...)
+                               switch ((int)*tok)
+                               {
+                               // Index reg size: <empty> | .W | .L
+                               case DOTW:
+                                       tok++;
+                                       break;
+                               default:
+                                       break;
+                               case DOTL:
+                                       AnEXTEN |= EXT_L;
+                                       tok++;
+                                       break;
+                               case DOTB:
+                                       // .B not allowed here...
+                                       goto badmode;
+                               }
                                }
 
                                // Check for scale
                                if (*tok == '*')                        // ([bd,An/PC],Xn*...)
-                               {
+                               {                           // scale: *1, *2, *4, *8
                                        tok++;
 
-                                       if (*tok == CONST)      // TODO: I suppose the scale is stored as a CONST and nothing else? So prolly the if is not needed?
-                                               tok++;
-
-                                       switch ((int)*tok++)
+                                       if (*tok == SYMBOL)
                                        {
-                                       case 1:
-                                               break;
-                                       case 2:
-                                               AnEXTEN |= EXT_TIMES2;
-                                               break;
-                                       case 4:
-                                               AnEXTEN |= EXT_TIMES4;
-                                               break;
-                                       case 8:
-                                               AnEXTEN |= EXT_TIMES8;
-                                               break;
-                                       default:
+                                               if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+                                                       return error("scale factor expression must evaluate");
+
+                                               switch (AnEXVAL)
+                                               {
+                                               case 1:
+                                                       break;
+                                               case 2:
+                                                       AnIXSIZ |= TIMES2;
+                                                       break;
+                                               case 4:
+                                                       AnIXSIZ |= TIMES4;
+                                                       break;
+                                               case 8:
+                                                       AnIXSIZ |= TIMES8;
+                                                       break;
+                                               default:
+                                                       goto badmode;
+                               }
+                                       }
+                                       else if (*tok++ != CONST || *tok > 8)
                                                goto badmode;
+                                       else
+                                       {
+                                               switch ((int)*tok++)
+                                               {
+                                               case 1:
+                                                       break;
+                                               case 2:
+                                                       AnIXSIZ |= TIMES2;
+                                                       break;
+                                               case 4:
+                                                       AnIXSIZ |= TIMES4;
+                                                       break;
+                                               case 8:
+                                                       AnIXSIZ |= TIMES8;
+                                                       break;
+                                               default:
+                                                       goto badmode;
+                                               }
                                        }
                                }
-
                                if (*tok == ']')  // ([bd,Dn]...
                                {
                                        tok++;
                                if (*tok == ')')
                                {
                                        //Xn and od are non existent, get out of jail free card
+                                       tok++;
                                        AMn = MEMPRE;                   // ([bc,An,Xn],od) with no Xn and od
                                        AnEXTEN |= EXT_IS | EXT_IISPREN;        //Suppress Xn and od
-                                       tok++;
                                        goto AnOK;
                                }
                                else if (*tok != ',')
                                {
                                        //No index found, suppress it
                                        AnEXTEN |= EXT_IS;
-                                       tok--;                                                  // Rewind tok to point to the comma
-                                       goto IS_SUPPRESSEDn;                    // https://xkcd.com/292/ - what does he know anyway?
+                                       tok--;                                  // Rewind tok to point to the comma
+                                       goto IS_SUPPRESSEDn;    // https://xkcd.com/292/ - what does he know anyway?
                                }
 
                                // Check for size
                                }
 
                                // Check for scale
-                               if (*tok == '*')
-                               {
-                                       // ([bd,An/PC],Xn*...)
+                               if (*tok == '*')                   // ([bd,An/PC],Xn*...)
+                               {                                  // scale: *1, *2, *4, *8
                                        tok++;
 
-                                       if (*tok == CONST)      // TODO: I suppose the scale is stored as a CONST and nothing else? So prolly the if is not needed?
-                                               tok++;
-
-                                       switch ((int)*tok++)
+                                       if (*tok == SYMBOL)
                                        {
-                                       case 1:
-                                               break;
-                                       case 2:
-                                               AnEXTEN |= EXT_TIMES2;
-                                               break;
-                                       case 4:
-                                               AnEXTEN |= EXT_TIMES4;
-                                               break;
-                                       case 8:
-                                               AnEXTEN |= EXT_TIMES8;
-                                               break;
-                                       default:
+                                               if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+                                                       return error("scale factor expression must evaluate");
+
+                                               switch (AnEXVAL)
+                                               {
+                                               case 1:
+                                                       break;
+                                               case 2:
+                                                       AnIXSIZ |= TIMES2;
+                                                       break;
+                                               case 4:
+                                                       AnIXSIZ |= TIMES4;
+                                                       break;
+                                               case 8:
+                                                       AnIXSIZ |= TIMES8;
+                                                       break;
+                                               default:
+                                                       goto badmode;
+                                               }
+                                       }
+                                       else if (*tok++ != CONST || *tok > 8)
                                                goto badmode;
+                                       else
+                                       {
+                                               switch ((int)*tok++)
+                                               {
+                                               case 1:
+                                                       break;
+                                               case 2:
+                                                       AnIXSIZ |= TIMES2;
+                                                       break;
+                                               case 4:
+                                                       AnIXSIZ |= TIMES4;
+                                                       break;
+                                               case 8:
+                                                       AnIXSIZ |= TIMES8;
+                                                       break;
+                                               default:
+                                                       goto badmode;
+                                               }
                                        }
                                }
 
                                        tok++;
                                        goto AnOK;
                                }
-                               else if (*tok!=',')
+                               else if (*tok != ',')
                                        return error("comma expected");
                                else
                                        tok++;  // eat the comma
 
                                CHECKODn:
-
                                if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
                                        goto badmode;
 
-                               if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0))
+                               if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
                                {
                                        // od=0 so optimise it out
                                        AMn = MEMPOST;           // let's say it's ([bd,An],Xn,od) with od=0 then
                                        // expr.L
                                        AnEXTEN |= EXT_IISPOSL; // Long outer displacement
                                        AMn = MEMPOST;
+                                       tok++;
 
                                        // Defined, absolute values from $FFFF8000..$00007FFF get
                                        // optimized to absolute short
-                                       if (optim_flags[OPT_ABS_SHORT]
+                                       if (CHECK_OPTS(OPT_ABS_SHORT)
                                                && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-                                               && ((AnEXVAL + 0x8000) < 0x10000))
+                                               && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
                                        {
                                                AnEXTEN |= EXT_IISPOSW; // Word outer displacement
                                                AMn = MEMPOST;
                                else
                                        return error("Closing parenthesis missing on addressing mode");
 
-                               IS_SUPPRESSEDn:
+IS_SUPPRESSEDn:
 
                                // Check for od
                                if (*tok == ')')        // ([bd,An/PC],Xn)
 
                                expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM);
 
-                               if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0))
+                               if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0))
                                {
                                        // od=0 so optimise it out
                                        AMn = MEMPOST;           // let's say it's ([bd,An],Xn,od) with od=0 then
                                                AMn = MEMPOST;
                                                tok++;
                                        }
-
                                        // Defined, absolute values from $FFFF8000..$00007FFF get
                                        // optimized to absolute short
-                                       else if (optim_flags[OPT_BASE_DISP]
+                                       else if (CHECK_OPTS(OPT_BASE_DISP)
                                                && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-                                               && ((AnEXVAL + 0x8000) < 0x10000))
+                                               && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
                                        {
                                                //AnEXTEN|=EXT_IISNOIW; // Word outer displacement with IS suppressed
                                                warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
 
                                // Check for size
                                {
-                                       // ([bd,An/PC],Xn.W/L...)
-                                       switch ((int)*tok)
-                                       {
-                                       // Index reg size: <empty> | .W | .L
-                                       case DOTW:
-                                               tok++;
-                                               break;
-                                       default:
-                                               break;
-                                       case DOTL:
-                                               tok++;
-                                               AnEXTEN |= EXT_L;
-                                               break;
-                                       case DOTB:
-                                               // .B not allowed here...
-                                               goto badmode;
-                                       }
+                               // ([bd,An/PC],Xn.W/L...)
+                               switch ((int)*tok)
+                               {
+                               // Index reg size: <empty> | .W | .L
+                               case DOTW:
+                                       tok++;
+                                       break;
+                               default:
+                                       break;
+                               case DOTL:
+                                       tok++;
+                                       AnEXTEN |= EXT_L;
+                                       break;
+                               case DOTB:
+                                       // .B not allowed here...
+                                       goto badmode;
+                               }
                                }
 
                                // Check for scale
                                if (*tok == '*')                        // ([bd,An/PC],Xn*...)
-                               {
+                               {                           // scale: *1, *2, *4, *8
                                        tok++;
 
-                                       if (*tok == CONST)      // TODO: I suppose the scale is stored as a CONST and nothing else? So prolly the if is not needed?
-                                               tok++;
-
-                                       switch ((int)*tok++)
+                                       if (*tok == SYMBOL)
                                        {
-                                       case 1:
-                                               break;
-                                       case 2:
-                                               AnEXTEN |= EXT_TIMES2;
-                                               break;
-                                       case 4:
-                                               AnEXTEN |= EXT_TIMES4;
-                                               break;
-                                       case 8:
-                                               AnEXTEN |= EXT_TIMES8;
-                                               break;
-                                       default:
+                                               if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+                                                       return error("scale factor expression must evaluate");
+                                               switch (AnEXVAL)
+                                               {
+                                               case 1:
+                                                       break;
+                                               case 2:
+                                                       AnIXSIZ |= TIMES2;
+                                                       break;
+                                               case 4:
+                                                       AnIXSIZ |= TIMES4;
+                                                       break;
+                                               case 8:
+                                                       AnIXSIZ |= TIMES8;
+                                                       break;
+                                               default:
+                                                       goto badmode;
+                                               }
+                                       }
+                                       else if (*tok++ != CONST || *tok > 8)
                                                goto badmode;
+                                       else
+                                       {
+                                               switch ((int)*tok++)
+                                               {
+                                               case 1:
+                                                       break;
+                                               case 2:
+                                                       AnIXSIZ |= TIMES2;
+                                                       break;
+                                               case 4:
+                                                       AnIXSIZ |= TIMES4;
+                                                       break;
+                                               case 8:
+                                                       AnIXSIZ |= TIMES8;
+                                                       break;
+                                               default:
+                                                       goto badmode;
+                                               }
                                        }
                                }
 
                                //Check for ]
                                if (*tok != ']')
                                        return error("Expected closing bracket ]");
-
                                tok++;                  // Eat the bracket
 
                                //Check for od
                                        tok++;
                                        goto AnOK;
                                }
-                               else if (*tok++!=',')
+                else if (*tok++ != ',')
                                        return error("comma expected after ]");
 
-                               WARNING(Put symbol and constant checks here!)
-
-                               if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
-                                       goto badmode;
-
-                               if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0))
+                               if (*tok == SYMBOL || *tok == CONST)
                                {
-                                       // od=0 so optimise it out
-                                       AMn = MEMPRE;            // let's say it's ([bd,An],Xn,od) with od=0 then
-                                       AnEXTEN |= EXT_IISPRE0; // No outer displacement
-                                       tok++;
-                                       goto AnOK;
+                                       if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
+                                               goto badmode;
+
+                                       if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0) && (AnEXATTR & DEFINED))
+                                       {
+                                               // od=0 so optimise it out
+                                               AMn = MEMPRE;            // let's say it's ([bd,An],Xn,od) with od=0 then
+                                               AnEXTEN |= EXT_IISPRE0; // No outer displacement
+                                               tok++;
+                                               goto AnOK;
+                                       }
                                }
 
                                // ([bd,An/PC,Xn],od)
                                else
                                {
                                        // expr.[W]
-                                       //tok++;
-
-                                       AnEXTEN |= EXT_IISPREW;
                                        AMn = MEMPRE;
+                                       int expr_size = EXT_IISPREW; // Assume we have a .w value
 
-                    // Is .W forced here?
-                                       if (*tok == DOTW)
+                                       if ((AnEXVAL + 0x8000) > 0x10000)
                                        {
-                                               tok++;
+                                               // Long value, so mark it as such for now
+                                               expr_size = EXT_IISPREL;
+
+                                               // Defined, absolute values from $FFFF8000..$00007FFF
+                                               // get optimized to absolute short
+                        if (CHECK_OPTS(OPT_BASE_DISP)
+                                                       && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
+                                                       && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
+                                               {
+                                                       expr_size = EXT_IISPREW;
+                                                       warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+                                               }
                                        }
 
-                                       // Defined, absolute values from $FFFF8000..$00007FFF get optimized
-                                       // to absolute short
-                                       else if (optim_flags[OPT_BASE_DISP]
-                                               && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-                                               && ((AnEXVAL + 0x8000) < 0x10000))
+                                       AnEXTEN |= expr_size; // Assume we have a .w value
+
+                                       // Is .W forced here?
+                                       if (*tok == DOTW)
                                        {
-                                               AnEXTEN |= EXT_IISPREW;
-                                               warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+                                               tok++;
+
+                                               if (expr_size == EXT_IISPREL)
+                                                       return error("outer displacement value does not fit in .w size");
                                        }
                                }
 
                                }
                                else if (*tok == ')')
                                {
-                                       AMn = PCDISP;                                // expr(PC)
+                                       AMn = PCDISP;             // expr(PC)
                                        tok++;
                                        goto AnOK;
                                }
                // After a cache keyword only a comma or EOL is allowed
                if ((*tok != ',') && (*tok != EOL))
                        return ERROR;
-
                goto AnOK;
        }
        else if ((*tok >= KW_SFC) && (*tok <= KW_CRP))
@@ -855,9 +1021,9 @@ CHK_FOR_DISPn:
 
                        // Defined, absolute values from $FFFF8000..$00007FFF get optimized
                        // to absolute short
-                       if (optim_flags[OPT_ABS_SHORT]
+                       if (CHECK_OPTS(OPT_ABS_SHORT)
                                && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-                               && ((AnEXVAL + 0x8000) < 0x10000))
+                               && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
                        {
                                AMn = ABSW;
 
@@ -903,6 +1069,7 @@ CHK_FOR_DISPn:
                        AMn = PCINDEXED;
                        goto AMn_IXN;
                }
+
                goto badmode;
        }