Get rid of some old and deprecated macros

[rmac] / sect.c

diff --git a/sect.c b/sect.c
index c00a9d6990bb2635928ec0b54b3ff87bcc95989d..3cedbb24221c2f7279b40612cce48faef1f9e3d4 100644 (file)
--- a/sect.c
+++ b/sect.c
@@ -18,7 +18,9 @@
 #include "riscasm.h"
 #include "symbol.h"
 #include "token.h"
-
+#define DEF_KW
+#include "kwtab.h"
+#undef DEF_KW
 
 // Function prototypes
 void MakeSection(int, uint16_t);
@@ -720,6 +722,7 @@ int ResolveFixups(int sno)
                        }
                        else if ((dw & FUMASKRISC) == FU_REGONE)
                        {
+                               eval -= KW_R0;
                                if (eval > 31)
                                {
                                        error("register one value out of range");
@@ -733,6 +736,7 @@ int ResolveFixups(int sno)
                        }
                        else if ((dw & FUMASKRISC) == FU_REGTWO)
                        {
+                               eval -= KW_R0;
                                if (eval > 31)
                                {
                                        error("register two value out of range");