X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=955fade88621de27095dad9fba6f613c8498f76f;hp=20f0973becf494dc445bbc689c45cb36c28882d9;hb=HEAD;hpb=8a5d76b0e6c7433cdbdf3d612da5c209516cb594;ds=sidebyside diff --git a/parmode.h b/parmode.h index 20f0973..27863d0 100644 --- a/parmode.h +++ b/parmode.h @@ -1,7 +1,7 @@ // -// RMAC - Reboot's Macro Assembler for all Atari computers +// RMAC - Renamed Macro Assembler for all Atari computers // PARMODE.C - Addressing Modes Parser Include -// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -17,12 +17,12 @@ // Dn // An // # expression - if ((*tok >= KW_D0) && (*tok <= KW_D7)) + if ((*tok >= REG68_D0) && (*tok <= REG68_D7)) { AMn = DREG; AnREG = *tok++ & 7; } - else if ((*tok >= KW_A0) && (*tok <= KW_A7)) + else if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { AMn = AREG; AnREG = *tok++ & 7; @@ -37,10 +37,6 @@ AMn = IMMED; } - // Small problem with this is that the opening parentheses might be an - // expression that's part of a displacement; this code will falsely flag - // that as an error. - // (An) // (An)+ // (An,Xn[.siz][*scale]) @@ -55,9 +51,10 @@ // ([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)) + if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { AnREG = *tok++ & 7; @@ -79,9 +76,9 @@ AMn = AINDEXED; goto AMn_IX0; // Handle ",Xn[.siz][*scale])" } - else if ((*tok >= KW_D0) && (*tok <= KW_D7)) + else if ((*tok >= REG68_D0) && (*tok <= REG68_D7)) { - //Since index register isn't used here, store register number in this field + // Since index register isn't used here, store register number in this field AnIXREG = *tok++ & 7; // (Dn) if (*tok == ')') @@ -197,13 +194,15 @@ // 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 + AnEXTEN |= EXT_FULLWORD; // Definitely using full extension format, so set bit 8 + AnEXTEN |= EXT_BS; // Base displacement null - suppressed + AnEXTEN |= AnIXREG << 12; goto CHECKODn; } else return error("unhandled so far"); } - else if (*tok == KW_PC) + else if (*tok == REG68_PC) { // (PC,Xn[.siz][*scale]) tok++; AMn = PCINDEXED; @@ -211,17 +210,17 @@ // Common index handler; enter here with 'tok' pointing at the // comma. - AMn_IX0: // Handle indexed with missing expr +AMn_IX0: // Handle indexed with missing expr AnEXVAL = 0; AnEXATTR = ABS | DEFINED; - AMn_IXN: // Handle any indexed (tok -> a comma) +AMn_IXN: // Handle any indexed (tok -> a comma) if (*tok++ != ',') goto badmode; - if (*tok < KW_D0 || *tok > KW_A7) + if (*tok < REG68_D0 || *tok > REG68_A7) goto badmode; AnIXREG = *tok++ & 15; @@ -249,6 +248,7 @@ { if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); + switch (scaleval) { case 1: @@ -318,18 +318,21 @@ else { expr(AnBEXPR, &AnBEXVAL, &AnBEXATTR, &AnESYM); - if (CHECK_OPTS(OPT_BASE_DISP) && AnBEXVAL == 0 && AnEXATTR != 0) + + if (CHECK_OPTS(OPT_020_DISP) && (AnBEXVAL == 0) && (AnEXATTR != 0)) { - // bd=0 so let's optimise it out - AnEXTEN|=EXT_BDSIZE0; + // bd = 0 so let's optimise it out + AnEXTEN |= EXT_BDSIZE0; } else if (*tok == DOTL) - { // ([bd.l,... - AnEXTEN |= EXT_BDSIZEL; - tok++; + { + // ([bd.l,... + AnEXTEN |= EXT_BDSIZEL; + tok++; } else - { // ([bd[.w],... or ([bd,... + { + // ([bd[.w],... or ([bd,... // Is .W forced here? if (*tok == DOTW) { @@ -338,14 +341,16 @@ } else { - // Defined, absolute values from $FFFF8000..$00007FFF get optimized - // to absolute short - if (CHECK_OPTS(OPT_ABS_SHORT) + // Defined, absolute values from $FFFF8000..$00007FFF + // get optimized to absolute short + if (CHECK_OPTS(OPT_020_DISP) && ((AnBEXATTR & (TDB | DEFINED)) == DEFINED) && (((uint32_t)AnBEXVAL + 0x8000) < 0x10000)) { AnEXTEN |= EXT_BDSIZEW; - warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short"); + + if (optim_warn_flag) + warn("o5: absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short"); } else { @@ -356,24 +361,24 @@ if (*tok == ',') tok++; - //else - // return error("Comma expected after base displacement"); } // Check for address register or PC, suppress base register // otherwise - if (*tok == KW_PC) + if (*tok == REG68_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++; } - else if ((*tok >= KW_A0) && (*tok <= KW_A7)) + else if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { // ([bd,An,... - AnREG = (6 << 3) | *tok & 7; + AnREG = (6 << 3) | (*tok & 7); tok++; } - else if ((*tok >= KW_D0) && (*tok <= KW_D7)) + else if ((*tok >= REG68_D0) && (*tok <= REG68_D7)) { // ([bd,Dn,... AnREG = (6 << 3); @@ -383,24 +388,22 @@ tok++; // Check for size + // ([bd,An/PC],Xn.W/L...) + switch ((int)*tok) { - // ([bd,An/PC],Xn.W/L...) - switch ((int)*tok) - { - // Index reg size: | .W | .L - case DOTW: - tok++; - break; - default: - break; - case DOTL: - AnEXTEN |= EXT_L; - tok++; - break; - case DOTB: - // .B not allowed here... - goto badmode; - } + // Index reg size: | .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 @@ -463,8 +466,7 @@ else if (*tok == ']') { // PC and Xn is suppressed - AnREG = 6 << 3; // stuff 110 to mode field - //AnEXTEN|=EXT_BS|EXT_IS; + AnREG = 6 << 3; // stuff 110b to mode field AnEXTEN |= EXT_BS; } else @@ -475,16 +477,16 @@ // At a crossroads here. We can accept either ([bd,An/PC],... or ([bd,An/PC,Xn*scale],... if (*tok == ']') { - //([bd,An/PC],Xn,od) + // ([bd,An/PC],Xn,od) // Check for Xn tok++; if (*tok == ')') { - //Xn and od are non existent, get out of jail free card + // 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 + AMn = MEMPRE + ea_PC; // ([bc,An,Xn],od) with no Xn and od + AnEXTEN |= EXT_IS | EXT_IISPREN; // Suppress Xn and od goto AnOK; } else if (*tok != ',') @@ -492,13 +494,13 @@ else tok++; // eat the comma - if ((*tok >= KW_A0) && (*tok <= KW_A7)) + if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { AnIXREG = ((*tok & 7) << 12); AnEXTEN |= EXT_A; tok++; } - else if ((*tok >= KW_D0) && (*tok <= KW_D7)) + else if ((*tok >= REG68_D0) && (*tok <= REG68_D7)) { AnEXTEN |= ((*tok & 7) << 12); AnEXTEN |= EXT_D; @@ -506,34 +508,32 @@ } else { - //No index found, suppress it + // 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? } - // Check for size + // Check for Xn size + // ([bd,An/PC],Xn.W/L...) + switch ((int)*tok) { - // ([bd,An/PC],Xn.W/L...) - switch ((int)*tok) - { - // Index reg size: | .W | .L - case DOTW: - tok++; - break; - default: - break; - case DOTL: - AnEXTEN |= EXT_L; - tok++; - break; - case DOTB: - // .B not allowed here... - goto badmode; - } + // Index reg size: | .W | .L + case DOTW: + tok++; + break; + case DOTL: + AnEXTEN |= EXT_L; + tok++; + break; + 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++; @@ -542,54 +542,39 @@ { 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; @@ -599,50 +584,72 @@ else tok++; // eat the comma - CHECKODn: +CHECKODn: if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) goto badmode; - if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0)) + 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 + // od = 0 so optimise it out + 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) - if (*tok == DOTL) + // Is .W forced here? + if (*tok == DOTW) { - // expr.L - AnEXTEN |= EXT_IISPOSL; // Long outer displacement - AMn = MEMPOST; tok++; + // od[.W] + AnEXTEN |= EXT_IISPOSW; // Word outer displacement + AMn = MEMPOST + ea_PC; + } + else + { + // Is .L forced here? + if (*tok == DOTL) + tok++; // Doesn't matter, we're going for .L anyway + + WORD od_ea = 0; + + // od.L + if (!(AnEXTEN & EXT_BS)) + od_ea = EXT_IISPOSL; // Long outer displacement + else + { + // bd is suppressed, so sticking the od size in bd + od_ea = EXT_BDSIZEL; + // And of course the expression has to be copied to + // AnBEXPR instead of AnEXPR. Yay. :-/ + int i = 0; + + do + { + AnBEXPR[i] = AnEXPR[i]; + i++; + } + while (AnEXPR[i] != 'E'); + + AnBEXPR[i] = 'E'; + } + + AMn = MEMPOST + ea_PC; // Defined, absolute values from $FFFF8000..$00007FFF get // optimized to absolute short - if (CHECK_OPTS(OPT_ABS_SHORT) + if (CHECK_OPTS(OPT_020_DISP) && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) { - AnEXTEN |= EXT_IISPOSW; // Word outer displacement - AMn = MEMPOST; - warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short"); - } - - } - else - { - // expr[.W] - AnEXTEN |= EXT_IISPOSW; // Word outer displacement - AMn = MEMPOST; + od_ea = EXT_IISPOSW; // Word outer displacement + AMn = MEMPOST + ea_PC; - // Is .W forced here? - if (*tok == DOTW) - { - tok++; + if (optim_warn_flag) + warn("o5: absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short"); } + AnEXTEN |= od_ea; } // Check for final closing parenthesis @@ -660,7 +667,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; @@ -675,10 +682,10 @@ IS_SUPPRESSEDn: expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM); - if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0)) + 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; @@ -689,29 +696,30 @@ 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 // optimized to absolute short - else if (CHECK_OPTS(OPT_BASE_DISP) + else if (CHECK_OPTS(OPT_020_DISP) && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) && (((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"); + if (optim_warn_flag) + warn("o5: outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short"); } } @@ -726,16 +734,16 @@ IS_SUPPRESSEDn: } else if (*tok == ',') { - *tok++; // ([bd,An,Xn.size*scale],od) + tok++; // ([bd,An,Xn.size*scale],od) - //Check for Xn - if ((*tok >= KW_A0) && (*tok <= KW_A7)) + // Check for Xn + if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { AnEXTEN |= ((*tok & 7) << 12); AnEXTEN |= EXT_A; tok++; } - else if ((*tok >= KW_D0) && (*tok <= KW_D7)) + else if ((*tok >= REG68_D0) && (*tok <= REG68_D7)) { AnEXTEN |= ((*tok & 7) << 12); AnEXTEN |= EXT_D; @@ -743,35 +751,34 @@ IS_SUPPRESSEDn: } // Check for size - { // ([bd,An/PC],Xn.W/L...) switch ((int)*tok) - { - // Index reg size: | .W | .L - case DOTW: - tok++; - break; - default: - break; - case DOTL: - tok++; - AnEXTEN |= EXT_L; - break; - case DOTB: - // .B not allowed here... - goto badmode; - } + { + // Index reg size: | .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 + if (*tok == '*') // ([bd,An/PC],Xn*...) + { // scale: *1, *2, *4, *8 tok++; if (*tok == SYMBOL) { if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); + switch (scaleval) { case 1: @@ -826,8 +833,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; @@ -840,10 +846,10 @@ IS_SUPPRESSEDn: if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) goto badmode; - if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXVAL == 0) && (AnEXATTR & DEFINED)) + 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; @@ -854,14 +860,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) @@ -871,12 +877,14 @@ IS_SUPPRESSEDn: // Defined, absolute values from $FFFF8000..$00007FFF // get optimized to absolute short - if (CHECK_OPTS(OPT_BASE_DISP) + if (CHECK_OPTS(OPT_020_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"); + + if (optim_warn_flag) + warn("o5: outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short"); } } @@ -907,14 +915,72 @@ IS_SUPPRESSEDn: else { // (expr... + // We have an aliasing problem here, because a couple of differenct cases end up here: + // (a0), 0(a0,d0), (-288,a0,d0.l) can be easily detected and parsed. + // But what about (160*150)+4(A1)? With the old scheme, i.e. skip past the left parenthesis and try to parse the inside + // tokens will only parse (160*150) and everything else is assumed that it's part of the ea, i.e. +4(a1). This would produce + // an error since the parser would expect (a1). The way to work around this used to be to wrap all the displacement in + // parenthesis, ((160*150)+4)(a1). But that's something the user really doesn't want to think about. + // What we can do is to peek ahead in the token stream and see if we have something that reminds of an expression + // (i.e. no register tokens or commas) until we hit an open parenthesis plus a register (parenthesis balance during the scan + // has to be maintained of course, otherwise we might be led into false conclusions). + TOKEN *look_ahead = tok; + int parenthesis_level = 1; // We count the opening parenthesis so we're not at level 0 + int this_is_an_expression = 0; + while (1) + { + if (*look_ahead == EOL) + { + // Something really bad happened, abort + return error("reached end of line while parsing expression"); + } + if (*look_ahead == '(') + { + if (parenthesis_level == 0) + { + if (look_ahead[1] == EOL) + { + return error("reached end of line while parsing expression"); + } + if ((look_ahead[1] >= REG68_A0 && look_ahead[1] <= REG68_A7) || look_ahead[1] == REG68_PC) + { + tok--; // Rewind token pointer to start of parenthesis + this_is_an_expression = 1; + break; + } + } + parenthesis_level++; + look_ahead++; + continue; + } + if (*look_ahead == ',' || (*look_ahead >= REG68_A0 && *look_ahead <= REG68_A7)) + { + // Nope, this is a different case, abort + break; + } + if (*look_ahead == ')') + { + parenthesis_level--; + if (parenthesis_level < 0) return error("unbalanced parenthesis in expression"); + look_ahead++; + continue; + } + if (*look_ahead == ACONST||*look_ahead==FCONST) + { + look_ahead += 3; // Skip all the data associated with ACONST + continue; + } + + look_ahead++; + } + if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) return ERROR; // It could be that this is really just an expression prefixing a // register as a displacement... - if (*tok == ')') + if (*tok == '(') { - tok++; goto CHK_FOR_DISPn; } @@ -922,13 +988,122 @@ IS_SUPPRESSEDn: if (*tok++ != ',') goto badmode; - if ((*tok >= KW_A0) && (*tok <= KW_A7)) + if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { AnREG = *tok & 7; tok++; if (*tok == ',') { + // Check if we're actually doing d8(An,Dn) or + // (d16,An,Dn[.size][*scale]) + // TODO: not a very clear cut case from what I can think. + // The only way to distinguish between the two is to check + // AnEXVAL and see if it's >127 or <-128. But this doesn't + // work if AnEXVAL isn't defined yet. For now we fall + // through to d8(An,Dn) but this might bite us in the arse + // during fixups... + if ((AnEXATTR & DEFINED) && (AnEXVAL + 0x80 > 0x100)) + { + // We're going to treat it as a full extension format + // with no indirect access and no base displacement/ + // index register suppression + AnEXTEN |= EXT_FULLWORD; // Definitely using full extension format, so set bit 8 + AnEXTEN |= EXT_IISPRE0; // No Memory Indirect Action + AnEXTEN |= EXT_BDSIZEL; // Base Displacement Size Long + tok++; // Get past the comma + + // Our expression is techically a base displacement, + // so let's copy it to the relevant variables so + // eagen0.c can pick it up properly + AnBEXVAL = AnEXVAL; + AnBEXATTR = AnEXATTR; + + if ((*tok >= REG68_D0) && (*tok <= REG68_D7)) + { + AnEXTEN |= ((*tok++) & 7) << 12; + // Check for size + { + switch ((int)*tok) + { + // Index reg size: | .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 == '*') // (d16,An,Dn[.size][*scale]) + { // scale: *1, *2, *4, *8 + tok++; + + if (*tok == SYMBOL) + { + 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 + { + 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++; // Take into account that constants are 64-bit + } + } + + if (*tok++ != ')') + return error("Closing parenthesis missing on addressing mode"); + + // Let's say that this is the closest to our case + AMn = MEMPOST; + goto AnOK; + } + else + goto badmode; + } + AMn = AINDEXED; goto AMn_IXN; } @@ -941,7 +1116,7 @@ IS_SUPPRESSEDn: else goto badmode; } - else if (*tok == KW_PC) + else if (*tok == REG68_PC) { if (*++tok == ',') { // expr(PC,Xn...) @@ -961,56 +1136,56 @@ IS_SUPPRESSEDn: goto badmode; } } - else if (*tok == '-' && tok[1] == '(' && ((tok[2] >= KW_A0) && (tok[2] <= KW_A7)) && tok[3] == ')') + else if (*tok == '-' && tok[1] == '(' && ((tok[2] >= REG68_A0) && (tok[2] <= REG68_A7)) && tok[3] == ')') { AMn = APREDEC; AnREG = tok[2] & 7; tok += 4; } - else if (*tok == KW_CCR) + else if (*tok == REG68_CCR) { AMn = AM_CCR; tok++; goto AnOK; } - else if (*tok == KW_SR) + else if (*tok == REG68_SR) { AMn = AM_SR; tok++; goto AnOK; } - else if (*tok == KW_USP) + else if (*tok == REG68_USP) { AMn = AM_USP; tok++; AnREG = 2; // Added this for the case of USP used in movec (see CREGlut in mach.c). Hopefully nothing gets broken! goto AnOK; } - else if ((*tok >= KW_IC40) && (*tok <= KW_BC40)) + else if ((*tok >= REG68_IC40) && (*tok <= REG68_BC40)) { AMn = CACHES; - AnREG = *tok++ - KW_IC40; + AnREG = *tok++ - REG68_IC40; // 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)) + else if ((*tok >= REG68_SFC) && (*tok <= REG68_CRP)) { AMn = CREG; - AnREG = (*tok++) - KW_SFC; + AnREG = (*tok++) - REG68_SFC; goto AnOK; } - else if ((*tok >= KW_FP0) && (*tok <= KW_FP7)) + else if ((*tok >= REG68_FP0) && (*tok <= REG68_FP7)) { AMn = FREG; AnREG = (*tok++ & 7); } - else if ((*tok >= KW_FPIAR) && (*tok <= KW_FPCR)) + else if ((*tok >= REG68_FPIAR) && (*tok <= REG68_FPCR)) { AMn = FPSCR; - AnREG = (1 << ((*tok++) - KW_FPIAR + 10)); + AnREG = (1 << ((*tok++) - REG68_FPIAR + 10)); } // expr // expr.w @@ -1041,23 +1216,29 @@ CHK_FOR_DISPn: // expr[.L] AMn = ABSL; - // Defined, absolute values from $FFFF8000..$00007FFF get optimized - // to absolute short - if (CHECK_OPTS(OPT_ABS_SHORT) - && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) - && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) + // .L is forced here + if (*tok == DOTL) { - AMn = ABSW; + // When PC relative is enforced, check for any symbols that aren't + // EQU'd, in this case it's an illegal mode + if ((CHECK_OPTS(OPT_PC_RELATIVE)) && ((AnEXATTR & (DEFINED | REFERENCED | EQUATED)) == (DEFINED | REFERENCED))) + return error("relocation not allowed when o30 is enabled"); - if (sbra_flag) - warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short"); + tok++; } - - // Is .L forced here? - if (*tok == DOTL) + else { - tok++; - AMn = ABSL; + // Defined, absolute values from $FFFF8000..$00007FFF get + // optimized to absolute short + if (CHECK_OPTS(OPT_ABS_SHORT) + && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) + && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) + { + AMn = ABSW; + + if (optim_warn_flag) + warn("o0: absolute value from $FFFF8000..$00007FFF optimised to absolute short"); + } } goto AnOK; @@ -1065,7 +1246,7 @@ CHK_FOR_DISPn: tok++; - if ((*tok >= KW_A0) && (*tok <= KW_A7)) + if ((*tok >= REG68_A0) && (*tok <= REG68_A7)) { AnREG = *tok++ & 7; @@ -1079,7 +1260,7 @@ CHK_FOR_DISPn: AMn = AINDEXED; goto AMn_IXN; } - else if (*tok == KW_PC) + else if (*tok == REG68_PC) { if (*++tok == ')') {