Addendum for #193: Do less tokenisation processing when inside a disabled code block

[rmac] / expr.c

diff --git a/expr.c b/expr.c
index 527cb2a29c9a23fc1726a131ff2ddff302d99137..2361817784d7c0eccab31b9060de867613c1ff7d 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -290,16 +290,6 @@ int expr2(void)
                if (sy == NULL)
                        sy = NewSymbol(p, LABEL, j);
 
-               // Check register bank usage
-               if (sy->sattre & EQUATEDREG)
-               {
-                       if ((regbank == BANK_0) && (sy->sattre & BANK_1) && !altbankok)
-                               warn("equated symbol \'%s\' cannot be used in register bank 0", sy->sname);
-
-                       if ((regbank == BANK_1) && (sy->sattre & BANK_0) && !altbankok)
-                               warn("equated symbol \'%s\' cannot be used in register bank 1", sy->sname);
-               }
-
                *evalTokenBuffer.u32++ = SYMBOL;
                *evalTokenBuffer.u32++ = symbolNum;
                symbolPtr[symbolNum] = sy;
@@ -463,18 +453,6 @@ int expr(TOKEN * otk, uint64_t * a_value, WORD * a_attr, SYM ** a_esym)
                        if ((symbol->sattre & UNDEF_EQUR) && !riscImmTokenSeen)
                        {
                                error("undefined register equate '%s'", symbol->sname);
-//if we return right away, it returns some spurious errors...
-//                             return ERROR;
-                       }
-
-                       // Check register bank usage
-                       if (symbol->sattre & EQUATEDREG)
-                       {
-                               if ((regbank == BANK_0) && (symbol->sattre & BANK_1) && !altbankok)
-                                       warn("equated symbol '%s' cannot be used in register bank 0", symbol->sname);
-
-                               if ((regbank == BANK_1) && (symbol->sattre & BANK_0) && !altbankok)
-                                       warn("equated symbol '%s' cannot be used in register bank 1", symbol->sname);
                        }
 
                        *evalTokenBuffer.u32++ = SYMBOL;
@@ -494,13 +472,8 @@ be converted from a linked list into an array).
                        *a_value = (symbol->sattr & DEFINED ? symbol->svalue : 0);
                        *a_attr = (WORD)(symbol->sattr & ~GLOBAL);
 
-/*
-All that extra crap that was put into the svalue when doing the equr stuff is
-thrown away right here. What the hell is it for?
-*/
                        if (symbol->sattre & EQUATEDREG)
                        {
-                               *a_value &= 0x1F;
                                *a_attr |= RISCREG; // Mark it as a register, 'cause it is
                                *a_esym = symbol;
                        }