X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=549f131ea42630df7869042f42bcb3fbd72f8df8;hp=5f475dbf5a20753603b9c98b8fd2222b99ffb301;hb=d812346ecf7309ee3fb88a8dd1f4bca033121ad5;hpb=79c1a7cc204a6918d8e5b77cfa15378b719599b7 diff --git a/parmode.h b/parmode.h index 5f475db..549f131 100644 --- a/parmode.h +++ b/parmode.h @@ -1,7 +1,7 @@ // // RMAC - Reboot's 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-2020 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -9,6 +9,11 @@ // This file is included (twice) to parse two addressing modes, into slightly // different var names { + uint64_t scaleval; // Expression's value + TOKEN scaleexpr[EXPRSIZE]; // Expression + WORD scaleattr; // Expression's attribute + SYM * scaleesym; // External symbol involved in expr + // Dn // An // # expression @@ -44,10 +49,10 @@ // (d8,An,Xn[.siz][*scale]) // (d16,PC) // (d8,PC,Xn[.siz][*scale]) - // ([bd,An],Xn,od) - // ([bd,An,Xn],od) - // ([bd,PC],Xn,od) - // ([bd,PC,Xn],od) + // ([bd,An],Xn[.siz][*scale],od) + // ([bd,An,Xn[.siz][*scale]],od) + // ([bd,PC],Xn[.siz][*scale],od) + // ([bd,PC,Xn[.siz][*scale]],od) else if (*tok == '(') { tok++; @@ -76,8 +81,9 @@ } else if ((*tok >= KW_D0) && (*tok <= KW_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 == ')') { tok++; @@ -85,22 +91,20 @@ 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 + AMn = DINDL; // (Dn.l) + AnEXTEN = 1 << 11; // 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 + AMn = DINDW; + AnEXTEN = 0 << 11; // Word index size tok++; } else if (*tok == ',') @@ -125,27 +129,30 @@ if (*tok == SYMBOL) { - if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) + if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); - switch (AnEXVAL) + switch (scaleval) { case 1: break; case 2: AnIXSIZ |= TIMES2; + AnEXTEN |= 1 << 9; break; case 4: AnIXSIZ |= TIMES4; + AnEXTEN |= 2 << 9; break; case 8: AnIXSIZ |= TIMES8; + AnEXTEN |= 3 << 9; break; default: goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -155,16 +162,21 @@ break; case 2: AnIXSIZ |= TIMES2; + AnEXTEN |= 1 << 9; break; case 4: AnIXSIZ |= TIMES4; + AnEXTEN |= 2 << 9; break; case 8: AnIXSIZ |= TIMES8; + AnEXTEN |= 3 << 9; break; default: goto badmode; } + + tok++; // Take into account that constants are 64-bit } } @@ -179,12 +191,15 @@ AMn = MEMPOST; goto AnOK; } - else if (*tok==',') + 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_FULLWORD; // Definitely using full extension format, so set bit 8 + AnEXTEN |= EXT_BS; // Base displacement null - suppressed + AnEXTEN |= AnIXREG << 12; goto CHECKODn; } else @@ -198,12 +213,12 @@ // 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; @@ -234,10 +249,10 @@ if (*tok == SYMBOL) { - if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) + if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); - switch (AnEXVAL) + switch (scaleval) { case 1: break; @@ -254,7 +269,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -274,12 +289,18 @@ default: goto badmode; } + + tok++; // Take into account that constants are 64-bit } } 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 ")" @@ -290,47 +311,49 @@ 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_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++; + else if (*tok == DOTL) + { + // ([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] + // Defined, absolute values from $FFFF8000..$00007FFF + // get optimized to absolute short + if (CHECK_OPTS(OPT_020_DISP) && ((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"); + + if (optim_warn_flag) + warn("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short"); } else { @@ -355,7 +378,7 @@ } 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)) @@ -368,24 +391,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 @@ -395,9 +416,10 @@ if (*tok == SYMBOL) { - if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) + if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); - switch (AnEXVAL) + + switch (scaleval) { case 1: break; @@ -414,7 +436,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -434,6 +456,8 @@ default: goto badmode; } + + tok++; // Take into account that constants are 64-bit } } if (*tok == ']') // ([bd,Dn]... @@ -445,8 +469,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 @@ -457,16 +480,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 + AnEXTEN |= EXT_IS | EXT_IISPREN; // Suppress Xn and od goto AnOK; } else if (*tok != ',') @@ -488,31 +511,29 @@ } 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 + // ([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 @@ -522,10 +543,10 @@ if (*tok == SYMBOL) { - if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) + if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); - switch (AnEXVAL) + switch (scaleval) { case 1: break; @@ -542,7 +563,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -562,65 +583,85 @@ default: goto badmode; } + + tok++; // Take into account that constants are 64-bit } } // Check for od if (*tok == ')') // ([bd,An/PC],Xn) { - //od is non existant, get out of jail free card + // 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 AnEXTEN |= EXT_IISPOSN; // No outer displacement tok++; goto AnOK; } - else if (*tok!=',') + else if (*tok != ',') return error("comma expected"); else tok++; // eat the comma - CHECKODn: +CHECKODn: if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) goto badmode; - if (optim_flags[OPT_BASE_DISP] && (AnEXVAL == 0)) + if (CHECK_OPTS(OPT_020_DISP) && (AnEXATTR & DEFINED) && (AnEXVAL == 0)) { - // od=0 so optimise it out + // 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 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; + } + else + { + // Is .L forced here? + if (*tok == DOTL) + tok++; // Doesn't matter, we're going for .L anyway - // Defined, absolute values from $FFFF8000..$00007FFF get - // optimized to absolute short - if (optim_flags[OPT_ABS_SHORT] - && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) - && ((AnEXVAL + 0x8000) < 0x10000)) + // od.L + if (!(AnEXTEN & EXT_BS)) + AnEXTEN |= EXT_IISPOSL; // Long outer displacement + else { - AnEXTEN |= EXT_IISPOSW; // Word outer displacement - AMn = MEMPOST; - warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short"); + // bd is suppressed, so sticking the od size in bd + AnEXTEN |= 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'; } - } - else - { - // expr[.W] - AnEXTEN |= EXT_IISPOSW; // Word outer displacement AMn = MEMPOST; - // Is .W forced here? - if (*tok == DOTW) + // Defined, absolute values from $FFFF8000..$00007FFF get + // optimized to absolute short + if (CHECK_OPTS(OPT_020_DISP) + && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) + && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) { - tok++; + AnEXTEN |= EXT_IISPOSW; // Word outer displacement + AMn = MEMPOST; + if (optim_warn_flag) + warn("absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short"); } } @@ -633,12 +674,12 @@ else return error("Closing parenthesis missing on addressing mode"); - IS_SUPPRESSEDn: +IS_SUPPRESSEDn: // Check for od if (*tok == ')') // ([bd,An/PC],Xn) { - //od is non existant, get out of jail free card + // 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 AnEXTEN |= EXT_IISNOIN; // No outer displacement tok++; @@ -649,12 +690,12 @@ else tok++; // eat the comma - if ((*tok != CONST) && (*tok != SYMBOL)) + if ((*tok != CONST) && (*tok != SYMBOL)) goto badmode; expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM); - if (optim_flags[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 @@ -676,21 +717,22 @@ // expr[.W][] AnEXTEN |= EXT_IISNOIW; // Word outer displacement with IS suppressed AMn = MEMPRE; + if (*tok == DOTW) { //AnEXTEN|=EXT_IISNOIW; // Word outer displacement 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_020_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"); + if (optim_warn_flag) + warn("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short"); } } @@ -705,9 +747,9 @@ } else if (*tok == ',') { - *tok++; // ([bd,An,Xn.size*scale],od) + tok++; // ([bd,An,Xn.size*scale],od) - //Check for Xn + // Check for Xn if ((*tok >= KW_A0) && (*tok <= KW_A7)) { AnEXTEN |= ((*tok & 7) << 12); @@ -722,36 +764,35 @@ } // 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: - 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(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK) + if (expr(scaleexpr, &scaleval, &scaleattr, &scaleesym) != OK) return error("scale factor expression must evaluate"); - switch (AnEXVAL) + + switch (scaleval) { case 1: break; @@ -768,7 +809,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -778,49 +819,55 @@ break; case 2: AnIXSIZ |= TIMES2; + AnEXTEN |= 1 << 9; break; case 4: AnIXSIZ |= TIMES4; + AnEXTEN |= 2 << 9; break; case 8: AnIXSIZ |= TIMES8; + AnEXTEN |= 3 << 9; break; default: goto badmode; } + + tok++; // Take into account that constants are 64-bit } } - //Check for ] + // Check for ] if (*tok != ']') return error("Expected closing bracket ]"); tok++; // Eat the bracket - //Check for od + // Check for od if (*tok == ')') // ([bd,An/PC,Xn]... { - //od is non existant, get out of jail free card + // 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 AnEXTEN |= EXT_IISPREN; // No outer displacement 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_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 + AnEXTEN |= EXT_IISPRE0; // No outer displacement + tok++; + goto AnOK; + } } // ([bd,An/PC,Xn],od) @@ -834,25 +881,36 @@ 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_020_DISP) + && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) + && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) + { + expr_size = EXT_IISPREW; + + if (optim_warn_flag) + 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"); } } @@ -893,6 +951,116 @@ 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 + //AnBEXPR = AnEXPR; + AnBEXVAL = AnEXVAL; + AnBEXATTR = AnEXATTR; + + if ((*tok >= KW_D0) && (*tok <= KW_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 == '*') // ([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: + 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; } @@ -947,7 +1115,7 @@ { 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! + 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)) @@ -1005,24 +1173,31 @@ CHK_FOR_DISPn: // expr[.L] AMn = ABSL; - // Defined, absolute values from $FFFF8000..$00007FFF get optimized - // to absolute short - if (optim_flags[OPT_ABS_SHORT] - && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) - && ((AnEXVAL + 0x8000) < 0x10000)) - { - 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 & REFERENCED) && (AnEXATTR & DEFINED) && (!(AnEXATTR & EQUATED))) + return error("relocation not allowed"); - if (sbra_flag) - warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short"); - } - - // Is .L forced here? + // .L is forced here if (*tok == DOTL) { tok++; AMn = ABSL; } + else + { + // 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("absolute value from $FFFF8000..$00007FFF optimised to absolute short"); + } + } goto AnOK; }