]> Shamusworld >> Repos - rmac/blobdiff - procln.c
Fix for "*" getting bad section attributes, reported by A. Seed.
[rmac] / procln.c
index 61c9029ab095e186e0af0cc0bda75680bef7e66c..8739ce6db05630d2a1726efb0efdae67f9042c12 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -3,7 +3,7 @@
 // PROCLN.C - Line Processing
 // Copyright (C) 199x Landon Dyer, 2011 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"
@@ -39,11 +39,11 @@ VALUE pcloc;                                        // Value of "PC" at beginning of line
 IFENT * ifent;                                 // Current ifent
 SYM * lab_sym;                                 // Label on line (or NULL)
 
-char extra_stuff[] = "extra (unexpected) text found after addressing mode";
-char * comma_error = "missing comma";
-char * syntax_error = "syntax error";
-char * locgl_error = "cannot GLOBL local symbol";
-char * lab_ignored = "label ignored";
+const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
+const char comma_error[] = "missing comma";
+const char syntax_error[] = "syntax error";
+const char locgl_error[] = "cannot GLOBL local symbol";
+const char lab_ignored[] = "label ignored";
 
 // Table to convert an addressing-mode number to a bitmask.
 LONG amsktab[0112] = {
@@ -89,10 +89,14 @@ LONG amsktab[0112] = {
 };                                                                                                     // 0112 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,7 +106,7 @@ void init_procln(void)
 
 
 //
-// Line Processor
+// Line processor
 //
 void Assemble(void)
 {
@@ -123,17 +127,15 @@ 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
-
        listflag = 0;                           // Initialise listing flag
 
 loop:                                                  // Line processing loop label
 
        // Get another line of tokens
-       if (tokln() == TKEOF)
+       if (TokenizeLine() == TKEOF)
        {
 if (verb_flag) printf("Assemble: Found TKEOF flag...\n");
                if (list_flag && listflag)                      // Flush last line of source
@@ -169,10 +171,10 @@ 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);
+               error("syntax error; expected symbol");
                goto loop;
        }
 
@@ -190,43 +192,34 @@ 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;
+                       if (HandleLabel(label, labtyp) != 0)
+                               goto loop;
 
-                       if (*tok == SYMBOL && tok[2] == ':')
-                       {
-                               as68mode = 1;
-                               goto do_label;
-                       }
+                       goto as68label;
                }
        }
 
-       if (*tok == EOL)                                                // EOL is legal here...
+       // EOL is legal here...
+       if (*tok == EOL)
                goto normal;
 
        // Next token MUST be a symbol
        if (*tok++ != SYMBOL)
        {
-               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:
@@ -260,11 +253,11 @@ as68label:
        siz = SIZN;
 
        if (*tok == DOTW) 
-               siz = SIZW, ++tok;
+               siz = SIZW, tok++;
        else if (*tok == DOTL)
-               siz = SIZL, ++tok;
+               siz = SIZL, tok++;
        else if (*tok == DOTB)
-               siz = SIZB, ++tok;
+               siz = SIZB, tok++;
 
        // Do special directives (500..999) (These must be handled in "real time")
        if (state >= 500 && state < 1000)
@@ -303,6 +296,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);
 
@@ -324,8 +318,12 @@ as68label:
                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();
                        }
@@ -347,14 +345,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)
@@ -380,7 +371,7 @@ normal:
                        {
 //REALLY?                              sy->sattre |= ~UNDEF_EQUR; 
                                sy->sattre &= ~UNDEF_EQUR; 
-                               sy->svalue  = 0;
+                               sy->svalue = 0;
                        }
                        else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
                        {
@@ -395,9 +386,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
@@ -423,15 +413,24 @@ 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?
-                               sy->sattre |= (riscreg << 8);           // Store register number
-
+//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 #>" notation
+                               // Check for ",<bank #>" override notation
                                if ((tok[1] == ',') && (tok[2] == CONST))
                                {
                                        // Advance token pointer to the constant
@@ -444,14 +443,18 @@ checking to see if it's already been equated, issue a warning.
                                                registerbank = BANK_1;
                                }
 
+#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?
+// 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;
 // & what does this $80000080 constant mean???
 //                             eval = 0x80000080 + (riscreg) + (registerbank << 8);
@@ -526,7 +529,8 @@ checking to see if it's already been equated, issue a warning.
                                sy->stype = sy2->stype;
                                sy->sattr = sy2->sattr;
                                sy->sattre = sy2->sattre;
-                               sy->svalue = (sy2->svalue & 0xFFFFF0FF);
+//ICK                          sy->svalue = (sy2->svalue & 0xFFFFF0FF);
+                               sy->svalue = sy2->svalue;
                                goto loop;
                        }
                        else if (expr(exprbuf, &eval, &eattr, &esym) != OK)
@@ -541,79 +545,22 @@ 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:
-               // Check for dot in front of label; means this is a local label if present
-#if 0
-               j = 0;
-
-               if (*label == '.')
-                       j = curenv;
-#else
-               j = (*label == '.' ? curenv : 0);
-#endif
-
-               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);
-
-               if (orgactive)
-               {
-                       sy->svalue = orgaddr;
-                       sy->sattr |= ABS | DEFINED | EQUATED;
-               }
-               else
-               {
-                       sy->svalue = sloc;
-                       sy->sattr |= DEFINED | cursect;
-               }
-
-               lab_sym = sy;
-
-               if (!j)
-                       curenv++;
-
-               // Make label global
-               if (labtyp == DCOLON)
-               {
-                       if (j)
-                       {
-                               error(locgl_error);
-                               goto loop;
-                       }
-
-                       sy->sattr |= GLOBAL;
-               }
-
-               // 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
@@ -682,10 +629,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];
@@ -697,7 +644,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)
@@ -727,8 +674,59 @@ do_label:
 }
 
 
+//
+// Handle the creation of labels
+//
+int HandleLabel(char * label, int labelType)
+{
+       // 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);
+
+       if (symbol == NULL)
+       {
+               symbol = NewSymbol(label, LABEL, environment);
+               symbol->sattr = 0;
+//             symbol->sattre = RISCSYM;
+               symbol->sattre = 0;
+       }
+       else if (symbol->sattr & DEFINED)
+               return errors("multiply-defined label '%s'", label);
+
+       // Put symbol in "order of definition" list if it's not already in it
+       AddToSymbolDeclarationList(symbol);
+
+       if (orgactive)
+       {
+               symbol->svalue = orgaddr;
+               symbol->sattr |= ABS | DEFINED | EQUATED;
+       }
+       else
+       {
+               symbol->svalue = sloc;
+               symbol->sattr |= DEFINED | cursect;
+       }
+
+       lab_sym = symbol;
+
+       if (0 == environment)
+               curenv++;
+
+       // Make label global if it has a double colon
+       if (labelType == DCOLON)
+       {
+               if (environment != 0)
+                       return error(locgl_error);
+
+               symbol->sattr |= GLOBAL;
+       }
+
+       return 0;
+}
+
+
 // 
-// .if, Start Conditional Assembly
+// .if, Start conditional assembly
 //
 int d_if(void)
 {
@@ -763,7 +761,7 @@ int d_if(void)
 
 
 // 
-// .else, Do Alternate Case For .if
+// .else, Do alternate case for .if
 //
 int d_else(void)
 {
@@ -800,3 +798,4 @@ int d_endif (void)
        f_ifent = rif;
        return 0;
 }
+