Code cleanup from last patch, also, version bump for same. :-)
[rmac] / procln.c
index 4afd5388c092035de15310389b7bf7156dded649..c7d47134e0a08f7b558b6b6d85259529a417ee09 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -7,16 +7,17 @@
 //
 
 #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
 #include "kwtab.h"                             // Incl generated keyword tables & defs
 #define DECL_MR
 #include "risckw.h"
 
-#define DEF_MP                 /* include 6502 keyword definitions */
-#define DECL_MP                        /* include 6502 keyword state machine tables */
-#include "6502.h"
-extern int m6502;              /* 1, assembler in .6502 mode */
-extern VOID m6502cg();         /* 6502 code generator */
-extern VOID m6502obj(int ofd);
+#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
@@ -51,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,
 
@@ -73,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
@@ -179,6 +187,9 @@ loop1:                                                                              // Internal line processing loop
        // First token MUST be a symbol (Shamus: not sure why :-/)
        if (*tok != SYMBOL)
        {
+        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;
        }
@@ -263,6 +274,17 @@ as68label:
                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)
@@ -572,44 +594,41 @@ When checking to see if it's already been equated, issue a warning.
        if (state == -3)
                goto loop;
 
-       /*
-        *  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))
+       // 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;)
+               for(state=0, p=opname; state>= 0; )
                {
                        j = mpbase[state] + tolowertab[*p];
-                       if (mpcheck[j] != state)        /* reject, character doesn't match */
+
+                       if (mpcheck[j] != state)        // Reject, character doesn't match
                        {
-                               state = -1;             /* no match */
+                               state = -1;             // No match
                                break;
                        }
 
                        if (!*++p)
-                       {                       /* must accept or reject at EOS */
-                               state = mpaccept[j];    /* (-1 on no terminal match) */
+                       {                       // Must accept or reject at EOS
+                               state = mpaccept[j];    // (-1 on no terminal match)
                                break;
                        }
+
                        state = mptab[j];
                }
 #endif
 
-               /*
-                *  Call 6502 code generator if we found a mnemonic
-                */
+               // 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
        if ((rgpu || rdsp) && (state < 0 || state >= 1000))