EOY minor update.
[rmac] / procln.c
index d44517cf1b011e75e2337474dd96b89568613adc..9c207bfdefe8481ca71195ad1ad7c3aaaf7c3471 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -1,52 +1,68 @@
 //
-// 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-2020 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 "dsp56k_amode.h"
+#include "dsp56k_mach.h"
 #include "error.h"
-#include "sect.h"
 #include "expr.h"
+#include "listing.h"
 #include "mach.h"
-#include "direct.h"
 #include "macro.h"
+#include "op.h"
+#include "riscasm.h"
+#include "sect.h"
 #include "symbol.h"
-#include "risca.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)
+#define DEF_MP                                 // Include 6502 keyword definitions
+#define DECL_MP                                        // Include 6502 keyword state machine tables
+#include "6502kw.h"
 
+#define DEF_MO                                 // Include OP keyword definitions
+#define DECL_MO                                        // Include OP keyword state machine tables
+#include "opkw.h"
 
-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";
+#define DEF_DSP                                        // Include DSP56K keywords definitions
+#define DECL_DSP                               // Include DSP56K keyword state machine tables
+#include "dsp56kkw.h"
+
+
+IFENT * ifent;                                 // Current ifent
+static IFENT ifent0;                   // Root ifent
+IFENT * f_ifent;                               // Freelist of ifents
+int disabled;                                  // Assembly conditionally disabled
+int just_bss;                                  // 1, ds.b in microprocessor mode
+uint32_t pcloc;                                        // Value of "PC" at beginning of line
+SYM * lab_sym;                                 // Label on line (or NULL)
+char * label_defined;                  // The name of the last label defined in current line (if any)
+
+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,
 
@@ -68,31 +84,45 @@ 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
+       0x30,                   // 0112
+       0x30,                   // 0113
+       0L,                             // 0114
+       0L,                             // 0115
+       0L,                             // 0116
+       0L,                             // 0117
+       M_CACHE40,              // 0120
+       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;
@@ -102,116 +132,127 @@ void init_procln(void)
 
 
 //
-// Line Processor
+// 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)
+       uint64_t 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()
+       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)
+       {
+DEBUG { 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
+       label_defined = NULL;                                   // No label defined yet
+       lab_sym = NULL;                                                 // No (exported) label
+       equate = NULL;                                                  // No equate
+       tk = tok;                                                               // Save first token in line
+       pcloc = (uint32_t)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 (Shamus: not sure why :-/)
        if (*tok != SYMBOL)
-       {                                     // First token MUST be a 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;
        }
 
-       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
-
-               // Handle multiple labels; if there's another label, go process it, 
-               // and come back at `as68label' above.
-               if (as68_flag)
+               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] == ':'))
                {
-                       as68mode = 0;
+                       if (HandleLabel(label, labtyp) != 0)
+                               goto loop;
 
-                       if (*tok == SYMBOL && tok[2] == ':')
-                       {
-                               as68mode = 1;
-                               goto do_label;
-                       }
+                       label_defined = label;
+
+                       goto as68label;
                }
        }
 
-       if (*tok == EOL)                                          // EOL is legal here...
+       // EOL is legal here...
+       if (*tok == EOL)
                goto normal;
 
+       // First token MUST be a symbol (if we get here, tok didn't advance)
        if (*tok++ != SYMBOL)
-       {                                   // Next token MUST be a symbol
-               error(syntax_error);
+       {
+               error("syntax error; expected symbol");
                goto loop;
        }
 
-       opname = p = (char *)*tok++;                             // Store opcode name here
+       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:
@@ -224,15 +265,17 @@ as68label:
        {
                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;
                }
 
@@ -242,12 +285,17 @@ as68label:
        // Check for ".b" ".w" ".l" after directive, macro or mnemonic.
        siz = SIZN;
 
-       if (*tok == DOTW) 
-               siz = SIZW, ++tok;
-       else if (*tok == DOTL)
-               siz = SIZL, ++tok;
-       else if (*tok == DOTB)
-               siz = SIZB, ++tok;
+       switch (*tok)
+       {
+       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")
        if (state >= 500 && state < 1000)
@@ -255,15 +303,18 @@ as68label:
                switch (state)
                {
                case MN_IF:
-                       d_if ();
-               goto loop;
+                       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
+
+               case MN_IIF:                                            // .iif --- immediate if
                        if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
                                goto loop;
 
@@ -283,37 +334,48 @@ as68label:
                                goto loop;
 
                        goto loop1;
-               case MN_MACRO:                                     // .macro --- macro definition
+
+               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);
 
-                               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;
+
                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();
+                                       label_defined = label;
+                               }
+
+                               HandleRept();
                        }
 
                        goto loop;
+
                case MN_ENDR:
                        if (!disabled)
                                error("mis-nested .endr");
@@ -323,28 +385,26 @@ as68label:
        }
 
 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
-
-               if (*equate == '.')
-                       j = curenv;
-
+               // Pick global or local symbol enviroment
+               j = (*equate == '.' ? curenv : 0);
                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;
                                }
@@ -356,24 +416,23 @@ normal:
                {
                        if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
                        {
-                               sy->sattre |= ~UNDEF_EQUR; 
-                               sy->svalue  = 0;
+                               sy->sattre &= ~UNDEF_EQUR;
+                               sy->svalue = 0;
                        }
                        else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
                        {
-                               sy->sattre |= ~UNDEF_CC;
+                               sy->sattre &= ~UNDEF_CC;
                                sy->svalue = 0;
                        }
                        else
                        {
-                               errors("multiple equate to '%s'", sy->sname);
+                               error("multiple equate to '%s'", sy->sname);
                                goto loop;
                        }
                }
 
-               // 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
@@ -381,51 +440,84 @@ normal:
                // 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
+                               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;
 
-                                       if (*tok == 0)
+                                       // Anything other than a 0 or a 1 will result in "No Bank"
+                                       if (*(uint64_t *)tok == 0)
                                                registerbank = BANK_0;
-                                       else if (*tok == 1)
+                                       else if (*(uint64_t *)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);
+                               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;
@@ -442,7 +534,7 @@ normal:
                        if (reglist(&rmask) < 0)
                                goto loop;
 
-                       eval = (VALUE)rmask;
+                       eval = (uint32_t)rmask;
                        eattr = ABS | DEFINED;
                }
                else if (equtyp == CCDEF)
@@ -452,7 +544,7 @@ normal:
 
                        if (tok[0] == SYMBOL)
                        {
-                               sy2 = lookup((char *)tok[1], LABEL, j);
+                               sy2 = lookup(string[tok[1]], LABEL, j);
 
                                if (!sy2 || !(sy2->sattre & EQUATEDCC))
                                {
@@ -470,16 +562,17 @@ normal:
                        else if (expr(exprbuf, &eval, &eattr, &esym) != OK)
                                goto loop;
                }
+               // equ an 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);
+                               sy->svalue = sy2->svalue;
                                goto loop;
                        }
                        else if (expr(exprbuf, &eval, &eattr, &esym) != OK)
@@ -494,105 +587,213 @@ normal:
                        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
-                       listvalue(eval);
 
-               at_eol();                                             // Must be at EOL now
+               if (list_flag)                                  // Put value in listing
+                       listvalue((uint32_t)eval);
+
+               ErrorIfNotAtEOL();                              // Must be at EOL now
                goto loop;
        }
 
        // Do labels
        if (label != NULL)
        {
-do_label:
-               j = 0;
+               // Non-zero == error occurred
+               if (HandleLabel(label, labtyp) != 0)
+                       goto loop;
 
-               if (*label == '.')
-                       j = curenv;
+               label_defined = label;
+       }
 
-               sy = lookup(label, LABEL, j);
+       // Punt on EOL
+       if (state == -3)
+               goto loop;
 
-               if (sy == NULL)
+       // 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 = newsym(label, LABEL, j);
-                       sy->sattr = 0;
-                       sy->sattre = RISCSYM;
+                       j = mpbase[state] + tolowertab[*p];
+
+                       if (mpcheck[j] != state)        // Reject, character doesn't match
+                       {
+                               state = -1;             // No match
+                               break;
+                       }
+
+                       if (!*++p)
+                       {                       // Must accept or reject at EOS
+                               state = mpaccept[j];    // (-1 on no terminal match)
+                               break;
+                       }
+
+                       state = mptab[j];
                }
-               else if (sy->sattr & DEFINED)
+#endif
+
+               // Call 6502 code generator if we found a mnemonic
+               if (state >= 2000)
                {
-                       errors("multiply-defined label '%s'", label);
+                       m6502cg(state - 2000);
                        goto loop;
                }
+       }
 
-               // Put symbol in "order of definition" list
-               if (!(sy->sattr & SDECLLIST))
-                       sym_decl(sy);
-
-               if (orgactive)
+       // 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;)
                {
-                       sy->svalue = orgaddr;
-                       sy->sattr |= ABS | DEFINED | EQUATED;
+                       j = mrbase[state] + (int)tolowertab[*p];
+
+                       // Reject, character doesn't match
+                       if (mrcheck[j] != state)
+                       {
+                               state = -1;                                     // No match
+                               break;
+                       }
+
+                       // Must accept or reject at EOS
+                       if (!*++p)
+                       {
+                               state = mraccept[j];            // (-1 on no terminal match)
+                               break;
+                       }
+
+                       state = mrtab[j];
                }
-               else
+
+               // Call RISC code generator if we found a mnemonic
+               if (state >= 3000)
                {
-                       sy->svalue = sloc;
-                       sy->sattr |= DEFINED | cursect;
+                       GenerateRISCCode(state);
+                       goto loop;
                }
+       }
 
-               lab_sym = sy;
+       // If we are in OP mode and still in need of a mnemonic then search for one
+       if (robjproc && ((state < 0) || (state >= 1000)))
+       {
+               for(state=0, p=opname; state>=0;)
+               {
+                       j = mobase[state] + (int)tolowertab[*p];
 
-               if (!j)
-                       ++curenv;
+                       // Reject, character doesn't match
+                       if (mocheck[j] != state)
+                       {
+                               state = -1;                                     // No match
+                               break;
+                       }
 
-               if (labtyp == DCOLON)
-               {                                // Make label global
-                       if (j)
+                       // Must accept or reject at EOS
+                       if (!*++p)
                        {
-                               error(locgl_error);
-                               goto loop;
+                               state = moaccept[j];            // (-1 on no terminal match)
+                               break;
                        }
 
-                       sy->sattr |= GLOBAL;
+                       state = motab[j];
                }
 
-               // If we're in as68 mode, and there's another label, go back and handle it
-               if (as68_flag && as68mode)
-                       goto as68label;
+               // Call OP code generator if we found a mnemonic
+               if (state >= 3100)
+               {
+                       GenerateOPCode(state);
+                       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))
+       // If we are in 56K mode and still in need of a mnemonic then search for one
+       if (dsp56001 && ((state < 0) || (state >= 1000)))
        {
                for(state=0, p=opname; state>=0;)
                {
-                       j = mrbase[state] + (int)tolowertab[*p];
+                       j = dspbase[state] + (int)tolowertab[*p];
 
-                       if (mrcheck[j] != state)
-                       {                          // Reject, character doesn't match
-                               state = -1;                                     // No match
+                       // Reject, character doesn't match
+                       if (dspcheck[j] != state)
+                       {
+                               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 = dspaccept[j];           // (-1 on no terminal match)
                                break;
                        }
 
-                       state = mrtab[j];
+                       state = dsptab[j];
                }
 
-               // Call RISC code generator if we found a mnemonic
-               if (state >= 3000)
+               // Call DSP code generator if we found a mnemonic
+               if (state >= 2000)
                {
-                       risccg(state);
+                       LONG parcode;
+                       int operands;
+                       MNTABDSP * md = &dsp56k_machtab[state - 2000];
+                       deposit_extra_ea = 0;   // Assume no extra word needed
+
+                       if (md->mnfunc == dsp_mult)
+                       {
+                               // Special case for multiplication instructions: they require
+                               // 3 operands
+                               if ((operands = dsp_amode(3)) == ERROR)
+                                       goto loop;
+                       }
+                       else if ((md->mnattr & PARMOVE) && md->mn0 != M_AM_NONE)
+                       {
+                               if (dsp_amode(2) == ERROR)
+                                       goto loop;
+                       }
+                       else if ((md->mnattr & PARMOVE) && md->mn0 == M_AM_NONE)
+                       {
+                               // Instructions that have parallel moves but use no operands
+                               // (probably only move). In this case, don't parse addressing
+                               // modes--just go straight to parallel parse
+                               dsp_am0 = dsp_am1 = M_AM_NONE;
+                       }
+                       else
+                       {
+                               // Non parallel move instructions can have up to 4 parameters
+                               // (well, only tcc instructions really)
+                               if ((operands = dsp_amode(4)) == ERROR)
+                                       goto loop;
+
+                               if (operands == 4)
+                               {
+                                       dsp_tcc4(md->mninst);
+                                       goto loop;
+                               }
+                       }
+
+                       if (md->mnattr & PARMOVE)
+                       {
+                               // Check for parallel moves
+                               if ((parcode = parmoves(dsp_a1reg)) == ERROR)
+                                       goto loop;
+                       }
+                       else
+                       {
+                               if (*tok != EOL)
+                                       error("parallel moves not allowed with this instruction");
+
+                               parcode = 0;
+                       }
+
+                       while ((dsp_am0 & md->mn0) == 0 || (dsp_am1 & md->mn1) == 0)
+                               md = &dsp56k_machtab[md->mncont];
+
+                       (*md->mnfunc)(md->mninst | (parcode << 8));
                        goto loop;
                }
        }
@@ -600,10 +801,10 @@ do_label:
        // Invoke macro or complain about bad mnemonic
        if (state < 0)
        {
-               if ((sy = lookup(opname, MACRO, 0)) != NULL) 
-                       invokemac(sy, siz);
+               if ((sy = lookup(opname, MACRO, 0)) != NULL)
+                       InvokeMacro(sy, siz);
                else
-                       errors("unknown op '%s'", opname);
+                       error("unknown op '%s'", opname);
 
                goto loop;
        }
@@ -616,31 +817,32 @@ do_label:
        }
 
        // Do mnemonics
-       // o  can't deposit instrs in BSS or ABS
-       // o  do automatic .EVEN for instrs
-       // o  allocate space for largest possible instr
-       // o  can't do ".b" operations with an address register
+       //  o  can't deposit instrs in BSS or ABS
+       //  o  do automatic .EVEN for instrs
+       //  o  allocate space for largest possible instr
+       //  o  can't do ".b" operations with an address register
        if (scattr & SBSS)
        {
                error("cannot initialize non-storage (BSS) section");
                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)
@@ -649,95 +851,75 @@ do_label:
        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");
                goto loop;
        }
 
-       for(;;)
-       {
-               if ((m->mnattr & siz) && (amsk0 & m->mn0) != 0 && (amsk1 & m->mn1) != 0)
-               {
-                       (*m->mnfunc)(m->mninst, siz);
-                       goto loop;
-               }
+       // Keep a backup of chptr (used for optimisations during codegen)
+       chptr_opcode = chptr;
 
+       while (!(m->mnattr & siz) || (amsk0 & m->mn0) == 0 || (amsk1 & m->mn1) == 0)
                m = &machtab[m->mncont];
-       }
+
+       DEBUG { printf("    68K: mninst=$%X, siz=$%X, mnattr=$%X, amsk0=$%X, mn0=$%X, amsk1=$%X, mn1=$%X\n", m->mninst, siz, m->mnattr, amsk0, m->mn0, amsk1, m->mn1); }
+
+       (*m->mnfunc)(m->mninst, siz);
+       goto loop;
 }
 
 
-// 
-// .if, Start Conditional Assembly
 //
-int d_if (void)
+// Handle the creation of labels
+//
+int HandleLabel(char * label, int labelType)
 {
-       IFENT * rif;
-       WORD eattr;
-       VALUE eval;
-       SYM * esym;
-
-       // Alloc an IFENTRY
-       if ((rif = f_ifent) == NULL)
-               rif = (IFENT *)amem((LONG)sizeof(IFENT));
-       else
-               f_ifent = rif->if_prev;
+       // 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);
 
-       rif->if_prev = ifent;
-       ifent = rif;
-
-       if (!disabled)
+       if (symbol == NULL)
        {
-               if (expr(exprbuf, &eval, &eattr, &esym) != OK) return 0;
-
-               if ((eattr & DEFINED) == 0)
-                       return error(undef_error);
-
-               disabled = !eval;
+               symbol = NewSymbol(label, LABEL, environment);
+               symbol->sattr = 0;
+               symbol->sattre = 0;
        }
+       else if (symbol->sattr & DEFINED)
+               return error("multiply-defined label '%s'", label);
 
-       rif->if_state = (WORD)disabled;
-       return 0;
-}
-
+       // Put symbol in "order of definition" list if it's not already in it
+       AddToSymbolDeclarationList(symbol);
 
-// 
-// .else, Do Alternate Case For .if
-//
-int d_else(void)
-{
-       IFENT * rif = ifent;
-
-       if (rif->if_prev == NULL)
-               return error("mismatched .else");
-
-       if (disabled)
-               disabled = rif->if_prev->if_state;
+       if (orgactive)
+       {
+               symbol->svalue = orgaddr;
+               symbol->sattr |= ABS | DEFINED | EQUATED;
+       }
        else
-               disabled = 1;
+       {
+               symbol->svalue = sloc;
+               symbol->sattr |= DEFINED | cursect;
+       }
 
-       rif->if_state = (WORD)disabled;
-       return 0;
-}
+       lab_sym = symbol;
 
+       // Yes, our CS professors told us to write checks for equality this way,
+       // but damn, it hurts my brain every time I look at it. :-/
+       if (0 == environment)
+               curenv++;
 
-//
-// .endif, End of conditional assembly block
-// This is also called by fpop() to pop levels of IFENTs in case a macro or
-// include file exits early with `exitm' or `end'.
-//
-int d_endif (void)
-{
-       IFENT * rif = ifent;
+       // Make label global if it has a double colon
+       if (labelType == DCOLON)
+       {
+               if (environment != 0)
+                       return error(locgl_error);
 
-       if (rif->if_prev == NULL)
-               return error("mismatched .endif");
+               symbol->sattr |= GLOBAL;
+       }
 
-       ifent = rif->if_prev;
-       disabled = rif->if_prev->if_state;
-       rif->if_prev = f_ifent;
-       f_ifent = rif;
        return 0;
 }
+