X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=44e08d954a9fa7002fe7ae92ee38aaf46d3c7f88;hp=549f131ea42630df7869042f42bcb3fbd72f8df8;hb=cadc95fb537cf4a3a1fa3be0e108ee52c5cef84d;hpb=d812346ecf7309ee3fb88a8dd1f4bca033121ad5 diff --git a/parmode.h b/parmode.h index 549f131..44e08d9 100644 --- a/parmode.h +++ b/parmode.h @@ -55,6 +55,7 @@ // ([bd,PC,Xn[.siz][*scale]],od) else if (*tok == '(') { + int ea_PC = 0; // Flag that let us know if we have PC or An relative ea tok++; if ((*tok >= KW_A0) && (*tok <= KW_A7)) @@ -364,15 +365,15 @@ AMn_IXN: // Handle any indexed (tok -> a comma) if (*tok == ',') tok++; - //else - // return error("Comma expected after base displacement"); } - // Check for address register or PC, suppress base register - // otherwise + // Check for address register or PC, + // suppress base register otherwise if (*tok == KW_PC) { // ([bd,PC,... + ea_PC = 3; // Set flag in order to set proper value to AMn below when we can make a decision on ea + // (why "3"? Well, MEMPOST is 3 away from PCMPOST, etc. Have a look at amode.h) AnREG = (7 << 3) | 3; // PC is special case - stuff 011 to register field and 111 to the mode field tok++; } @@ -488,7 +489,7 @@ AMn_IXN: // Handle any indexed (tok -> a comma) { // Xn and od are non existent, get out of jail free card tok++; - AMn = MEMPRE; // ([bc,An,Xn],od) with no Xn and od + AMn = MEMPRE + ea_PC; // ([bc,An,Xn],od) with no Xn and od AnEXTEN |= EXT_IS | EXT_IISPREN; // Suppress Xn and od goto AnOK; } @@ -517,7 +518,7 @@ AMn_IXN: // Handle any indexed (tok -> a comma) goto IS_SUPPRESSEDn; // https://xkcd.com/292/ - what does he know anyway? } - // Check for size + // Check for Xn size // ([bd,An/PC],Xn.W/L...) switch ((int)*tok) { @@ -525,8 +526,6 @@ AMn_IXN: // Handle any indexed (tok -> a comma) case DOTW: tok++; break; - default: - break; case DOTL: AnEXTEN |= EXT_L; tok++; @@ -534,9 +533,11 @@ AMn_IXN: // Handle any indexed (tok -> a comma) case DOTB: // .B not allowed here... goto badmode; + default: + break; } - // Check for scale + // Check for Xn scale if (*tok == '*') // ([bd,An/PC],Xn*...) { // scale: *1, *2, *4, *8 tok++; @@ -545,54 +546,39 @@ AMn_IXN: // Handle any indexed (tok -> a comma) { if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); - - switch (scaleval) - { - 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) - goto badmode; - else + else if (*tok == CONST) { - switch ((int)*tok++) - { - case 1: - break; - case 2: - AnIXSIZ |= TIMES2; - break; - case 4: - AnIXSIZ |= TIMES4; - break; - case 8: - AnIXSIZ |= TIMES8; - break; - default: - goto badmode; - } - + scaleval = (int)*tok++; tok++; // Take into account that constants are 64-bit } + else + goto badmode; + + switch (scaleval) + { + case 1: + break; + case 2: + AnIXSIZ |= TIMES2; + break; + case 4: + AnIXSIZ |= TIMES4; + break; + case 8: + AnIXSIZ |= TIMES8; + break; + default: + goto badmode; + } + } // Check for od if (*tok == ')') // ([bd,An/PC],Xn) { // od is non existent, get out of jail free card - AMn = MEMPOST; // let's say it's ([bd,An],Xn,od) with od=0 then + AMn = MEMPOST + ea_PC; // let's say it's ([bd,An],Xn,od) with od=0 then AnEXTEN |= EXT_IISPOSN; // No outer displacement tok++; goto AnOK; @@ -609,20 +595,20 @@ CHECKODn: if (CHECK_OPTS(OPT_020_DISP) && (AnEXATTR & DEFINED) && (AnEXVAL == 0)) { // od = 0 so optimise it out - AMn = MEMPOST; // let's say it's ([bd,An],Xn,od) with od=0 then - AnEXTEN |= EXT_IISPOSN; // No outer displacement + AMn = MEMPOST + ea_PC; // let's say it's ([bd,An],Xn,od) with od=0 then + AnEXTEN |= EXT_IISPOSN; // No outer displacement tok++; goto AnOK; } // ([bd,An/PC],Xn,od) - // Is .W forced here? + // Is .W forced here? if (*tok == DOTW) { tok++; // od[.W] AnEXTEN |= EXT_IISPOSW; // Word outer displacement - AMn = MEMPOST; + AMn = MEMPOST + ea_PC; } else { @@ -630,13 +616,15 @@ CHECKODn: if (*tok == DOTL) tok++; // Doesn't matter, we're going for .L anyway + WORD od_ea = 0; + // od.L if (!(AnEXTEN & EXT_BS)) - AnEXTEN |= EXT_IISPOSL; // Long outer displacement + od_ea = EXT_IISPOSL; // Long outer displacement else { // bd is suppressed, so sticking the od size in bd - AnEXTEN |= EXT_BDSIZEL; + od_ea = EXT_BDSIZEL; // And of course the expression has to be copied to // AnBEXPR instead of AnEXPR. Yay. :-/ int i = 0; @@ -650,7 +638,7 @@ CHECKODn: AnBEXPR[i] = 'E'; } - AMn = MEMPOST; + AMn = MEMPOST + ea_PC; // Defined, absolute values from $FFFF8000..$00007FFF get // optimized to absolute short @@ -658,11 +646,12 @@ CHECKODn: && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) { - AnEXTEN |= EXT_IISPOSW; // Word outer displacement - AMn = MEMPOST; + od_ea = EXT_IISPOSW; // Word outer displacement + AMn = MEMPOST + ea_PC; if (optim_warn_flag) warn("absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short"); } + AnEXTEN |= od_ea; } // Check for final closing parenthesis @@ -680,7 +669,7 @@ IS_SUPPRESSEDn: if (*tok == ')') // ([bd,An/PC],Xn) { // od is non existent, get out of jail free card - AMn = MEMPOST; // let's say it's ([bd,An],Xn,od) with od=0 then + AMn = MEMPOST + ea_PC; // let's say it's ([bd,An],Xn,od) with od=0 then AnEXTEN |= EXT_IISNOIN; // No outer displacement tok++; goto AnOK; @@ -698,7 +687,7 @@ IS_SUPPRESSEDn: if (CHECK_OPTS(OPT_020_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 + ea_PC; // let's say it's ([bd,An],Xn,od) with od=0 then AnEXTEN |= EXT_IISNOIN; // No outer displacement tok++; goto AnOK; @@ -709,19 +698,19 @@ IS_SUPPRESSEDn: { // expr.L tok++; - AMn = MEMPOST; + AMn = MEMPOST + ea_PC; AnEXTEN |= EXT_IISNOIL; // Long outer displacement with IS suppressed } else { // expr[.W][] AnEXTEN |= EXT_IISNOIW; // Word outer displacement with IS suppressed - AMn = MEMPRE; + AMn = MEMPRE + ea_PC;; if (*tok == DOTW) { //AnEXTEN|=EXT_IISNOIW; // Word outer displacement - AMn = MEMPOST; + AMn = MEMPOST + ea_PC; tok++; } // Defined, absolute values from $FFFF8000..$00007FFF get @@ -846,8 +835,7 @@ IS_SUPPRESSEDn: if (*tok == ')') // ([bd,An/PC,Xn]... { // od is non existent, get out of jail free card - //AnEXVAL=0; // zero outer displacement - AMn = MEMPRE; // let's say it's ([bd,An,Xn],od) with od suppressed then + AMn = MEMPRE + ea_PC; // let's say it's ([bd,An,Xn],od) with od suppressed then AnEXTEN |= EXT_IISPREN; // No outer displacement tok++; goto AnOK; @@ -863,7 +851,7 @@ IS_SUPPRESSEDn: if (CHECK_OPTS(OPT_020_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 + AMn = MEMPRE + ea_PC; // let's say it's ([bd,An],Xn,od) with od=0 then AnEXTEN |= EXT_IISPRE0; // No outer displacement tok++; goto AnOK; @@ -874,14 +862,14 @@ IS_SUPPRESSEDn: if (*tok == DOTL) { // expr.L - AMn = MEMPRE; + AMn = MEMPRE + ea_PC; tok++; AnEXTEN |= EXT_IISPREL; } else { // expr.[W] - AMn = MEMPRE; + AMn = MEMPRE + ea_PC; int expr_size = EXT_IISPREW; // Assume we have a .w value if ((AnEXVAL + 0x8000) > 0x10000) @@ -972,7 +960,6 @@ IS_SUPPRESSEDn: // Our expression is techically a base displacement, // so let's copy it to the relevant variables so // eagen0.c can pick it up properly - //AnBEXPR = AnEXPR; AnBEXVAL = AnEXVAL; AnBEXATTR = AnEXATTR; @@ -999,7 +986,7 @@ IS_SUPPRESSEDn: } } // Check for scale - if (*tok == '*') // ([bd,An/PC],Xn*...) + if (*tok == '*') // (d16,An,Dn[.size][*scale]) { // scale: *1, *2, *4, *8 tok++;