//
-// RMAC - Reboot's Macro Assembler for all Atari computers
+// RMAC - Renamed Macro Assembler for all Atari computers
// PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
// Source utilised with the kind permission of Landon Dyer
//
// 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))
{
// 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
+ riscreg = (*tok);
+
// 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))
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++;
}
-#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++;
if (amode(1) < 0) // Parse 0, 1 or 2 addr modes
goto loop;
- if (*tok != EOL)
- error(extra_stuff);
+ // Check that we're at EOL
+ // The only exception is ptestr/ptestw instructions
+ // that have 3 or 4 operands and are not handled by
+ // amode(). (yes, we're taking a performance hit here sadly)
+ if (m->mnfunc != m_ptestr && m->mnfunc != m_ptestw)
+ if (*tok != EOL)
+ error(extra_stuff);
amsk0 = amsktab[am0];
amsk1 = amsktab[am1];