Fix for #203. Thanks to Steven Tattersall for the report.

[rmac] / procln.c

diff --git a/procln.c b/procln.c
index ef7bf1cc7be760b2bc52468670a2cd4056a3098b..52513e0be04f7d42bbc4c7dc77c5f35b2dbbabb8 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Renamed Macro Assembler for all Atari computers
 // PROCLN.C - Line Processing
-// Copyright (C) 199x Landon Dyer, 2011-2021 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2022 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -28,6 +28,8 @@
 #define DEF_MN                                 // Incl 68k keyword definitions
 #define DECL_MN                                        // Incl 68k keyword state machine tables
 #include "mntab.h"
+#define DEF_REG68                              // Incl 68k register definitions
+#include "68kregs.h"
 
 #define DEF_MR
 #define DECL_MR
@@ -44,7 +46,8 @@
 #define DEF_DSP                                        // Include DSP56K keywords definitions
 #define DECL_DSP                               // Include DSP56K keyword state machine tables
 #include "dsp56kkw.h"
-
+#define DEF_REG56                              // Include DSP56K register definitions
+#include "56kregs.h"
 
 IFENT * ifent;                                 // Current ifent
 static IFENT ifent0;                   // Root ifent
@@ -114,11 +117,9 @@ LONG amsktab[0124] = {
        M_FPSCR                 // 0123
 };                                     // 0123 length
 
-
 // Function prototypes
 int HandleLabel(char *, int);
 
-
 //
 // Initialize line processor
 //
@@ -130,7 +131,6 @@ void InitLineProcessor(void)
        ifent0.if_state = 0;
 }
 
-
 //
 // Line processor
 //
@@ -200,10 +200,7 @@ 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");
+               error("syntax error; expected symbol");
 
                goto loop;
        }
@@ -437,7 +434,7 @@ When checking to see if it's already been equated, issue a warning.
                        // Check for register to equate to
                        // This check will change once we split the registers per architecture into their own tables
                        // and out of kw.tab. But for now it'll do...
-                       if ((*tok >= KW_D0) && (*tok <= KW_BA))
+                       if ((*tok >= REG68_D0) && (*tok <= REG56_BA))
                        {
                                sy->sattre = EQUATEDREG;        // Mark as equated register
                                equreg = *tok;
@@ -825,7 +822,6 @@ When checking to see if it's already been equated, issue a warning.
        goto loop;
 }
 
-
 //
 // Handle the creation of labels
 //
@@ -876,4 +872,3 @@ int HandleLabel(char * label, int labelType)
 
        return 0;
 }
-