label = NULL; // No label
lab_sym = NULL; // No (exported) label
equate = NULL; // No equate
- tk = tok.u32; // Save first token in line
+ tk = tok; // Save first token in line
pcloc = (uint32_t)sloc; // Set beginning-of-line PC
loop1: // Internal line processing loop
- if (*tok.u32 == EOL) // Restart loop if end-of-line
+ if (*tok == EOL) // Restart loop if end-of-line
goto loop;
// First token MUST be a symbol (Shamus: not sure why :-/)
- if (*tok.u32 != SYMBOL)
+ if (*tok != SYMBOL)
{
- if ((*tok.u32 >= KW_D0) && (*tok.u32 <= KW_R31))
+ if ((*tok >= KW_D0) && (*tok <= KW_R31))
error("cannot use reserved keyword as label name or .equ");
else
error("syntax error; expected symbol");
goto loop;
}
- j = (int)tok.u32[2]; // Skip equates (normal statements)
+ j = (int)tok[2]; // Skip equates (normal statements)
if (j == '=' || j == DEQUALS || j == SET || j == REG || j == EQUREG || j == CCDEF)
{
- equate = string[tok.u32[1]];
+ equate = string[tok[1]];
equtyp = j;
- tok.u32 += 3;
+ tok += 3;
goto normal;
}
if (j == ':' || j == DCOLON)
{
as68label:
- label = string[tok.u32[1]]; // Get label name
- labtyp = tok.u32[2]; // Get label type
- tok.u32 += 3; // Go to next line token
+ label = string[tok[1]]; // Get label name
+ labtyp = tok[2]; // Get label type
+ tok += 3; // Go to next line token
// AS68 MODE:
// Looks like another label follows the previous one, so handle
// the previous one until there aren't any more
- if (as68_flag && (*tok.u32 == SYMBOL && tok.u32[2] == ':'))
+ if (as68_flag && (*tok == SYMBOL && tok[2] == ':'))
{
if (HandleLabel(label, labtyp) != 0)
goto loop;
}
// EOL is legal here...
- if (*tok.u32 == EOL)
+ if (*tok == EOL)
goto normal;
// First token MUST be a symbol (if we get here, tok didn't advance)
- if (*tok.u32++ != SYMBOL)
+ if (*tok++ != SYMBOL)
{
error("syntax error; expected symbol");
goto loop;
}
- opname = p = string[*tok.u32++];
+ opname = p = string[*tok++];
// Check to see if the SYMBOL is a keyword (a mnemonic or directive).
// On output, `state' will have one of the values:
// Check for ".b" ".w" ".l" after directive, macro or mnemonic.
siz = SIZN;
- switch (*tok.u32)
+ switch (*tok)
{
- case DOTW: siz = SIZW, tok.u32++; break;
- case DOTL: siz = SIZL, tok.u32++; break;
- case DOTB: siz = SIZB, tok.u32++; break;
- case DOTD: siz = SIZD, tok.u32++; break;
- case DOTP: siz = SIZP, tok.u32++; break;
- case DOTQ: siz = SIZQ, tok.u32++; break;
- case DOTS: siz = SIZS, tok.u32++; break;
- case DOTX: siz = SIZX, tok.u32++; break;
+ case DOTW: siz = SIZW, tok++; break;
+ case DOTL: siz = SIZL, tok++; break;
+ case DOTB: siz = SIZB, tok++; break;
+ case DOTD: siz = SIZD, tok++; break;
+ case DOTP: siz = SIZP, tok++; break;
+ case DOTQ: siz = SIZQ, tok++; break;
+ case DOTS: siz = SIZS, tok++; break;
+ case DOTX: siz = SIZX, tok++; break;
}
// Do special directives (500..999) (These must be handled in "real time")
goto loop;
}
- if (*tok.u32++ != ',')
+ if (*tok++ != ',')
{
error(comma_error);
goto loop;
}
// Check for register to equate to
- if ((*tok.u32 >= KW_R0) && (*tok.u32 <= KW_R31))
+ if ((*tok >= KW_R0) && (*tok <= KW_R31))
{
// sy->sattre = EQUATEDREG | RISCSYM; // Mark as equated register
sy->sattre = EQUATEDREG; // Mark as equated register
- riscreg = (*tok.u32 - KW_R0);
+ riscreg = (*tok - KW_R0);
//is there any reason to do this, since we're putting this in svalue?
//i'm thinking, no. Let's test that out! :-D
// sy->sattre |= (riscreg << 8); // Store register number
#endif
// Check for ",<bank #>" override notation
- if ((tok.u32[1] == ',') && (tok.u32[2] == CONST))
+ if ((tok[1] == ',') && (tok[2] == CONST))
{
// Advance token pointer to the constant
- tok.u32 += 3;
+ tok += 3;
// Anything other than a 0 or a 1 will result in "No Bank"
- if (*(uint64_t *)tok.u32 == 0)
+ if (*(uint64_t *)tok == 0)
registerbank = BANK_0;
- else if (*(uint64_t *)tok.u32 == 1)
+ else if (*(uint64_t *)tok == 1)
registerbank = BANK_1;
}
// & what does this $80000080 constant mean???
// eval = 0x80000080 + (riscreg) + (registerbank << 8);
eval = riscreg;
- tok.u32++;
+ tok++;
}
// Checking for a register symbol
- else if (tok.u32[0] == SYMBOL)
+ else if (tok[0] == SYMBOL)
{
- sy2 = lookup(string[tok.u32[1]], LABEL, j);
+ sy2 = lookup(string[tok[1]], LABEL, j);
// Make sure symbol is a valid equreg
if (!sy2 || !(sy2->sattre & EQUATEDREG))
eattr = ABS | DEFINED | GLOBAL; // Copy symbols attributes
sy->sattre = sy2->sattre;
eval = (sy2->svalue & 0xFFFFF0FF);
- tok.u32 += 2;
+ tok += 2;
}
}
else
sy->sattre |= EQUATEDCC;
eattr = ABS | DEFINED | GLOBAL;
- if (tok.u32[0] == SYMBOL)
+ if (tok[0] == SYMBOL)
{
- sy2 = lookup(string[tok.u32[1]], LABEL, j);
+ sy2 = lookup(string[tok[1]], LABEL, j);
if (!sy2 || !(sy2->sattre & EQUATEDCC))
{
eattr = ABS | DEFINED | GLOBAL;
sy->sattre = sy2->sattre;
eval = sy2->svalue;
- tok.u32 += 2;
+ tok += 2;
}
}
else if (expr(exprbuf, &eval, &eattr, &esym) != OK)
goto loop;
}
//equ a equr
- else if (*tok.u32 == SYMBOL)
+ else if (*tok == SYMBOL)
{
- sy2 = lookup(string[tok.u32[1]], LABEL, j);
+ sy2 = lookup(string[tok[1]], LABEL, j);
if (sy2 && (sy2->sattre & EQUATEDREG))
{
}
sy->sattr |= eattr | EQUATED; // Symbol inherits value and attributes
- sy->svalue = (uint32_t)eval;
+ sy->svalue = eval;
if (list_flag) // Put value in listing
listvalue((uint32_t)eval);
if (amode(1) < 0) // Parse 0, 1 or 2 addr modes
goto loop;
- if (*tok.u32 != EOL)
+ if (*tok != EOL)
error(extra_stuff);
amsk0 = amsktab[am0];