X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=expr.c;h=8e2c33aa11f93e37538e13a75a91daa293d5832f;hp=f582408c5773be5f90d77c13220ebfefee679a58;hb=d0c28c349ddfb8393568037f68bddbe8979ce0df;hpb=75969398d9b8a9f82ea76fc4e4cbfb97b11160a4

diff --git a/expr.c b/expr.c
index f582408..8e2c33a 100644
--- a/expr.c
+++ b/expr.c
@@ -3,7 +3,7 @@
 // EXPR.C - Expression Analyzer
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #include "expr.h"
@@ -17,45 +17,48 @@
 #include "symbol.h"
 #include "token.h"
 
-#define DEF_KW							// Declare keyword values 
-#include "kwtab.h"						// Incl generated keyword tables & defs
+#define DEF_KW						// Declare keyword values 
+#include "kwtab.h"					// Incl generated keyword tables & defs
 
-static char tokenClass[128];					// Generated table of token classes
-static VALUE evstk[EVSTACKSIZE];		// Evaluator value stack
-static WORD evattr[EVSTACKSIZE];		// Evaluator attribute stack
+// N.B.: The size of tokenClass should be identical to the largest value of
+//       a token; we're assuming 256 but not 100% sure!
+static char tokenClass[256];		// Generated table of token classes
+static VALUE evstk[EVSTACKSIZE];	// Evaluator value stack
+static WORD evattr[EVSTACKSIZE];	// Evaluator attribute stack
 
 // Token-class initialization list
 char itokcl[] = {
-	0,									// END
-	CONST, SYMBOL, 0,					// ID 
-	'(', '[', '{', 0,					// OPAR
-	')', ']', '}', 0,					// CPAR 
-	CR_DEFINED, CR_REFERENCED,			// SUNARY (special unary)
+	0,								// END
+	CONST, SYMBOL, 0,				// ID 
+	'(', '[', '{', 0,				// OPAR
+	')', ']', '}', 0,				// CPAR 
+	CR_DEFINED, CR_REFERENCED,		// SUNARY (special unary)
 	CR_STREQ, CR_MACDEF,
 	CR_DATE, CR_TIME, 0,
-	'!', '~', UNMINUS, 0,				// UNARY
-	'*', '/', '%', 0,					// MULT 
-	'+', '-', 0,						// ADD 
-	SHL, SHR, 0,						// SHIFT 
-	LE, GE, '<', '>', NE, '=', 0,		// REL 
-	'&', 0,								// AND 
-	'^', 0,								// XOR 
-	'|', 0,								// OR 
-	1									// (the end) 
+	'!', '~', UNMINUS, 0,			// UNARY
+	'*', '/', '%', 0,				// MULT 
+	'+', '-', 0,					// ADD 
+	SHL, SHR, 0,					// SHIFT 
+	LE, GE, '<', '>', NE, '=', 0,	// REL 
+	'&', 0,							// AND 
+	'^', 0,							// XOR 
+	'|', 0,							// OR 
+	1								// (the end) 
 };
 
 const char missym_error[] = "missing symbol";
 const char str_error[] = "missing symbol or string";
 
 // Convert expression to postfix
-static TOKEN * evalTokenBuffer;			// Deposit tokens here (this is really a
-										// pointer to exprbuf from direct.c)
-										// (Can also be from others, like riscasm.c)
-static symbolNum;						// Pointer to the entry in symbolPtr[]
+static TOKEN * evalTokenBuffer;		// Deposit tokens here (this is really a
+									// pointer to exprbuf from direct.c)
+									// (Can also be from others, like
+									// riscasm.c)
+static symbolNum;					// Pointer to the entry in symbolPtr[]
 
 
 //
-// Obtain a String Value
+// Obtain a string value
 //
 static VALUE str_value(char * p)
 {
@@ -69,15 +72,15 @@ static VALUE str_value(char * p)
 
 
 //
-// Initialize Expression Analyzer
+// Initialize expression analyzer
 //
 void InitExpression(void)
 {
-	int i;									// Iterator
-	char * p;								// Token pointer
+	int i;
+	char * p;
 
 	// Initialize token-class table (all set to END)
-	for(i=0; i<128; i++)
+	for(i=0; i<256; i++)
 		tokenClass[i] = END;
 
 	for(i=0, p=itokcl; *p!=1; p++)
@@ -273,17 +276,10 @@ int expr2(void)
 	case '*':
 		*evalTokenBuffer++ = ACONST;				// Attributed const
 
-#if 0
-		if (orgactive)
-			*evalTokenBuffer++ = orgaddr;
-		else
-			*evalTokenBuffer++ = pcloc;				// Location at start of line
-#else
 		// pcloc == location at start of line
 		*evalTokenBuffer++ = (orgactive ? orgaddr : pcloc);
-#endif
-
-		*evalTokenBuffer++ = ABS | DEFINED;			// Store attribs
+		// '*' takes attributes of current section, not ABS!
+		*evalTokenBuffer++ = cursect | DEFINED;
 		break;
 	default:
 		return error("bad expression");
@@ -352,7 +348,8 @@ int expr(TOKEN * otk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			else
 				*evalTokenBuffer++ = *a_value = pcloc;
 
-			*a_attr = ABS | DEFINED;
+			// '*' takes attributes of current section, not ABS!
+			*a_attr = cursect | DEFINED;
 
 			if (a_esym != NULL)
 				*a_esym = NULL;
@@ -364,14 +361,22 @@ int expr(TOKEN * otk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			p = string[tok[1]];
 			j = (*p == '.' ? curenv : 0);
 			symbol = lookup(p, LABEL, j);
+#if 0
+printf("eval: Looking up symbol (%s) [=%08X]\n", p, symbol);
+if (symbol)
+	printf("      attr=%04X, attre=%08X, val=%i, name=%s\n", symbol->sattr, symbol->sattre, symbol->svalue, symbol->sname);
+#endif
 
 			if (symbol == NULL)
 				symbol = NewSymbol(p, LABEL, j);
 
 			symbol->sattr |= REFERENCED;
 
-			// Check for undefined register equates
-			if (symbol->sattre & UNDEF_EQUR)
+			// Check for undefined register equates, but only if it's not part
+			// of a #<SYMBOL> construct, as it could be that the label that's
+			// been undefined may later be used as an address label--which
+			// means it will be fixed up later, and thus, not an error.
+			if ((symbol->sattre & UNDEF_EQUR) && !riscImmTokenSeen)
 			{
 				errors("undefined register equate '%s'", symbol->sname);
 //if we return right away, it returns some spurious errors...
@@ -416,14 +421,15 @@ thrown away right here. What the hell is it for?
 
 			*a_attr = (WORD)(symbol->sattr & ~GLOBAL);
 
-			if ((symbol->sattr & (GLOBAL | DEFINED)) == GLOBAL && a_esym != NULL)
+			if ((symbol->sattr & (GLOBAL | DEFINED)) == GLOBAL
+				&& a_esym != NULL)
 				*a_esym = symbol;
 
 			tok += 2;
 		}
 		else
 		{
-			// Unknown type here... Alert the user!
+			// Unknown type here... Alert the user!,
 			error("undefined RISC register in expression");
 			// Prevent spurious error reporting...
 			tok++;
@@ -497,7 +503,7 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			}
 
 			*++sattr = (WORD)(sy->sattr & ~GLOBAL);	// Push attribs
-			sym_seg = (WORD)(sy->sattr & (TEXT | DATA | BSS));
+			sym_seg = (WORD)(sy->sattr & TDB);
 			break;
 		case CONST:
 //printf("evexpr(): CONST = %i\n", *tk);
@@ -527,9 +533,9 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			--sattr;						// Pop attrib 
 			*sval += sval[1];				// Compute value
 
-			if (!(*sattr & (TEXT | DATA | BSS)))
+			if (!(*sattr & TDB))
 				*sattr = sattr[1];
-			else if (sattr[1] & (TEXT | DATA | BSS))
+			else if (sattr[1] & TDB)
 				return error(seg_error);
 
 			break;
@@ -539,23 +545,22 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			--sattr;						// Pop attrib 
 			*sval -= sval[1];				// Compute value
 
-			attr = (WORD)(*sattr & (TEXT | DATA | BSS));
-
+			attr = (WORD)(*sattr & TDB);
+#if 0
+printf("EVEXPR (-): sym1 = %X, sym2 = %X\n", attr, sattr[1]);
+#endif
+			// If symbol1 is ABS, take attributes from symbol2
 			if (!attr)
 				*sattr = sattr[1];
-			else if (sattr[1] & (TEXT | DATA | BSS))
-			{
-				if (!(attr & sattr[1]))
-					return error(seg_error);
-				else
-					*sattr &= ~(TEXT | DATA | BSS);
-			}
+			// Otherwise, they're both TDB and so attributes cancel out
+			else if (sattr[1] & TDB)
+				*sattr &= ~TDB;
 
 			break;
 		// Unary operators only work on ABS items
 		case UNMINUS:
 //printf("evexpr(): UNMINUS\n");
-			if (*sattr & (TEXT | DATA | BSS))
+			if (*sattr & TDB)
 				error(seg_error);
 
 			*sval = -(int)*sval;
@@ -563,7 +568,7 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			break;
 		case '!':
 //printf("evexpr(): !\n");
-			if (*sattr & (TEXT | DATA | BSS))
+			if (*sattr & TDB)
 				error(seg_error);
 
 			*sval = !*sval;
@@ -571,7 +576,7 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 			break;
 		case '~':
 //printf("evexpr(): ~\n");
-			if (*sattr & (TEXT | DATA | BSS))
+			if (*sattr & TDB)
 				error(seg_error);
 
 			*sval = ~*sval;
@@ -726,3 +731,4 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 
 	return OK;
 }
+