#include "direct.h"
#include "macro.h"
#include "symbol.h"
-#include "risca.h"
+#include "riscasm.h"
-#define DEF_KW // Declare keyword values
-#include "kwtab.h" // Incl generated keyword tables & defs
+#define DEF_KW // Declare keyword values
+#include "kwtab.h" // Incl generated keyword tables & defs
-#define DEF_MN // Incl 68k keyword definitions
-#define DECL_MN // Incl 68k keyword state machine tables
+#define DEF_MN // Incl 68k keyword definitions
+#define DECL_MN // Incl 68k keyword state machine tables
#include "mntab.h"
#define DEF_MR
#define DECL_MR
#include "risckw.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
-SYM * lab_sym; // Label on line (or NULL)
+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
+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] = {
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
+}; // 0112 length
//
// Initialize Line Processor
//
-void init_procln(void)
+void InitLineProcessor(void)
{
disabled = 0;
ifent = &ifent0;
//
// Line Processor
//
-void assemble(void)
+void Assemble(void)
{
- int state; // Keyword machine state (output)
- int j; // Random int, must be fast
- char * p; // Random char ptr, must be fast
- TOKEN * tk; // First token in line
- char * label; // Symbol (or NULL)
- char * equate; // Symbol (or NULL)
- int labtyp = 0; // Label type (':', DCOLON)
- int equtyp = 0; // Equ type ('=', DEQUALS)
- VALUE eval; // Expression value
- WORD eattr; // Expression attributes
- SYM * esym; // External symbol involved in expr.
- WORD siz = 0; // Size suffix to mnem/diretve/macro
- LONG amsk0, amsk1; // Address-type masks for ea0, ea1
- MNTAB * m; // Code generation table pointer
- 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
-
- if (tokln() == TKEOF)
- { // Get another line of tokens
- if (list_flag && listflag) // Flush last line of source
+ int state; // Keyword machine state (output)
+ int j; // Random int, must be fast
+ char * p; // Random char ptr, must be fast
+ TOKEN * tk; // First token in line
+ char * label; // Symbol (or NULL)
+ char * equate; // Symbol (or NULL)
+ int labtyp = 0; // Label type (':', DCOLON)
+ int equtyp = 0; // Equ type ('=', DEQUALS)
+ VALUE eval; // Expression value
+ WORD eattr; // Expression attributes
+ SYM * esym; // External symbol involved in expr.
+ WORD siz = 0; // Size suffix to mnem/diretve/macro
+ LONG amsk0, amsk1; // Address-type masks for ea0, ea1
+ MNTAB * m; // Code generation table pointer
+ 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 (TokenizeLine() == TKEOF)
+ {
+if (verb_flag) printf("Assemble: Found TKEOF flag...\n");
+ if (list_flag && listflag) // Flush last line of source
listeol();
- if (ifent->if_prev != NULL) // Check conditional token
+ if (ifent->if_prev != NULL) // Check conditional token
error("hit EOF without finding matching .endif");
return;
}
+ DEBUG DumpTokenBuffer();
+
if (list_flag)
{
if (listflag && listing > 0)
- listeol(); // Tell listing generator about EOL
+ listeol(); // Tell listing generator about EOL
- lstout((char)(disabled ? '-' : lntag)); // Prepare new line for listing
- listflag = 1; // OK to call `listeol' now
- just_bss = 0; // Reset just_bss mode
+ lstout((char)(disabled ? '-' : lntag)); // Prepare new line for listing
+ listflag = 1; // OK to call `listeol' now
+ just_bss = 0; // Reset just_bss mode
}
- state = -3; // No keyword (just EOL)
- label = NULL; // No label
- lab_sym = NULL; // No (exported) label
- equate = NULL; // No equate
- tk = tok; // Save first token in line
- pcloc = (VALUE)sloc; // Set beginning-of-line PC
+ state = -3; // No keyword (just EOL)
+ label = NULL; // No label
+ lab_sym = NULL; // No (exported) label
+ equate = NULL; // No equate
+ tk = tok; // Save first token in line
+ pcloc = (VALUE)sloc; // Set beginning-of-line PC
- loop1: // Internal line processing loop
+loop1: // Internal line processing loop
- if (*tok == EOL) // Restart loop if end-of-line
+ if (*tok == EOL) // Restart loop if end-of-line
goto loop;
+ // First token MUST be a symbol
if (*tok != SYMBOL)
- { // First token MUST be a symbol
+ {
error(syntax_error);
goto loop;
}
- j = (int)tok[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)
+ if (j == '=' || j == DEQUALS || j == SET || j == REG || j == EQUREG || j == CCDEF)
{
- equate = (char *)tok[1];
+ equate = string[tok[1]];
equtyp = j;
tok += 3;
goto normal;
}
+ // Skip past label (but record it)
if (j == ':' || j == DCOLON)
- { // Skip past label (but record it)
+ {
as68label:
- label = (char *)tok[1]; // Get label name
- labtyp = tok[2]; // Get label type
- tok += 3; // Go to next line token
+// 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 (*tok == EOL) // EOL is legal here...
+ // EOL is legal here...
+ if (*tok == EOL)
goto normal;
+ // Next token MUST be a symbol
if (*tok++ != SYMBOL)
- { // Next token MUST be a symbol
+ {
error(syntax_error);
goto loop;
}
- opname = p = (char *)*tok++; // Store opcode name here
+// 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:
{
j = mnbase[state] + (int)tolowertab[*p];
+ // Reject, character doesn't match
if (mncheck[j] != state)
- { // Reject, character doesn't match
- state = -1; // No match
+ {
+ state = -1; // No match
break;
}
+ // Must accept or reject at EOS
if (!*++p)
- { // Must accept or reject at EOS
- state = mnaccept[j]; // (-1 on no terminal match)
+ {
+ state = mnaccept[j]; // (-1 on no terminal match)
break;
}
siz = SIZN;
if (*tok == DOTW)
- siz = SIZW, ++tok;
+ siz = SIZW, tok++;
else if (*tok == DOTL)
- siz = SIZL, ++tok;
+ siz = SIZL, tok++;
else if (*tok == DOTB)
- siz = SIZB, ++tok;
+ siz = SIZB, tok++;
// Do special directives (500..999) (These must be handled in "real time")
if (state >= 500 && state < 1000)
case MN_ENDIF:
d_endif ();
goto loop;
- case MN_IIF: // .iif --- immediate if
+ case MN_IIF: // .iif --- immediate if
if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
goto loop;
goto loop;
goto loop1;
- case MN_MACRO: // .macro --- macro definition
+ case MN_MACRO: // .macro --- macro definition
if (!disabled)
{
if (label != NULL)
warn(lab_ignored);
- defmac();
+ DefineMacro();
}
goto loop;
- case MN_EXITM: // .exitm --- exit macro
- case MN_ENDM: // .endm --- same as .exitm
+ case MN_EXITM: // .exitm --- exit macro
+ case MN_ENDM: // .endm --- same as .exitm
if (!disabled)
{
if (label != NULL)
warn(lab_ignored);
- exitmac();
+ ExitMacro();
}
goto loop;
}
normal:
- if (disabled) // Conditionally disabled code
+ if (disabled) // Conditionally disabled code
goto loop;
// Do equates
if (equate != NULL)
{
- j = 0; // Pick global or local sym enviroment
+ // Pick global or local symbol enviroment
+#if 0
+ j = 0;
if (*equate == '.')
j = curenv;
-
+#else
+ j = (*equate == '.' ? curenv : 0);
+#endif
sy = lookup(equate, LABEL, j);
if (sy == NULL)
{
- sy = newsym(equate, LABEL, j);
+ sy = NewSymbol(equate, LABEL, j);
sy->sattr = 0;
if (equtyp == DEQUALS)
{
+ // Can't GLOBAL a local symbol
if (j)
- { // Can't GLOBAL a local symbol
+ {
error(locgl_error);
goto loop;
}
{
if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
{
- sy->sattre |= ~UNDEF_EQUR;
+//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
// 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 that we are in a RISC section
+ {
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))
- { // Check for register to equate to
- sy->sattre = EQUATEDREG | RISCSYM; // Mark as equated register
+ {
+ sy->sattre = EQUATEDREG | RISCSYM; // 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;
}
- sy->sattre |= regbank; // Store register bank
+#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)
- { // Checking for a register symbol
- sy2 = lookup((char *)tok[1], LABEL, j);
+ {
+ sy2 = lookup(string[tok[1]], LABEL, j);
+ // Make sure symbol is a valid equreg
if (!sy2 || !(sy2->sattre & EQUATEDREG))
- { // Make sure symbol is a valid equreg
+ {
error("invalid GPU/DSP .equr/.regequ definition");
goto loop;
}
else
{
- eattr = ABS | DEFINED | GLOBAL; // Copy symbols attributes
+ eattr = ABS | DEFINED | GLOBAL; // Copy symbols attributes
sy->sattre = sy2->sattre;
eval = (sy2->svalue & 0xFFFFF0FF);
tok += 2;
if (tok[0] == SYMBOL)
{
- sy2 = lookup((char *)tok[1], LABEL, j);
+ sy2 = lookup(string[tok[1]], LABEL, j);
if (!sy2 || !(sy2->sattre & EQUATEDCC))
{
else if (expr(exprbuf, &eval, &eattr, &esym) != OK)
goto loop;
}
+ //equ a equr
else if (*tok == SYMBOL)
- { //equ a equr
- 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;
}
if (label != NULL)
{
do_label:
- j = 0;
-
- if (*label == '.')
- j = curenv;
-
+ // Check for dot in front of label; means this is a local label if present
+ j = (*label == '.' ? curenv : 0);
sy = lookup(label, LABEL, j);
if (sy == NULL)
{
- sy = newsym(label, LABEL, j);
+ sy = NewSymbol(label, LABEL, j);
sy->sattr = 0;
sy->sattre = RISCSYM;
}
lab_sym = sy;
if (!j)
- ++curenv;
+ curenv++;
+ // Make label global
if (labtyp == DCOLON)
- { // Make label global
+ {
if (j)
{
error(locgl_error);
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 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))
{
for(state=0, p=opname; state>=0;)
{
j = mrbase[state] + (int)tolowertab[*p];
+ // Reject, character doesn't match
if (mrcheck[j] != state)
- { // Reject, character doesn't match
- state = -1; // No match
+ {
+ state = -1; // No match
break;
}
+ // Must accept or reject at EOS
if (!*++p)
- { // Must accept or reject at EOS
- state = mraccept[j]; // (-1 on no terminal match)
+ {
+ state = mraccept[j]; // (-1 on no terminal match)
break;
}
// Call RISC code generator if we found a mnemonic
if (state >= 3000)
{
- risccg(state);
+ GenerateRISCCode(state);
goto loop;
}
}
if (state < 0)
{
if ((sy = lookup(opname, MACRO, 0)) != NULL)
- invokemac(sy, siz);
+ 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
- chcheck(0L);
+ if (challoc - ch_size < 18) // Make sure have space in current chunk
+ chcheck(0);
m = &machtab[state - 1000];
+ // Call special-mode handler
if (m->mnattr & CGSPECIAL)
- { // Call special-mode handler
+ {
(*m->mnfunc)(m->mninst, siz);
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)
amsk0 = amsktab[am0];
amsk1 = amsktab[am1];
- // Catch attempts to use ".B" with an address register (yes, this check does work at this level)
+ // Catch attempts to use ".B" with an address register (yes, this check
+ // does work at this level)
if (siz == SIZB && (am0 == AREG || am1 == AREG))
{
error("cannot use '.b' with an address register");
//
// .if, Start Conditional Assembly
//
-int d_if (void)
+int d_if(void)
{
IFENT * rif;
WORD eattr;
// Alloc an IFENTRY
if ((rif = f_ifent) == NULL)
- rif = (IFENT *)amem((LONG)sizeof(IFENT));
+ rif = (IFENT *)malloc(sizeof(IFENT));
else
f_ifent = rif->if_prev;
if (!disabled)
{
- if (expr(exprbuf, &eval, &eattr, &esym) != OK) return 0;
+ if (expr(exprbuf, &eval, &eattr, &esym) != OK)
+ return 0;
if ((eattr & DEFINED) == 0)
return error(undef_error);
projects / rmac / blobdiff