Code cleanup from last patch, also, version bump for same. :-)

[rmac] / procln.c

diff --git a/procln.c b/procln.c
index e851408994f8ad788fb7539a1d9e00f4696c0cb4..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
 //
 // 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
 // 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 "procln.h"

-#include "listing.h"
+#include "6502.h"

 #include "amode.h"
 #include "amode.h"

+#include "direct.h"

 #include "error.h"
 #include "error.h"

-#include "sect.h"

 #include "expr.h"
 #include "expr.h"

+#include "listing.h"

 #include "mach.h"
 #include "mach.h"

-#include "direct.h"

 #include "macro.h"
 #include "macro.h"

-#include "symbol.h"

 #include "riscasm.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
 #include "kwtab.h"                             // Incl generated keyword tables & defs
 
 #define DEF_MN                                 // Incl 68k keyword definitions


@@ -29,14 +30,16 @@
 #define DECL_MR
 #include "risckw.h"
 
 #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
 
 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";
 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.
 const char lab_ignored[] = "label ignored";
 
 // Table to convert an addressing-mode number to a bitmask.

-LONG amsktab[0112] = {
+LONG amsktab[0124] = {

        M_DREG, M_DREG, M_DREG, M_DREG,
        M_DREG, M_DREG, M_DREG, M_DREG,
 
        M_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_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
 
 
 // Function prototypes


@@ -94,7 +107,7 @@ int HandleLabel(char *, int);
 
 
 //
 
 
 //

-// Initialize Line Processor
+// Initialize line processor

 //
 void InitLineProcessor(void)
 {
 //
 void InitLineProcessor(void)
 {


@@ -106,7 +119,7 @@ void InitLineProcessor(void)
 
 
 //
 
 
 //

-// Line Processor
+// Line processor

 //
 void Assemble(void)
 {
 //
 void Assemble(void)
 {


@@ -137,7 +150,7 @@ loop:                                                       // Line processing loop label
        // Get another line of tokens
        if (TokenizeLine() == TKEOF)
        {
        // 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();
 
                if (list_flag && listflag)                      // Flush last line of source
                        listeol();
 


@@ -174,6 +187,9 @@ loop1:                                                                              // Internal line processing loop
        // First token MUST be a symbol (Shamus: not sure why :-/)
        if (*tok != SYMBOL)
        {
        // 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;
        }
                error("syntax error; expected symbol");
                goto loop;
        }


@@ -252,12 +268,23 @@ as68label:
        // Check for ".b" ".w" ".l" after directive, macro or mnemonic.
        siz = SIZN;
 
        // 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++;
                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)
 
        // Do special directives (500..999) (These must be handled in "real time")
        if (state >= 500 && state < 1000)


@@ -265,13 +292,13 @@ as68label:
                switch (state)
                {
                case MN_IF:
                switch (state)
                {
                case MN_IF:

-                       d_if ();
+                       d_if();

                goto loop;
                case MN_ELSE:
                        d_else();
                        goto loop;
                case MN_ENDIF:
                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)
                        goto loop;
                case MN_IIF:                                            // .iif --- immediate if
                        if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)


@@ -369,9 +396,9 @@ normal:
                {
                        if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
                        {
                {
                        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))
                        {
                        }
                        else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
                        {


@@ -386,9 +413,8 @@ normal:
                        }
                }
 
                        }
                }
 

-               // Put symbol in "order of definition" list
-               if (!(sy->sattr & SDECLLIST))
-                       AddToSymbolOrderList(sy);
+               // Put symbol in "order of definition" list if it's not already there
+               AddToSymbolDeclarationList(sy);

 
                // Parse value to equate symbol to;
                // o  .equr
 
                // Parse value to equate symbol to;
                // o  .equr


@@ -396,13 +422,13 @@ normal:
                // o  everything else
                if (equtyp == EQUREG)
                {
                // 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
 /*
 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)
 */
                        // Check that we are in a RISC section
                        if (!rgpu && !rdsp)


@@ -568,6 +594,41 @@ checking to see if it's already been equated, issue a warning.
        if (state == -3)
                goto loop;
 
        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))
+       {
+#ifdef ST
+               state = kmatch(opname, mpbase, mpcheck, mptab, mpaccept);
+#else
+               for(state=0, p=opname; state>= 0; )
+               {
+                       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];
+               }
+#endif
+
+               // 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))
        // 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))


@@ -604,7 +665,7 @@ checking to see if it's already been equated, issue a warning.
        // Invoke macro or complain about bad mnemonic
        if (state < 0)
        {
        // 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);
                        InvokeMacro(sy, siz);
                else
                        errors("unknown op '%s'", opname);


@@ -630,10 +691,10 @@ checking to see if it's already been equated, issue a warning.
                goto loop;
        }
 
                goto loop;
        }
 

-       if (sloc & 1)                                                   // Automatic .even
+       if (sloc & 1)                                   // Automatic .even

                auto_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];
                chcheck(0);
 
        m = &machtab[state - 1000];


@@ -645,7 +706,7 @@ checking to see if it's already been equated, issue a warning.
                goto loop;
        }
 
                goto loop;
        }
 

-       if (amode(1) < 0)                                               // Parse 0, 1 or 2 addr modes
+       if (amode(1) < 0)                               // Parse 0, 1 or 2 addr modes

                goto loop;
 
        if (*tok != EOL)
                goto loop;
 
        if (*tok != EOL)


@@ -662,6 +723,9 @@ checking to see if it's already been equated, issue a warning.
                goto loop;
        }
 
                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)
        for(;;)
        {
                if ((m->mnattr & siz) && (amsk0 & m->mn0) != 0 && (amsk1 & m->mn1) != 0)


@@ -694,9 +758,8 @@ int HandleLabel(char * label, int labelType)
        else if (symbol->sattr & DEFINED)
                return errors("multiply-defined label '%s'", label);
 
        else if (symbol->sattr & DEFINED)
                return errors("multiply-defined label '%s'", label);
 

-       // Put symbol in "order of definition" list
-       if (!(symbol->sattr & SDECLLIST))
-               AddToSymbolOrderList(symbol);
+       // Put symbol in "order of definition" list if it's not already in it
+       AddToSymbolDeclarationList(symbol);

 
        if (orgactive)
        {
 
        if (orgactive)
        {


@@ -727,8 +790,8 @@ int HandleLabel(char * label, int labelType)
 }
 
 
 }
 
 

-// 
-// .if, Start Conditional Assembly
+//
+// .if, Start conditional assembly

 //
 int d_if(void)
 {
 //
 int d_if(void)
 {


@@ -762,8 +825,8 @@ int d_if(void)
 }
 
 
 }
 
 

-// 
-// .else, Do Alternate Case For .if
+//
+// .else, Do alternate case for .if

 //
 int d_else(void)
 {
 //
 int d_else(void)
 {