Minor code cleanups.

[rmac] / procln.c

diff --git a/procln.c b/procln.c
index 65d7580b7a14a013fefae620dfa243275f292dc0..600aaa0e9685438bdf0504032ac73fe7f8ef7a53 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -41,8 +41,6 @@ static int disabled;                  // Assembly conditionally disabled
 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)
-int bfparam1;                                  // bfxxx instruction parameters
-int bfparam2;                                  // bfxxx instruction parameters
 
 const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
 const char comma_error[] = "missing comma";
@@ -73,35 +71,35 @@ LONG amsktab[0124] = {
        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 
-       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
+       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
@@ -152,7 +150,7 @@ loop:                                                       // Line processing loop label
        // Get another line of tokens
        if (TokenizeLine() == TKEOF)
        {
-if (debug) printf("Assemble: Found TKEOF flag...\n");
+DEBUG { printf("Assemble: Found TKEOF flag...\n"); }
                if (list_flag && listflag)                      // Flush last line of source
                        listeol();
 
@@ -162,7 +160,7 @@ if (debug) printf("Assemble: Found TKEOF flag...\n");
                return;
        }
 
-       DEBUG DumpTokenBuffer();
+       DEBUG { DumpTokenBuffer(); }
 
        if (list_flag)
        {
@@ -189,10 +187,11 @@ 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");
+               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;
        }
 
@@ -354,7 +353,7 @@ as68label:
                                                goto loop;
                                }
 
-                               defrept();
+                               DefineRept();
                        }
 
                        goto loop;
@@ -410,7 +409,7 @@ normal:
                        }
                        else
                        {
-                               errors("multiple equate to '%s'", sy->sname);
+                               error("multiple equate to '%s'", sy->sname);
                                goto loop;
                        }
                }
@@ -670,7 +669,7 @@ When checking to see if it's already been equated, issue a warning.
                if ((sy = lookup(opname, MACRO, 0)) != NULL)
                        InvokeMacro(sy, siz);
                else
-                       errors("unknown op '%s'", opname);
+                       error("unknown op '%s'", opname);
 
                goto loop;
        }
@@ -683,10 +682,10 @@ When checking to see if it's already been equated, issue a warning.
        }
 
        // Do mnemonics
-       // o  can't deposit instrs in BSS or ABS
-       // o  do automatic .EVEN for instrs
-       // o  allocate space for largest possible instr
-       // o  can't do ".b" operations with an address register
+       //  o  can't deposit instrs in BSS or ABS
+       //  o  do automatic .EVEN for instrs
+       //  o  allocate space for largest possible instr
+       //  o  can't do ".b" operations with an address register
        if (scattr & SBSS)
        {
                error("cannot initialize non-storage (BSS) section");
@@ -758,7 +757,7 @@ int HandleLabel(char * label, int labelType)
                symbol->sattre = 0;
        }
        else if (symbol->sattr & DEFINED)
-               return errors("multiply-defined label '%s'", label);
+               return error("multiply-defined label '%s'", label);
 
        // Put symbol in "order of definition" list if it's not already in it
        AddToSymbolDeclarationList(symbol);