X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=89d53a7da60ad32e612259f185b66660171c30c3;hp=e623084b252fb9928d33d7dd9170fc8a3c4b22ea;hb=05d0350b35a6a6b255cb2a3fab7796f5d4ee4d02;hpb=da0013df9438aa14e478544307e925462d398cb3 diff --git a/parmode.h b/parmode.h index e623084..89d53a7 100644 --- a/parmode.h +++ b/parmode.h @@ -127,6 +127,7 @@ { if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) return error("scale factor expression must evaluate"); + switch (AnEXVAL) { case 1: @@ -142,7 +143,7 @@ break; default: goto badmode; - } + } } else if (*tok++ != CONST || *tok > 8) goto badmode; @@ -228,7 +229,7 @@ } if (*tok == '*') - { // scale: *1, *2, *4, *8 + { // scale: *1, *2, *4, *8 tok++; if (*tok == SYMBOL) @@ -290,29 +291,25 @@ tok++; 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) { AnEXTEN|=EXT_BDSIZE0; - //tok++; - //tok--; //Rewind tok since expr advances it forward } 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,... + { // ([bd.l,... AnEXTEN|=EXT_BDSIZEL; tok++; } else - { // ([bd[.w],... or ([bd,... + { // ([bd[.w],... or ([bd,... // Is .W forced here? if (*tok == DOTW) { @@ -323,7 +320,7 @@ { // 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)) { @@ -488,8 +485,8 @@ { //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 @@ -522,21 +519,22 @@ { if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) return error("scale factor expression must evaluate"); + switch (AnEXVAL) - { - case 1: - break; - case 2: + { + case 1: + break; + case 2: AnIXSIZ |= TIMES2; - break; - case 4: + break; + case 4: AnIXSIZ |= TIMES4; - break; - case 8: + break; + case 8: AnIXSIZ |= TIMES8; - break; - default: - goto badmode; + break; + default: + goto badmode; } } else if (*tok++ != CONST || *tok > 8) @@ -580,7 +578,7 @@ 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 @@ -598,7 +596,7 @@ // 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)) { @@ -651,7 +649,7 @@ 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 @@ -682,7 +680,7 @@ // 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)) { @@ -803,15 +801,15 @@ tok++; goto AnOK; } - else if (*tok++!=',') + else if (*tok++ != ',') return error("comma expected after ]"); - WARNING(Put symbol and constant checks here!) - + if (*tok == SYMBOL || *tok == CONST) + { 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) && (AnEXATTR & DEFINED)) { // od=0 so optimise it out AMn = MEMPRE; // let's say it's ([bd,An],Xn,od) with od=0 then @@ -819,6 +817,7 @@ tok++; goto AnOK; } + } // ([bd,An/PC,Xn],od) if (*tok == DOTL) @@ -831,28 +830,38 @@ else { // expr.[W] - //tok++; + int expr_size; - AnEXTEN |= EXT_IISPREW; AMn = MEMPRE; + 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 - else if (optim_flags[OPT_BASE_DISP] + if (CHECK_OPTS(OPT_BASE_DISP) && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) && ((AnEXVAL + 0x8000) < 0x10000)) { - AnEXTEN |= EXT_IISPREW; + expr_size = EXT_IISPREW; warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short"); } } + AnEXTEN |= expr_size; // Assume we have a .w value + + // Is .W forced here? + if (*tok == DOTW) + { + tok++; + if (expr_size == EXT_IISPREL) + return error("outer displacement value does not fit in .w size"); + } + + } + // Check for final closing parenthesis if (*tok == ')') { @@ -911,7 +920,7 @@ } else if (*tok == ')') { - AMn = PCDISP; // expr(PC) + AMn = PCDISP; // expr(PC) tok++; goto AnOK; } @@ -1004,7 +1013,7 @@ 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)) { @@ -1052,6 +1061,7 @@ CHK_FOR_DISPn: AMn = PCINDEXED; goto AMn_IXN; } + goto badmode; }