Fix for #159: Split register sets according to architecture into different tables...

[rmac] / procln.c

diff --git a/procln.c b/procln.c
index ef7bf1cc7be760b2bc52468670a2cd4056a3098b..4af12bd9000d95ab2001f85534a71c0b1a14670e 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -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
@@ -200,10 +203,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 +437,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;