.equr overhaul part 3: store and handle banks in .equr evaluation

[rmac] / expr.c

diff --git a/expr.c b/expr.c
index 527cb2a29c9a23fc1726a131ff2ddff302d99137..be0f347e6b76c7a4289d21624e468f886f2e2b4b 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -467,15 +467,15 @@ int expr(TOKEN * otk, uint64_t * a_value, WORD * a_attr, SYM ** a_esym)
 //                             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);
-                       }
+                       // Check register bank usage (moved to EvaluateRegisterFromTokenStream()))
+                       //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;
 #if 0
@@ -494,13 +494,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;
                        }