//
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
// PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
//
#include "procln.h"
-#include "listing.h"
+#include "6502.h"
#include "amode.h"
+#include "direct.h"
#include "error.h"
-#include "sect.h"
#include "expr.h"
+#include "listing.h"
#include "mach.h"
-#include "direct.h"
#include "macro.h"
+#include "riscasm.h"
+#include "sect.h"
#include "symbol.h"
-#include "risca.h"
-#define DEF_KW // Declare keyword values
+#define DEF_KW // Declare keyword values
#include "kwtab.h" // Incl generated keyword tables & defs
#define DEF_MN // Incl 68k keyword definitions
#define DECL_MR
#include "risckw.h"
+#define DEF_MP // Include 6502 keyword definitions
+#define DECL_MP // Include 6502 keyword state machine tables
+#include "6502kw.h"
+
IFENT * ifent; // Current ifent
static IFENT ifent0; // Root ifent
static IFENT * f_ifent; // Freelist of ifents
static int disabled; // Assembly conditionally disabled
-int just_bss; // 1, ds.b in microprocessor mode
-VALUE pcloc; // Value of "PC" at beginning of line
-IFENT * ifent; // Current ifent
+int just_bss; // 1, ds.b in microprocessor mode
+VALUE pcloc; // Value of "PC" at beginning of line
SYM * lab_sym; // Label on line (or NULL)
-char extra_stuff[] = "extra (unexpected) text found after addressing mode";
-char * comma_error = "missing comma";
-char * syntax_error = "syntax error";
-char * locgl_error = "cannot GLOBL local symbol";
-char * lab_ignored = "label ignored";
+const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
+const char comma_error[] = "missing comma";
+const char syntax_error[] = "syntax error";
+const char locgl_error[] = "cannot GLOBL local symbol";
+const char lab_ignored[] = "label ignored";
// Table to convert an addressing-mode number to a bitmask.
-LONG amsktab[0112] = {
+LONG amsktab[0124] = {
M_DREG, M_DREG, M_DREG, M_DREG,
M_DREG, M_DREG, M_DREG, M_DREG,
M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED,
M_AINDEXED, M_AINDEXED, M_AINDEXED, M_AINDEXED,
- M_ABSW, // 070
- M_ABSL, // 071
- M_PCDISP, // 072
- M_PCINDEXED, // 073
- M_IMMED, // 074
- 0L, // 075
- 0L, // 076
- 0L, // 077
- M_ABASE, // 0100
- M_MEMPOST, // 0101
- M_MEMPRE, // 0102
- M_PCBASE, // 0103
- M_PCMPOST, // 0104
- M_PCMPRE, // 0105
- M_AM_USP, // 0106
- M_AM_SR, // 0107
- M_AM_CCR, // 0110
- M_AM_NONE // 0111
-}; // 0112 length
+ M_ABSW, // 070
+ M_ABSL, // 071
+ M_PCDISP, // 072
+ M_PCINDEXED, // 073
+ M_IMMED, // 074
+ 0L, // 075
+ 0L, // 076
+ 0L, // 077
+ M_ABASE, // 0100
+ M_MEMPOST, // 0101
+ M_MEMPRE, // 0102
+ M_PCBASE, // 0103
+ M_PCMPOST, // 0104
+ M_PCMPRE, // 0105
+ M_AM_USP, // 0106
+ M_AM_SR, // 0107
+ M_AM_CCR, // 0110
+ M_AM_NONE, // 0111
+ 0x30, // 0112
+ 0x30, // 0113
+ 0L, // 0114
+ 0L, // 0115
+ 0L, // 0116
+ 0L, // 0117
+ M_CREG, // 0120 (caches - TODO: is this correct or does it need its own bitfield?)
+ M_CREG, // 0121
+ M_FREG, // 0122
+ M_FPSCR // 0123
+}; // 0123 length
+
+
+// Function prototypes
+int HandleLabel(char *, int);
//
-// Initialize Line Processor
+// Initialize line processor
//
-void init_procln(void)
+void InitLineProcessor(void)
{
disabled = 0;
ifent = &ifent0;
//
-// Line Processor
+// Line processor
//
void Assemble(void)
{
SYM * sy, * sy2; // Symbol (temp usage)
char * opname = NULL; // Name of dirctve/mnemonic/macro
int listflag; // 0: Don't call listeol()
- int as68mode = 0; // 1: Handle multiple labels
WORD rmask; // Register list, for REG
int registerbank; // RISC register bank
int riscreg; // RISC register
-
listflag = 0; // Initialise listing flag
loop: // Line processing loop label
// Get another line of tokens
- if (tokln() == TKEOF)
+ if (TokenizeLine() == TKEOF)
{
+if (debug) printf("Assemble: Found TKEOF flag...\n");
if (list_flag && listflag) // Flush last line of source
listeol();
if (*tok == EOL) // Restart loop if end-of-line
goto loop;
- // First token MUST be a symbol
+ // First token MUST be a symbol (Shamus: not sure why :-/)
if (*tok != SYMBOL)
{
- error(syntax_error);
+ 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;
}
if (j == '=' || j == DEQUALS || j == SET || j == REG || j == EQUREG || j == CCDEF)
{
-// equate = (char *)tok[1];
equate = string[tok[1]];
equtyp = j;
tok += 3;
if (j == ':' || j == DCOLON)
{
as68label:
-// label = (char *)tok[1]; // Get label name
label = string[tok[1]]; // Get label name
labtyp = tok[2]; // Get label type
tok += 3; // Go to next line token
- // Handle multiple labels; if there's another label, go process it,
- // and come back at `as68label' above.
- if (as68_flag)
+ // 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] == ':'))
{
- as68mode = 0;
+ if (HandleLabel(label, labtyp) != 0)
+ goto loop;
- if (*tok == SYMBOL && tok[2] == ':')
- {
- as68mode = 1;
- goto do_label;
- }
+ goto as68label;
}
}
- if (*tok == EOL) // EOL is legal here...
+ // EOL is legal here...
+ if (*tok == EOL)
goto normal;
// Next token MUST be a symbol
if (*tok++ != SYMBOL)
{
- error(syntax_error);
+ error("syntax error; expected symbol");
goto loop;
}
-// This is the problem here: On 64-bit platforms, this cuts the native pointer
-// in half. We need to figure out how to fix this.
-//#warning "!!! Bad pointer !!!"
-#if 0
- opname = p = (char *)*tok++; // Store opcode name here
-#else
opname = p = string[*tok++];
-#endif
// 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;
- if (*tok == DOTW)
- siz = SIZW, ++tok;
+ if (*tok == DOTW)
+ siz = SIZW, tok++;
else if (*tok == DOTL)
- siz = SIZL, ++tok;
+ siz = SIZL, tok++;
else if (*tok == DOTB)
- siz = SIZB, ++tok;
+ siz = SIZB, tok++;
+ else if(*tok == DOTD)
+ siz = SIZD, tok++;
+ else if(*tok == DOTP)
+ siz = SIZP, tok++;
+ else if(*tok == DOTQ)
+ siz = SIZQ, tok++;
+ else if(*tok == DOTS)
+ siz = SIZS, tok++;
+ else if(*tok == DOTX)
+ siz = SIZX, tok++;
+
// Do special directives (500..999) (These must be handled in "real time")
if (state >= 500 && state < 1000)
switch (state)
{
case MN_IF:
- d_if ();
+ d_if();
goto loop;
case MN_ELSE:
d_else();
goto loop;
case MN_ENDIF:
- d_endif ();
+ d_endif();
goto loop;
case MN_IIF: // .iif --- immediate if
if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
case MN_MACRO: // .macro --- macro definition
if (!disabled)
{
+ // Label on a macro definition is bad mojo... Warn the user
if (label != NULL)
warn(lab_ignored);
case MN_REPT:
if (!disabled)
{
- if (label != NULL)
- warn(lab_ignored);
+ // Handle labels on REPT directive lines...
+ if (label)
+ {
+ if (HandleLabel(label, labtyp) != 0)
+ goto loop;
+ }
defrept();
}
// Do equates
if (equate != NULL)
{
- j = 0; // Pick global or local sym enviroment
-
- if (*equate == '.')
- j = curenv;
-
+ // Pick global or local symbol enviroment
+ j = (*equate == '.' ? curenv : 0);
sy = lookup(equate, LABEL, j);
if (sy == NULL)
{
if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
{
- sy->sattre |= ~UNDEF_EQUR;
- sy->svalue = 0;
+//REALLY? sy->sattre |= ~UNDEF_EQUR;
+ sy->sattre &= ~UNDEF_EQUR;
+ sy->svalue = 0;
}
else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
{
- sy->sattre |= ~UNDEF_CC;
+//REALLY? sy->sattre |= ~UNDEF_CC;
+ sy->sattre &= ~UNDEF_CC;
sy->svalue = 0;
}
else
}
}
- // Put symbol in "order of definition" list
- if (!(sy->sattr & SDECLLIST))
- sym_decl(sy);
+ // Put symbol in "order of definition" list if it's not already there
+ AddToSymbolDeclarationList(sy);
// Parse value to equate symbol to;
// o .equr
// o everything else
if (equtyp == EQUREG)
{
+//Linko's request to issue a warning on labels that equated to the same
+//register would go here. Not sure how to implement it though. :-/
+/*
+Maybe like this way:
+have an array of bools with 64 entries. Whenever a register is equated, set the
+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)
{
// Check for register to equate to
if ((*tok >= KW_R0) && (*tok <= KW_R31))
{
- sy->sattre = EQUATEDREG | RISCSYM; // Mark as equated register
+// sy->sattre = EQUATEDREG | RISCSYM; // Mark as equated register
+ sy->sattre = EQUATEDREG; // Mark as equated register
riscreg = (*tok - KW_R0);
- sy->sattre |= (riscreg << 8); // Store register number
+//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))
{
+ // Advance token pointer to the constant
tok += 3;
+ // Anything other than a 0 or a 1 will result in "No Bank"
if (*tok == 0)
registerbank = BANK_0;
else if (*tok == 1)
registerbank = BANK_1;
- else
- registerbank = BANK_N;
- }
- else
- {
- registerbank = BANK_N;
}
+#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 = 0x80000080 + (riscreg) + (registerbank << 8);
+// & what does this $80000080 constant mean???
+// eval = 0x80000080 + (riscreg) + (registerbank << 8);
+ eval = riscreg;
tok++;
}
// Checking for a register symbol
else if (tok[0] == SYMBOL)
{
-// sy2 = lookup((char *)tok[1], LABEL, j);
sy2 = lookup(string[tok[1]], LABEL, j);
// Make sure symbol is a valid equreg
if (tok[0] == SYMBOL)
{
-// sy2 = lookup((char *)tok[1], LABEL, j);
sy2 = lookup(string[tok[1]], LABEL, j);
if (!sy2 || !(sy2->sattre & EQUATEDCC))
//equ a equr
else if (*tok == SYMBOL)
{
-// sy2 = lookup((char *)tok[1], LABEL, j);
sy2 = lookup(string[tok[1]], LABEL, j);
if (sy2 && (sy2->sattre & EQUATEDREG))
sy->stype = sy2->stype;
sy->sattr = sy2->sattr;
sy->sattre = sy2->sattre;
- sy->svalue = (sy2->svalue & 0xFFFFF0FF);
+//ICK sy->svalue = (sy2->svalue & 0xFFFFF0FF);
+ sy->svalue = sy2->svalue;
goto loop;
}
else if (expr(exprbuf, &eval, &eattr, &esym) != OK)
goto loop;
}
- sy->sattr |= eattr | EQUATED; // Symbol inherits value and attributes
+ sy->sattr |= eattr | EQUATED; // Symbol inherits value and attributes
sy->svalue = eval;
- if (list_flag) // Put value in listing
+ if (list_flag) // Put value in listing
listvalue(eval);
- at_eol(); // Must be at EOL now
+ at_eol(); // Must be at EOL now
goto loop;
}
// Do labels
if (label != NULL)
{
-do_label:
- // Check for dot in front of label; means this is a local label if present
-#if 0
- j = 0;
-
- if (*label == '.')
- j = curenv;
-#else
- j = (*label == '.' ? curenv : 0);
-#endif
-
- sy = lookup(label, LABEL, j);
-
- if (sy == NULL)
- {
- sy = NewSymbol(label, LABEL, j);
- sy->sattr = 0;
- sy->sattre = RISCSYM;
- }
- else if (sy->sattr & DEFINED)
- {
- errors("multiply-defined label '%s'", label);
+ // Non-zero == error occurred
+ if (HandleLabel(label, labtyp) != 0)
goto loop;
- }
+ }
- // Put symbol in "order of definition" list
- if (!(sy->sattr & SDECLLIST))
- sym_decl(sy);
+ // Punt on EOL
+ if (state == -3)
+ goto loop;
- if (orgactive)
- {
- sy->svalue = orgaddr;
- sy->sattr |= ABS | DEFINED | EQUATED;
- }
- else
+ // If we're in 6502 mode and are still in need of a mnemonic, then search
+ // for valid 6502 mnemonic.
+ if (m6502 && (state < 0 || state >= 1000))
+ {
+#ifdef ST
+ state = kmatch(opname, mpbase, mpcheck, mptab, mpaccept);
+#else
+ for(state=0, p=opname; state>= 0; )
{
- sy->svalue = sloc;
- sy->sattr |= DEFINED | cursect;
- }
-
- lab_sym = sy;
+ j = mpbase[state] + tolowertab[*p];
- if (!j)
- curenv++;
-
- // Make label global
- if (labtyp == DCOLON)
- {
- if (j)
+ if (mpcheck[j] != state) // Reject, character doesn't match
{
- error(locgl_error);
- goto loop;
+ state = -1; // No match
+ break;
+ }
+
+ if (!*++p)
+ { // Must accept or reject at EOS
+ state = mpaccept[j]; // (-1 on no terminal match)
+ break;
}
- sy->sattr |= GLOBAL;
+ state = mptab[j];
}
+#endif
- // If we're in as68 mode, and there's another label, go back and handle it
- if (as68_flag && as68mode)
- goto as68label;
+ // Call 6502 code generator if we found a mnemonic
+ if (state >= 2000)
+ {
+ m6502cg(state - 2000);
+ goto loop;
+ }
}
- // Punt on EOL
- if (state == -3)
- goto loop;
-
// If we are in GPU or DSP mode and still in need of a mnemonic then search
// for one
if ((rgpu || rdsp) && (state < 0 || state >= 1000))
// Call RISC code generator if we found a mnemonic
if (state >= 3000)
{
- risccg(state);
+ GenerateRISCCode(state);
goto loop;
}
}
// Invoke macro or complain about bad mnemonic
if (state < 0)
{
- if ((sy = lookup(opname, MACRO, 0)) != NULL)
+ if ((sy = lookup(opname, MACRO, 0)) != NULL)
InvokeMacro(sy, siz);
else
errors("unknown op '%s'", opname);
goto loop;
}
- if (sloc & 1) // Automatic .even
+ if (sloc & 1) // Automatic .even
auto_even();
- if (challoc - ch_size < 18) // Make sure have space in current chunk
+ if (challoc - ch_size < 18) // Make sure have space in current chunk
chcheck(0);
m = &machtab[state - 1000];
goto loop;
}
- if (amode(1) < 0) // Parse 0, 1 or 2 addr modes
+ if (amode(1) < 0) // Parse 0, 1 or 2 addr modes
goto loop;
if (*tok != EOL)
goto loop;
}
+ // Keep a backup of chptr (used for optimisations during codegen)
+ chptr_opcode = chptr;
+
for(;;)
{
if ((m->mnattr & siz) && (amsk0 & m->mn0) != 0 && (amsk1 & m->mn1) != 0)
}
-//
-// .if, Start Conditional Assembly
+//
+// Handle the creation of labels
+//
+int HandleLabel(char * label, int labelType)
+{
+ // Check for dot in front of label; means this is a local label if present
+ int environment = (*label == '.' ? curenv : 0);
+ SYM * symbol = lookup(label, LABEL, environment);
+
+ if (symbol == NULL)
+ {
+ symbol = NewSymbol(label, LABEL, environment);
+ symbol->sattr = 0;
+// symbol->sattre = RISCSYM;
+ symbol->sattre = 0;
+ }
+ else if (symbol->sattr & DEFINED)
+ return errors("multiply-defined label '%s'", label);
+
+ // Put symbol in "order of definition" list if it's not already in it
+ AddToSymbolDeclarationList(symbol);
+
+ if (orgactive)
+ {
+ symbol->svalue = orgaddr;
+ symbol->sattr |= ABS | DEFINED | EQUATED;
+ }
+ else
+ {
+ symbol->svalue = sloc;
+ symbol->sattr |= DEFINED | cursect;
+ }
+
+ lab_sym = symbol;
+
+ if (0 == environment)
+ curenv++;
+
+ // Make label global if it has a double colon
+ if (labelType == DCOLON)
+ {
+ if (environment != 0)
+ return error(locgl_error);
+
+ symbol->sattr |= GLOBAL;
+ }
+
+ return 0;
+}
+
+
+//
+// .if, Start conditional assembly
//
int d_if(void)
{
}
-//
-// .else, Do Alternate Case For .if
+//
+// .else, Do alternate case for .if
//
int d_else(void)
{
f_ifent = rif;
return 0;
}
+
projects / rmac / blobdiff