X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=parmode.h;h=20f0973becf494dc445bbc689c45cb36c28882d9;hp=4b6c7ea968c1f07a81e8d7ebedbed9a6a56efaee;hb=8a5d76b0e6c7433cdbdf3d612da5c209516cb594;hpb=ff8188b7e279f99cf11ac8a283c4146af324d26f diff --git a/parmode.h b/parmode.h index 4b6c7ea..20f0973 100644 --- a/parmode.h +++ b/parmode.h @@ -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++; @@ -92,16 +97,14 @@ } 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 + AnEXTEN = 0 << 11; // Word index size tok++; } else if (*tok == ',') @@ -126,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 { @@ -156,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 } } @@ -180,12 +191,13 @@ 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_BDSIZE0; // Base displacement null - suppressed goto CHECKODn; } else @@ -235,9 +247,9 @@ 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 +266,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -274,12 +286,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 ")" @@ -305,7 +323,7 @@ // bd=0 so let's optimise it out AnEXTEN|=EXT_BDSIZE0; } - else if (*tok==DOTL) + else if (*tok == DOTL) { // ([bd.l,... AnEXTEN |= EXT_BDSIZEL; tok++; @@ -365,22 +383,24 @@ tok++; // 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: - 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: | .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 @@ -390,10 +410,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; @@ -410,7 +430,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -430,6 +450,8 @@ default: goto badmode; } + + tok++; // Take into account that constants are 64-bit } } if (*tok == ']') // ([bd,Dn]... @@ -518,10 +540,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; @@ -538,7 +560,7 @@ goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -558,13 +580,15 @@ 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++; @@ -616,7 +640,9 @@ // Is .W forced here? if (*tok == DOTW) + { tok++; + } } // Check for final closing parenthesis @@ -633,7 +659,7 @@ 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++; @@ -644,7 +670,7 @@ IS_SUPPRESSEDn: else tok++; // eat the comma - if ((*tok != CONST) && (*tok != SYMBOL)) + if ((*tok != CONST) && (*tok != SYMBOL)) goto badmode; expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM); @@ -717,22 +743,24 @@ 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: + { + // 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 @@ -742,9 +770,9 @@ IS_SUPPRESSEDn: 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; @@ -761,7 +789,7 @@ IS_SUPPRESSEDn: goto badmode; } } - else if (*tok++ != CONST || *tok > 8) + else if (*tok++ != CONST) goto badmode; else { @@ -771,35 +799,40 @@ IS_SUPPRESSEDn: 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 ]"); if (*tok == SYMBOL || *tok == CONST) @@ -838,7 +871,7 @@ IS_SUPPRESSEDn: // Defined, absolute values from $FFFF8000..$00007FFF // get optimized to absolute short - if (CHECK_OPTS(OPT_BASE_DISP) + if (CHECK_OPTS(OPT_BASE_DISP) && ((AnEXATTR & (TDB | DEFINED)) == DEFINED) && (((uint32_t)AnEXVAL + 0x8000) < 0x10000)) { @@ -950,7 +983,7 @@ IS_SUPPRESSEDn: { 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))