Various code cleanups, mainly to do with RISC assembly.

[rmac] / procln.c

diff --git a/procln.c b/procln.c
index 8127d7337cf070a6f4cb28ac8d66b6b8f61261db..61c9029ab095e186e0af0cc0bda75680bef7e66c 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -16,7 +16,7 @@
 #include "direct.h"
 #include "macro.h"
 #include "symbol.h"
-#include "risca.h"
+#include "riscasm.h"
 
 #define DEF_KW                                 // Declare keyword values 
 #include "kwtab.h"                             // Incl generated keyword tables & defs
@@ -29,6 +29,7 @@
 #define DECL_MR
 #include "risckw.h"
 
+
 IFENT * ifent;                                 // Current ifent
 static IFENT ifent0;                   // Root ifent
 static IFENT * f_ifent;                        // Freelist of ifents
@@ -103,7 +104,7 @@ void init_procln(void)
 //
 // Line Processor
 //
-void assemble(void)
+void Assemble(void)
 {
        int state;                                      // Keyword machine state (output)
        int j;                                          // Random int, must be fast
@@ -134,6 +135,7 @@ loop:                                                       // Line processing loop label
        // Get another line of tokens
        if (tokln() == TKEOF)
        {
+if (verb_flag) printf("Assemble: Found TKEOF flag...\n");
                if (list_flag && listflag)                      // Flush last line of source
                        listeol();
 
@@ -178,7 +180,6 @@ loop1:                                                                              // Internal line processing loop
 
        if (j == '=' || j == DEQUALS || j == SET || j == REG || j == EQUREG || j == CCDEF)
        {
-//             equate = (char *)tok[1];
                equate = string[tok[1]];
                equtyp = j;
                tok += 3;
@@ -316,7 +317,7 @@ as68label:
                                if (label != NULL)
                                        warn(lab_ignored);
 
-                               exitmac();
+                               ExitMacro();
                        }
 
                        goto loop;
@@ -345,11 +346,15 @@ normal:
        // Do equates
        if (equate != NULL)
        {
-               j = 0;                                                          // Pick global or local sym enviroment
+               // 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)
@@ -373,12 +378,14 @@ normal:
                {
                        if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR))
                        {
-                               sy->sattre |= ~UNDEF_EQUR; 
+//REALLY?                              sy->sattre |= ~UNDEF_EQUR; 
+                               sy->sattre &= ~UNDEF_EQUR; 
                                sy->svalue  = 0;
                        }
                        else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC))
                        {
-                               sy->sattre |= ~UNDEF_CC;
+//REALLY?                              sy->sattre |= ~UNDEF_CC;
+                               sy->sattre &= ~UNDEF_CC;
                                sy->svalue = 0;
                        }
                        else
@@ -398,6 +405,14 @@ 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)
                        {
@@ -410,33 +425,42 @@ normal:
                        {
                                sy->sattre  = EQUATEDREG | RISCSYM;     // 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
 
+                               // Default is no register bank specified
+                               registerbank = BANK_N;
+
+                               // Check for ",<bank #>" notation
                                if ((tok[1] == ',') && (tok[2] == CONST))
                                {
+                                       // Advance token pointer to the constant
                                        tok += 3;
 
+                                       // Anything other than a 0 or a 1 will result in "No Bank"
                                        if (*tok == 0)
                                                registerbank = BANK_0;
                                        else if (*tok == 1)
                                                registerbank = BANK_1;
-                                       else
-                                               registerbank = BANK_N;
-                               }
-                               else
-                               {
-                                       registerbank = BANK_N;
                                }
 
+// 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
                                eattr = ABS | DEFINED | GLOBAL;
-                               eval = 0x80000080 + (riscreg) + (registerbank << 8);
+// & what does this $80000080 constant mean???
+//                             eval = 0x80000080 + (riscreg) + (registerbank << 8);
+                               eval = riscreg;
                                tok++;
                        }
                        // Checking for a register symbol
                        else if (tok[0] == SYMBOL)
                        {
-//                             sy2 = lookup((char *)tok[1], LABEL, j);
                                sy2 = lookup(string[tok[1]], LABEL, j);
 
                                // Make sure symbol is a valid equreg
@@ -474,7 +498,6 @@ normal:
 
                        if (tok[0] == SYMBOL)
                        {
-//                             sy2 = lookup((char *)tok[1], LABEL, j);
                                sy2 = lookup(string[tok[1]], LABEL, j);
 
                                if (!sy2 || !(sy2->sattre & EQUATEDCC))
@@ -496,7 +519,6 @@ normal:
                //equ a equr
                else if (*tok == SYMBOL)
                {
-//                     sy2 = lookup((char *)tok[1], LABEL, j);
                        sy2 = lookup(string[tok[1]], LABEL, j);
 
                        if (sy2 && (sy2->sattre & EQUATEDREG))
@@ -533,10 +555,15 @@ normal:
        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);
 
@@ -570,7 +597,7 @@ do_label:
                lab_sym = sy;
 
                if (!j)
-                       ++curenv;
+                       curenv++;
 
                // Make label global
                if (labtyp == DCOLON)
@@ -621,7 +648,7 @@ do_label:
                // Call RISC code generator if we found a mnemonic
                if (state >= 3000)
                {
-                       risccg(state);
+                       GenerateRISCCode(state);
                        goto loop;
                }
        }