Fixed bug when expanding macros with comments that have @, \, etc.

[rmac] / procln.c

diff --git a/procln.c b/procln.c
index 44b94d698332703eca6e06b0f5a784b7e086f9b5..2cd1bdc3d513b6b7476d33cea3c59b0e09f8b357 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"
@@ -36,7 +36,6 @@ 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
 SYM * lab_sym;                                 // Label on line (or NULL)
 
 const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
@@ -137,7 +136,7 @@ loop:                                                       // Line processing loop label
        // 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();
 
@@ -265,13 +264,13 @@ as68label:
                switch (state)
                {
                case MN_IF:
-                       d_if ();
+                       d_if();
                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)
@@ -395,13 +394,13 @@ 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. :-/
+//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.
+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)
@@ -629,10 +628,10 @@ checking to see if it's already been equated, issue a warning.
                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];
@@ -644,7 +643,7 @@ checking to see if it's already been equated, issue a warning.
                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)
@@ -661,6 +660,9 @@ checking to see if it's already been equated, issue a warning.
                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)