Code cleanup from last patch, also, version bump for same. :-)
[rmac] / procln.c
index 727b9dbb5f5cb630544c4c95435b4a3387248572..c7d47134e0a08f7b558b6b6d85259529a417ee09 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -1,24 +1,25 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 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 "symbol.h"
 #include "riscasm.h"
+#include "sect.h"
+#include "symbol.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)
 
 const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
@@ -46,7 +49,7 @@ 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,25 +71,35 @@ 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_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
@@ -94,7 +107,7 @@ int HandleLabel(char *, int);
 
 
 //
-// Initialize Line Processor
+// Initialize line processor
 //
 void InitLineProcessor(void)
 {
@@ -106,7 +119,7 @@ void InitLineProcessor(void)
 
 
 //
-// Line Processor
+// Line processor
 //
 void Assemble(void)
 {
@@ -127,7 +140,6 @@ 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
@@ -138,7 +150,7 @@ loop:                                                       // Line processing loop label
        // Get another line of tokens
        if (TokenizeLine() == TKEOF)
        {
-if (verb_flag) printf("Assemble: Found TKEOF flag...\n");
+if (debug) printf("Assemble: Found TKEOF flag...\n");
                if (list_flag && listflag)                      // Flush last line of source
                        listeol();
 
@@ -172,10 +184,12 @@ loop1:                                                                            // Internal line processing loop
        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;
        }
@@ -194,28 +208,19 @@ loop1:                                                                            // Internal line processing loop
        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;
-
-                       // Looks like another label follows the previous one, so handle
-                       // the previous one
-                       if (*tok == SYMBOL && tok[2] == ':')
-                       {
-//                             as68mode = 1;
-//                             goto do_label;
-                               if (HandleLabel(label, labtyp) != 0)
-                                       goto loop;
+                       if (HandleLabel(label, labtyp) != 0)
+                               goto loop;
 
-                               goto as68label;
-                       }
+                       goto as68label;
                }
        }
 
@@ -226,19 +231,11 @@ as68label:
        // 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:
@@ -271,12 +268,23 @@ as68label:
        // Check for ".b" ".w" ".l" after directive, macro or mnemonic.
        siz = SIZN;
 
-       if (*tok == DOTW) 
+       if (*tok == DOTW)
                siz = SIZW, tok++;
        else if (*tok == DOTL)
                siz = SIZL, tok++;
        else if (*tok == DOTB)
                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)
@@ -284,13 +292,13 @@ as68label:
                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)
@@ -315,6 +323,7 @@ as68label:
                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);
 
@@ -326,7 +335,6 @@ as68label:
                case MN_ENDM:                                           // .endm --- same as .exitm
                        if (!disabled)
                        {
-                               // Label on a macro definition is bad mojo... Warn the user
                                if (label != NULL)
                                        warn(lab_ignored);
 
@@ -337,17 +345,12 @@ as68label:
                case MN_REPT:
                        if (!disabled)
                        {
-#if 0
-                               if (label != NULL)
-                                       warn(lab_ignored);
-#else
                                // Handle labels on REPT directive lines...
                                if (label)
                                {
                                        if (HandleLabel(label, labtyp) != 0)
                                                goto loop;
                                }
-#endif
 
                                defrept();
                        }
@@ -369,14 +372,7 @@ normal:
        if (equate != NULL)
        {
                // 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)
@@ -400,9 +396,9 @@ normal:
                {
                        if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
                        {
-//REALLY?                              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))
                        {
@@ -417,9 +413,8 @@ normal:
                        }
                }
 
-               // 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
@@ -427,13 +422,13 @@ 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. :-/
+//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.
+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)
@@ -445,7 +440,8 @@ checking to see if it's already been equated, issue a warning.
                        // 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);
 //is there any reason to do this, since we're putting this in svalue?
 //i'm thinking, no. Let's test that out! :-D
@@ -480,9 +476,9 @@ checking to see if it's already been equated, issue a warning.
 // 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?
+// 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
@@ -576,81 +572,62 @@ checking to see if it's already been equated, issue a warning.
                        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:
-#if 0
-               // 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 = 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;
-
-               if (!j)
-                       curenv++;
+                       j = mpbase[state] + tolowertab[*p];
 
-               // 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;
                        }
 
-                       sy->sattr |= GLOBAL;
+                       if (!*++p)
+                       {                       // Must accept or reject at EOS
+                               state = mpaccept[j];    // (-1 on no terminal match)
+                               break;
+                       }
+
+                       state = mptab[j];
                }
-#else
-               // Non-zero == error occurred
-               if (HandleLabel(label, labtyp) != 0)
-                       goto loop;
 #endif
-               // If we're in as68 mode, and there's another label, go back and handle it
-//             if (as68_flag && as68mode)
-//                     goto as68label;
-       }
 
-       // Punt on EOL
-       if (state == -3)
-               goto loop;
+               // Call 6502 code generator if we found a mnemonic
+               if (state >= 2000)
+               {
+                       m6502cg(state - 2000);
+                       goto loop;
+               }
+       }
 
        // If we are in GPU or DSP mode and still in need of a mnemonic then search
        // for one
@@ -688,7 +665,7 @@ do_label:
        // 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);
@@ -714,10 +691,10 @@ do_label:
                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];
@@ -729,7 +706,7 @@ do_label:
                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)
@@ -746,6 +723,9 @@ do_label:
                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)
@@ -765,53 +745,53 @@ do_label:
 int HandleLabel(char * label, int labelType)
 {
        // Check for dot in front of label; means this is a local label if present
-       int j = (*label == '.' ? curenv : 0);
-       SYM * sy = lookup(label, LABEL, j);
+       int environment = (*label == '.' ? curenv : 0);
+       SYM * symbol = lookup(label, LABEL, environment);
 
-       if (sy == NULL)
+       if (symbol == NULL)
        {
-               sy = NewSymbol(label, LABEL, j);
-               sy->sattr = 0;
-               sy->sattre = RISCSYM;
+               symbol = NewSymbol(label, LABEL, environment);
+               symbol->sattr = 0;
+//             symbol->sattre = RISCSYM;
+               symbol->sattre = 0;
        }
-       else if (sy->sattr & DEFINED)
+       else if (symbol->sattr & DEFINED)
                return errors("multiply-defined label '%s'", label);
 
-       // 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 in it
+       AddToSymbolDeclarationList(symbol);
 
        if (orgactive)
        {
-               sy->svalue = orgaddr;
-               sy->sattr |= ABS | DEFINED | EQUATED;
+               symbol->svalue = orgaddr;
+               symbol->sattr |= ABS | DEFINED | EQUATED;
        }
        else
        {
-               sy->svalue = sloc;
-               sy->sattr |= DEFINED | cursect;
+               symbol->svalue = sloc;
+               symbol->sattr |= DEFINED | cursect;
        }
 
-       lab_sym = sy;
+       lab_sym = symbol;
 
-       if (!j)
+       if (0 == environment)
                curenv++;
 
        // Make label global if it has a double colon
        if (labelType == DCOLON)
        {
-               if (j)
+               if (environment != 0)
                        return error(locgl_error);
 
-               sy->sattr |= GLOBAL;
+               symbol->sattr |= GLOBAL;
        }
 
        return 0;
 }
 
 
-// 
-// .if, Start Conditional Assembly
+//
+// .if, Start conditional assembly
 //
 int d_if(void)
 {
@@ -845,8 +825,8 @@ int d_if(void)
 }
 
 
-// 
-// .else, Do Alternate Case For .if
+//
+// .else, Do alternate case for .if
 //
 int d_else(void)
 {
@@ -883,3 +863,4 @@ int d_endif (void)
        f_ifent = rif;
        return 0;
 }
+