// Skip past label (but record it)
if (j == ':' || j == DCOLON)
{
-as68label:
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 == SYMBOL && tok[2] == ':'))
- {
- if (HandleLabel(label, labtyp) != 0)
- goto loop;
-
- label_defined = label;
-
- goto as68label;
- }
}
// EOL is legal here...
corresponding register bool to true. Whenever it's undef'ed, set it to false.
When checking to see if it's already been equated, issue a warning.
*/
- // Check that we are in a RISC section
- if (!rgpu && !rdsp)
- {
- error(".equr/.regequ must be defined in .gpu/.dsp section");
- goto loop;
- }
- // Check for register to equate to
- if ((*tok >= KW_R0) && (*tok <= KW_R31))
+ if (rgpu || rdsp)
{
-// sy->sattre = EQUATEDREG | RISCSYM; // Mark as equated register
- sy->sattre = EQUATEDREG; // Mark as equated register
- 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
-//everything seems to build fine without it... We'll leave it here Just In Case(tm)
-
-#define DEBODGE_REGBANK
-#ifdef DEBODGE_REGBANK
- // Default is current state of "regbank"
- registerbank = regbank;
-#else
- // Default is no register bank specified
- registerbank = BANK_N;
-#endif
-
- // Check for ",<bank #>" override notation
- if ((tok[1] == ',') && (tok[2] == CONST))
+ // GPU/DSP architectures need some special TLC for now
+ // Check for register to equate to
+ if ((*tok >= KW_R0) && (*tok <= KW_R31))
{
- // Advance token pointer to the constant
- tok += 3;
-
- // Anything other than a 0 or a 1 will result in "No Bank"
- if (*(uint64_t *)tok == 0)
- registerbank = BANK_0;
- else if (*(uint64_t *)tok == 1)
- registerbank = BANK_1;
-
- // Advance half-way through the 64-bit const.
- // The code below, expecting a regular token,
- // will advance past the second half.
+ // sy->sattre = EQUATEDREG | RISCSYM; // Mark as equated register
+ sy->sattre = EQUATEDREG; // Mark as equated register
+ riscreg = *tok;
+
+ // Default is current state of "regbank"
+ registerbank = regbank;
+
+ // Check for ",<bank #>" override notation
+ if ((tok[1] == ',') && (tok[2] == CONST))
+ {
+ // Advance token pointer to the constant
+ tok += 3;
+
+ // Anything other than a 0 or a 1 will result in "No Bank"
+ if (*(uint64_t*)tok == 0)
+ registerbank = BANK_0;
+ else if (*(uint64_t*)tok == 1)
+ registerbank = BANK_1;
+
+ // Advance half-way through the 64-bit const.
+ // The code below, expecting a regular token,
+ // will advance past the second half.
+ tok++;
+ }
+
+ sy->sattre |= registerbank; // Store register bank
+ eattr = ABS | DEFINED | GLOBAL;
+ eval = riscreg;
tok++;
}
-
-#ifdef DEBODGE_REGBANK
- sy->sattre |= registerbank; // Store register bank
-#else
-// What needs to happen here is to prime registerbank with regbank, then use
-// registerbank down below for the bank marking.
-#warning "!!! regbank <-> registerbank confusion here !!!"
-// The question here is why, if we're allowed to override the ".regbankN" rules
-// above, then why is it using the one set by the directive in the extended
-// attributes and not in what ends up in symbol->svalue?
-// ".regbankN" is not an original Madmac directive, so it's suspect
- sy->sattre |= regbank; // Store register bank
-#endif
- eattr = ABS | DEFINED | GLOBAL;
- eval = riscreg;
- tok++;
- }
- // Checking for a register symbol
- else if (tok[0] == SYMBOL)
- {
- sy2 = lookup(string[tok[1]], LABEL, j);
-
- // Make sure symbol is a valid equreg
- if (!sy2 || !(sy2->sattre & EQUATEDREG))
+ // Checking for a register symbol
+ else if (tok[0] == SYMBOL)
{
- error("invalid GPU/DSP .equr/.regequ definition");
- goto loop;
+ sy2 = lookup(string[tok[1]], LABEL, j);
+
+ // Make sure symbol is a valid equreg
+ if (!sy2 || !(sy2->sattre & EQUATEDREG))
+ {
+ error("invalid GPU/DSP .equr/.regequ definition");
+ goto loop;
+ }
+ else
+ {
+ eattr = ABS | DEFINED | GLOBAL; // Copy symbol's attributes
+ sy->sattre = sy2->sattre;
+ eval = (sy2->svalue & 0xFFFFF0FF);
+ tok += 2;
+ }
}
else
{
- eattr = ABS | DEFINED | GLOBAL; // Copy symbols attributes
- sy->sattre = sy2->sattre;
- eval = (sy2->svalue & 0xFFFFF0FF);
- tok += 2;
+ error("invalid GPU/DSP .equr/.regequ definition");
+ goto loop;
}
}
else
{
- error("invalid GPU/DSP .equr/.regequ definition");
- goto loop;
+ sy->sattre = EQUATEDREG; // Mark as equated register
+ riscreg = *tok;
+ tok++;
}
}
else if (equtyp == REG)
projects / rmac / blobdiff