//
#include "expr.h"
-#include "token.h"
-#include "listing.h"
+#include "direct.h"
#include "error.h"
+#include "listing.h"
+#include "mach.h"
#include "procln.h"
-#include "symbol.h"
+#include "riscasm.h"
#include "sect.h"
-#include "mach.h"
-#include "risca.h"
+#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 tokcl[128]; // Generated table of token classes
-static VALUE evstk[EVSTACKSIZE]; // Evaluator value stack
-static WORD evattr[EVSTACKSIZE]; // Evaluator attribute stack
+static char tokenClass[128]; // 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)
};
-char missym_error[] = "missing symbol";
-char * str_error = "missing symbol or string";
+const char missym_error[] = "missing symbol";
+const char str_error[] = "missing symbol or string";
// Convert expression to postfix
-static TOKEN * tk; // Deposit tokens here
-SYM * lookup();
-SYM * newsym();
+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[]
//
{
VALUE v;
- for(v=0; *p; ++p)
+ for(v=0; *p; p++)
v = (v << 8) | (*p & 0xFF);
return v;
//
void init_expr(void)
{
- int i; // Iterator
- char * p; // Token pointer
+ int i; // Iterator
+ char * p; // Token pointer
- // Initialize token-class table
- for(i=0; i<128; ++i) // Mark all entries END
- tokcl[i] = END;
+ // Initialize token-class table (all set to END)
+ for(i=0; i<128; i++)
+ tokenClass[i] = END;
- for(i=0, p=itokcl; *p!=1; ++p)
+ for(i=0, p=itokcl; *p!=1; p++)
{
if (*p == 0)
- ++i;
+ i++;
else
- tokcl[(int)(*p)] = (char)i;
+ tokenClass[(int)(*p)] = (char)i;
}
+
+ symbolNum = 0;
}
if (expr1() != OK)
return ERROR;
- while (tokcl[*tok] >= MULT)
+ while (tokenClass[*tok] >= MULT)
{
t = *tok++;
if (expr1() != OK)
return ERROR;
- *tk++ = t;
+ *evalTokenBuffer++ = t;
}
return OK;
WORD w;
int j;
- class = tokcl[*tok];
+ class = tokenClass[*tok];
if (*tok == '-' || class == UNARY)
{
if (t == '-')
t = UNMINUS;
- *tk++ = t;
+ *evalTokenBuffer++ = t;
}
else if (class == SUNARY)
{
switch ((int)*tok++)
{
case CR_TIME:
- *tk++ = CONST;
- *tk++ = dos_time();
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = dos_time();
break;
case CR_DATE:
- *tk++ = CONST;
- *tk++ = dos_date();
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = dos_date();
break;
case CR_MACDEF: // ^^macdef <macro-name>
if (*tok++ != SYMBOL)
return error(missym_error);
- p = (char *)*tok++;
-
- if (lookup(p, MACRO, 0) == NULL)
- w = 0;
- else
- w = 1;
-
- *tk++ = CONST;
- *tk++ = (TOKEN)w;
+ p = string[*tok++];
+ w = (lookup(p, MACRO, 0) == NULL ? 0 : 1);
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = (TOKEN)w;
break;
case CR_DEFINED:
w = DEFINED;
if (*tok++ != SYMBOL)
return error(missym_error);
- p = (char *)*tok++;
- j = 0;
-
- if (*p == '.')
- j = curenv;
-
- if ((sy = lookup(p, LABEL, j)) != NULL && (sy->sattr & w))
- w = 1;
- else
- w = 0;
-
- *tk++ = CONST;
- *tk++ = (TOKEN)w;
+ p = string[*tok++];
+ j = (*p == '.' ? curenv : 0);
+ w = ((sy = lookup(p, LABEL, j)) != NULL && (sy->sattr & w) ? 1 : 0);
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = (TOKEN)w;
break;
case CR_STREQ:
if (*tok != SYMBOL && *tok != STRING)
return error(str_error);
- p = (char *)tok[1];
+ p = string[tok[1]];
tok +=2;
if (*tok++ != ',')
if (*tok != SYMBOL && *tok != STRING)
return error(str_error);
- p2 = (char *)tok[1];
+ p = string[tok[1]];
tok += 2;
w = (WORD)(!strcmp(p, p2));
- *tk++ = CONST;
- *tk++ = (TOKEN)w;
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = (TOKEN)w;
break;
}
}
switch ((int)*tok++)
{
case CONST:
- *tk++ = CONST;
- *tk++ = *tok++;
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = *tok++;
break;
case SYMBOL:
- p = (char *)*tok++;
- j = 0;
-
- if (*p == '.')
- j = curenv;
-
+ p = string[*tok++];
+ j = (*p == '.' ? curenv : 0);
sy = lookup(p, LABEL, j);
if (sy == NULL)
- sy = newsym(p, LABEL, j);
+ sy = NewSymbol(p, LABEL, j);
// Check register bank usage
if (sy->sattre & EQUATEDREG)
warns("equated symbol \'%s\' cannot be used in register bank 1", sy->sname);
}
- *tk++ = SYMBOL;
- *tk++ = (TOKEN)sy;
+ *evalTokenBuffer++ = SYMBOL;
+#if 0
+ *evalTokenBuffer++ = (TOKEN)sy;
+#else
+ *evalTokenBuffer++ = symbolNum;
+ symbolPtr[symbolNum] = sy;
+ symbolNum++;
+#endif
break;
case STRING:
- *tk++ = CONST;
- *tk++ = str_value((char *)*tok++);
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = str_value(string[*tok++]);
break;
case '(':
if (expr0() != OK)
break;
case '$':
- *tk++ = ACONST; // Attributed const
- *tk++ = sloc; // Current location
- *tk++ = cursect | DEFINED; // Store attribs
+ *evalTokenBuffer++ = ACONST; // Attributed const
+ *evalTokenBuffer++ = sloc; // Current location
+ *evalTokenBuffer++ = cursect | DEFINED; // Store attribs
break;
case '*':
- *tk++ = ACONST; // Attributed const
+ *evalTokenBuffer++ = ACONST; // Attributed const
if (orgactive)
- *tk++ = orgaddr;
+ *evalTokenBuffer++ = orgaddr;
else
- *tk++ = pcloc; // Location at start of line
+ *evalTokenBuffer++ = pcloc; // Location at start of line
- *tk++ = ABS | DEFINED; // Store attribs
+ *evalTokenBuffer++ = ABS | DEFINED; // Store attribs
break;
default:
return error("bad expression");
//
int expr(TOKEN * otk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
{
- SYM * sy;
+ // Passed in values (once derefenced, that is) can all be zero. They are
+ // there so that the expression analyzer can fill them in as needed. The
+ // expression analyzer gets its input from the global token pointer "tok",
+ // and not from anything passed in by the user.
+ SYM * symbol;
char * p;
int j;
- tk = otk;
+ evalTokenBuffer = otk; // Set token pointer to 'exprbuf' (direct.c)
+ // Also set in various other places too (riscasm.c, e.g.)
// Optimize for single constant or single symbol.
if ((tok[1] == EOL)
|| (((*tok == CONST || *tok == SYMBOL) || (*tok >= KW_R0 && *tok <= KW_R31))
- && (tokcl[tok[2]] < UNARY)))
+ && (tokenClass[tok[2]] < UNARY)))
{
if (*tok >= KW_R0 && *tok <= KW_R31)
{
- *tk++ = CONST;
- *tk++ = *a_value = (*tok - KW_R0);
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = *a_value = (*tok - KW_R0);
*a_attr = ABS | DEFINED;
if (a_esym != NULL)
*a_esym = NULL;
tok++;
- *tk++ = ENDEXPR;
+ *evalTokenBuffer++ = ENDEXPR;
return OK;
}
else if (*tok == CONST)
{
- *tk++ = CONST;
- *tk++ = *a_value = tok[1];
+ *evalTokenBuffer++ = CONST;
+ *evalTokenBuffer++ = *a_value = tok[1];
*a_attr = ABS | DEFINED;
if (a_esym != NULL)
}
else if (*tok == '*')
{
- *tk++ = CONST;
+ *evalTokenBuffer++ = CONST;
if (orgactive)
- *tk++ = *a_value = orgaddr;
+ *evalTokenBuffer++ = *a_value = orgaddr;
else
- *tk++ = *a_value = pcloc;
+ *evalTokenBuffer++ = *a_value = pcloc;
*a_attr = ABS | DEFINED;
- //*tk++ =
if (a_esym != NULL)
*a_esym = NULL;
}
else
{
- p = (char *)tok[1];
- j = 0;
-
- if (*p == '.')
- j = curenv;
+ p = string[tok[1]];
+ j = (*p == '.' ? curenv : 0);
+ symbol = lookup(p, LABEL, j);
- sy = lookup(p, LABEL, j);
+ if (symbol == NULL)
+ symbol = NewSymbol(p, LABEL, j);
- if (sy == NULL)
- sy = newsym(p, LABEL, j);
+ symbol->sattr |= REFERENCED;
- sy->sattr |= REFERENCED;
+ // Check for undefined register equates
+ if (symbol->sattre & UNDEF_EQUR)
+ {
+ errors("undefined register equate '%s'", symbol->sname);
+//if we return right away, it returns some spurious errors...
+// return ERROR;
+ }
// Check register bank usage
- if (sy->sattre & EQUATEDREG)
+ if (symbol->sattre & EQUATEDREG)
{
- if ((regbank == BANK_0) && (sy->sattre & BANK_1) && !altbankok)
- warns("equated symbol \'%s\' cannot be used in register bank 0", sy->sname);
+ if ((regbank == BANK_0) && (symbol->sattre & BANK_1) && !altbankok)
+ warns("equated symbol '%s' cannot be used in register bank 0", symbol->sname);
- if ((regbank == BANK_1) && (sy->sattre & BANK_0) && !altbankok)
- warns("equated symbol \'%s\' cannot be used in register bank 1", sy->sname);
+ if ((regbank == BANK_1) && (symbol->sattre & BANK_0) && !altbankok)
+ warns("equated symbol '%s' cannot be used in register bank 1", symbol->sname);
}
- *tk++ = SYMBOL;
- *tk++ = (TOKEN)sy;
-
- if (sy->sattr & DEFINED)
- *a_value = sy->svalue;
+ *evalTokenBuffer++ = SYMBOL;
+#if 0
+ *evalTokenBuffer++ = (TOKEN)symbol;
+#else
+/*
+While this approach works, it's wasteful. It would be better to use something
+that's already available, like the symbol "order defined" table (which needs to
+be converted from a linked list into an array).
+*/
+ *evalTokenBuffer++ = symbolNum;
+ symbolPtr[symbolNum] = symbol;
+ symbolNum++;
+#endif
+
+ if (symbol->sattr & DEFINED)
+ *a_value = symbol->svalue;
else
*a_value = 0;
- if (sy->sattre & EQUATEDREG)
+/*
+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 = (WORD)(sy->sattr & ~GLOBAL);
+ *a_attr = (WORD)(symbol->sattr & ~GLOBAL);
- if ((sy->sattr & (GLOBAL|DEFINED)) == GLOBAL && a_esym != NULL)
- *a_esym = sy;
+ if ((symbol->sattr & (GLOBAL | DEFINED)) == GLOBAL && a_esym != NULL)
+ *a_esym = symbol;
}
tok += 2;
- *tk++ = ENDEXPR;
+ *evalTokenBuffer++ = ENDEXPR;
return OK;
}
if (expr0() != OK)
return ERROR;
- *tk++ = ENDEXPR;
+ *evalTokenBuffer++ = ENDEXPR;
return evexpr(otk, a_value, a_attr, a_esym);
}
SYM * esym;
WORD sym_seg;
- sval = evstk; // (Empty) initial stack
+ sval = evstk; // (Empty) initial stack
sattr = evattr;
- esym = NULL; // No external symbol involved
+ esym = NULL; // No external symbol involved
sym_seg = 0;
while (*tk != ENDEXPR)
switch ((int)*tk++)
{
case SYMBOL:
- sy = (SYM *)*tk++;
- sy->sattr |= REFERENCED; // Set "referenced" bit
+// sy = (SYM *)*tk++;
+ sy = symbolPtr[*tk++];
+ sy->sattr |= REFERENCED; // Set "referenced" bit
if (!(sy->sattr & DEFINED))
{
+ // Reference to undefined symbol
if (!(sy->sattr & GLOBAL))
- { // Reference to undefined symbol
+ {
*a_attr = 0;
*a_value = 0;
return OK;
}
- if (esym != NULL) // Check for multiple externals
+ if (esym != NULL) // Check for multiple externals
return error(seg_error);
esym = sy;
if (sy->sattr & DEFINED)
{
- *++sval = sy->svalue; // Push symbol's value
+ *++sval = sy->svalue; // Push symbol's value
}
else
{
- *++sval = 0; // 0 for undefined symbols
+ *++sval = 0; // 0 for undefined symbols
}
- *++sattr = (WORD)(sy->sattr & ~GLOBAL); // Push attribs
- sym_seg = (WORD)(sy->sattr & (TEXT|DATA|BSS));
+ *++sattr = (WORD)(sy->sattr & ~GLOBAL); // Push attribs
+ sym_seg = (WORD)(sy->sattr & (TEXT | DATA | BSS));
break;
case CONST:
- *++sval = *tk++; // Push value
- *++sattr = ABS|DEFINED; // Push simple attribs
+ *++sval = *tk++; // Push value
+ *++sattr = ABS | DEFINED; // Push simple attribs
break;
case ACONST:
- *++sval = *tk++; // Push value
- *++sattr = (WORD)*tk++; // Push attribs
+ *++sval = *tk++; // Push value
+ *++sattr = (WORD)*tk++; // Push attribs
break;
// Binary "+" and "-" matrix:
// [1] + : Error
// - : ABS
case '+':
- --sval; // Pop value
- --sattr; // Pop attrib
- *sval += sval[1]; // Compute value
+ --sval; // Pop value
+ --sattr; // Pop attrib
+ *sval += sval[1]; // Compute value
- if (!(*sattr & (TEXT|DATA|BSS)))
+ if (!(*sattr & (TEXT | DATA | BSS)))
*sattr = sattr[1];
- else if (sattr[1] & (TEXT|DATA|BSS))
+ else if (sattr[1] & (TEXT | DATA | BSS))
return error(seg_error);
break;
case '-':
- --sval; // Pop value
- --sattr; // Pop attrib
- *sval -= sval[1]; // Compute value
+ --sval; // Pop value
+ --sattr; // Pop attrib
+ *sval -= sval[1]; // Compute value
- attr = (WORD)(*sattr & (TEXT|DATA|BSS));
+ attr = (WORD)(*sattr & (TEXT | DATA | BSS));
if (!attr)
*sattr = sattr[1];
- else if (sattr[1] & (TEXT|DATA|BSS))
+ else if (sattr[1] & (TEXT | DATA | BSS))
{
if (!(attr & sattr[1]))
return error(seg_error);
else
- *sattr &= ~(TEXT|DATA|BSS);
+ *sattr &= ~(TEXT | DATA | BSS);
}
break;
- // Unary operators only work on ABS items
+ // Unary operators only work on ABS items
case UNMINUS:
- if (*sattr & (TEXT|DATA|BSS))
+ if (*sattr & (TEXT | DATA | BSS))
error(seg_error);
*sval = -(int)*sval;
- *sattr = ABS|DEFINED; // Expr becomes absolute
+ *sattr = ABS | DEFINED; // Expr becomes absolute
break;
case '!':
- if (*sattr & (TEXT|DATA|BSS))
+ if (*sattr & (TEXT | DATA | BSS))
error(seg_error);
*sval = !*sval;
- *sattr = ABS|DEFINED; // Expr becomes absolute
+ *sattr = ABS | DEFINED; // Expr becomes absolute
break;
case '~':
- if (*sattr & (TEXT|DATA|BSS))
+ if (*sattr & (TEXT | DATA | BSS))
error(seg_error);
*sval = ~*sval;
- *sattr = ABS|DEFINED; // Expr becomes absolute
+ *sattr = ABS | DEFINED; // Expr becomes absolute
break;
- // Comparison operators must have two values that
- // are in the same segment, but that's the only requirement.
+ // Comparison operators must have two values that
+ // are in the same segment, but that's the only requirement.
case LE:
--sattr;
--sval;
if ((*sattr & TDB) != (sattr[1] & TDB))
error(seg_error);
- *sattr = ABS|DEFINED;
+ *sattr = ABS | DEFINED;
*sval = *sval <= sval[1];
break;
case GE:
if ((*sattr & TDB) != (sattr[1] & TDB))
error(seg_error);
- *sattr = ABS|DEFINED;
+ *sattr = ABS | DEFINED;
*sval = *sval >= sval[1];
break;
case '>':
if ((*sattr & TDB) != (sattr[1] & TDB))
error(seg_error);
- *sattr = ABS|DEFINED;
+ *sattr = ABS | DEFINED;
*sval = *sval > sval[1];
break;
case '<':
if ((*sattr & TDB) != (sattr[1] & TDB))
error(seg_error);
- *sattr = ABS|DEFINED;
+ *sattr = ABS | DEFINED;
*sval = *sval < sval[1];
break;
case NE:
if ((*sattr & TDB) != (sattr[1] & TDB))
error(seg_error);
- *sattr = ABS|DEFINED;
+ *sattr = ABS | DEFINED;
*sval = *sval != sval[1];
break;
case '=':
if ((*sattr & TDB) != (sattr[1] & TDB))
error(seg_error);
- *sattr = ABS|DEFINED;
+ *sattr = ABS | DEFINED;
*sval = *sval == sval[1];
break;
- // All other binary operators must have two ABS items
- // to work with. They all produce an ABS value.
+ // All other binary operators must have two ABS items
+ // to work with. They all produce an ABS value.
default:
// GH - Removed for v1.0.15 as part of the fix for indexed loads.
//if ((*sattr & (TEXT|DATA|BSS)) || (*--sattr & (TEXT|DATA|BSS)))
//error(seg_error);
- *sattr = ABS|DEFINED; // Expr becomes absolute
+ *sattr = ABS | DEFINED; // Expr becomes absolute
switch ((int)tk[-1])
{
case '*':
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
*sval *= sval[1];
break;
case '/':
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
if (sval[1] == 0)
return error("divide by zero");
break;
case '%':
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
if (sval[1] == 0)
return error("mod (%) by zero");
break;
case SHL:
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
*sval <<= sval[1];
break;
case SHR:
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
*sval >>= sval[1];
break;
case '&':
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
*sval &= sval[1];
break;
case '^':
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
*sval ^= sval[1];
break;
case '|':
--sval;
- --sattr; // Pop attrib
+ --sattr; // Pop attrib
*sval |= sval[1];
break;
default:
- interror(5); // Bad operator in expression stream
+ interror(5); // Bad operator in expression stream
}
}
}
// overiding the symbol segments and not being included :(
//*a_attr = *sattr | sym_seg; // Copy value + attrib
- *a_attr = *sattr; // Copy value + attrib
+ *a_attr = *sattr; // Copy value + attrib
*a_value = *sval;
return OK;