// ([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))
{
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)
{
{
// Defined, absolute values from $FFFF8000..$00007FFF
// get optimized to absolute short
- if (CHECK_OPTS(OPT_ABS_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("absolute value in base displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
}
else
{
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++;
}
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
// 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 != ',')
}
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?
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;
if (expr(AnEXPR, &AnEXVAL, &AnEXATTR, &AnESYM) != OK)
goto badmode;
- if (CHECK_OPTS(OPT_BASE_DISP) && (AnEXATTR & DEFINED) && (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
+ 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
+
+ // od.L
if (!(AnEXTEN & EXT_BS))
AnEXTEN |= EXT_IISPOSL; // Long outer displacement
else
{
AnBEXPR[i] = AnEXPR[i];
i++;
- }
- while (AnEXPR[i] != 'E');
+ } while (AnEXPR[i] != 'E');
AnBEXPR[i] = 'E';
}
- AMn = MEMPOST;
- tok++;
+ 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");
+ AMn = MEMPOST + ea_PC;
+ if (optim_warn_flag)
+ warn("absolute value in outer displacement ranging $FFFF8000..$00007FFF optimised to absolute short");
}
-
- }
- else
- {
- // expr[.W]
- AnEXTEN |= EXT_IISPOSW; // Word outer displacement
- AMn = MEMPOST;
-
- // Is .W forced here?
- if (*tok == DOTW)
- tok++;
}
// Check for final closing parenthesis
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;
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;
{
// 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("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
}
}
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;
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;
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)
// 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("outer displacement absolute value from $FFFF8000..$00007FFF optimised to absolute short");
}
}
// 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;
}
}
// Check for scale
- if (*tok == '*') // ([bd,An/PC],Xn*...)
+ if (*tok == '*') // (d16,An,Dn[.size][*scale])
{ // scale: *1, *2, *4, *8
tok++;
// expr[.L]
AMn = ABSL;
- // When PC relative is enforced, check for any symbols that aren't
+ // When PC relative is enforced, check for any symbols that aren't
// EQU'd, in this case it's an illegal mode
- if (optim_pc)
- if (AnEXATTR & REFERENCED)
- if (AnEXATTR & DEFINED)
- if (!(AnEXATTR & EQUATED))
- return error("relocation not allowed");
+ if ((CHECK_OPTS(OPT_PC_RELATIVE)) && (AnEXATTR & REFERENCED) && (AnEXATTR & DEFINED) && (!(AnEXATTR & EQUATED)))
+ return error("relocation not allowed");
// .L is forced here
if (*tok == DOTL)
{
AMn = ABSW;
- if (sbra_flag)
+ if (optim_warn_flag)
warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short");
}
}
projects / rmac / blobdiff