-////////////////////////////////////////////////////////////////////////////////////////////////////
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+//
+// RMAC - Reboot's Macro Assembler for all Atari computers
// EXPR.C - Expression Analyzer
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 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"
-#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
+// 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 uint64_t 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)
- 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)
+ 0, // END
+ CONST, FCONST, SYMBOL, 0, // ID
+ '(', '[', '{', 0, // OPAR
+ ')', ']', '}', 0, // CPAR
+ CR_DEFINED, CR_REFERENCED, // SUNARY (special unary)
+ CR_STREQ, CR_MACDEF,
+ CR_DATE, CR_TIME,
+ CR_ABSCOUNT, 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)
};
-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 int symbolNum; // Pointer to the entry in symbolPtr[]
+
//
-// --- Obtain a String Value -----------------------------------------------------------------------
+// Obtain a string value
//
+static uint32_t str_value(char * p)
+{
+ uint32_t v;
-static VALUE str_value(char *p) {
- VALUE v;
+ for(v=0; *p; p++)
+ v = (v << 8) | (*p & 0xFF);
- for(v = 0; *p; ++p)
- v = (v << 8) | (*p & 0xff);
- return(v);
+ return v;
}
+
//
-// --- Initialize Expression Analyzer --------------------------------------------------------------
+// Initialize expression analyzer
//
+void InitExpression(void)
+{
+ // Initialize token-class table (all set to END)
+ for(int i=0; i<256; i++)
+ tokenClass[i] = END;
-void init_expr(void) {
- int i; // Iterator
- char *p; // Token pointer
+ int i = 0;
- // Initialize token-class table
- for(i = 0; i < 128; ++i) // Mark all entries END
- tokcl[i] = END;
+ for(char * p=itokcl; *p!=1; p++)
+ {
+ if (*p == 0)
+ i++;
+ else
+ tokenClass[(int)(*p)] = (char)i;
+ }
- for(i = 0, p = itokcl; *p != 1; ++p)
- if(*p == 0)
- ++i;
- else
- tokcl[(int)(*p)] = (char)i;
+ symbolNum = 0;
}
+
//
-// --- Binary operators (all the same precedence) --------------------------------------------------
+// Binary operators (all the same precedence)
//
+int expr0(void)
+{
+ TOKEN t;
+
+ if (expr1() != OK)
+ return ERROR;
-int expr0(void) {
- TOKEN t;
-
- if(expr1() != OK)
- return(ERROR);
- while(tokcl[*tok] >= MULT) {
- t = *tok++;
- if(expr1() != OK)
- return(ERROR);
- *tk++ = t;
- }
- return(OK);
+ while (tokenClass[*tok] >= MULT)
+ {
+ t = *tok++;
+
+ if (expr1() != OK)
+ return ERROR;
+
+ *evalTokenBuffer++ = t;
+ }
+
+ return OK;
}
-//
-// --- Unary operators (detect unary '-') ----------------------------------------------------------
+
//
+// Unary operators (detect unary '-')
+// ggn: If expression starts with a plus then also eat it up.
+// For some reason the parser gets confused when this happens and
+// emits a "bad expression".
+//
+int expr1(void)
+{
+ int class;
+ TOKEN t;
+ SYM * sy;
+ char * p, * p2;
+ WORD w;
+ int j;
+ uint64_t * evalTokenBuffer64;
+
+ class = tokenClass[*tok];
+
+ if (*tok == '-' || *tok == '+' || class == UNARY)
+ {
+ t = *tok++;
+
+ if (expr2() != OK)
+ return ERROR;
+
+ if (t == '-')
+ t = UNMINUS;
+
+ // With leading + we don't have to deposit
+ // anything to the buffer because there's
+ // no unary '+' nor we have to do anything about it
+ if (t != '+')
+ *evalTokenBuffer++ = t;
+ }
+ else if (class == SUNARY)
+ {
+ switch ((int)*tok++)
+ {
+ case CR_ABSCOUNT:
+ *evalTokenBuffer++ = CONST;
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = (LONG)sect[ABS].sloc;
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ break;
+ case CR_TIME:
+ *evalTokenBuffer++ = CONST;
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = dos_time();
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ break;
+ case CR_DATE:
+ *evalTokenBuffer++ = CONST;
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = dos_date();
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ break;
+ case CR_MACDEF: // ^^macdef <macro-name>
+ if (*tok++ != SYMBOL)
+ return error(missym_error);
+
+ p = string[*tok++];
+ w = (lookup(p, MACRO, 0) == NULL ? 0 : 1);
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = (TOKEN)w;
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ *evalTokenBuffer++ = (TOKEN)w;
+ break;
+ case CR_DEFINED:
+ w = DEFINED;
+ goto getsym;
+ case CR_REFERENCED:
+ w = REFERENCED;
+getsym:
+ if (*tok++ != SYMBOL)
+ return error(missym_error);
+
+ p = string[*tok++];
+ j = (*p == '.' ? curenv : 0);
+ w = ((sy = lookup(p, LABEL, j)) != NULL && (sy->sattr & w) ? 1 : 0);
+ *evalTokenBuffer++ = CONST;
+ uint64_t *evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = (TOKEN)w;
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ break;
+ case CR_STREQ:
+ if (*tok != SYMBOL && *tok != STRING)
+ return error(str_error);
+
+ p = string[tok[1]];
+ tok +=2;
-int expr1(void) {
- int class;
- TOKEN t;
- SYM *sy;
- char *p, *p2;
- WORD w;
- int j;
-
- class = tokcl[*tok];
-
- if(*tok == '-' || class == UNARY) {
- t = *tok++;
- if(expr2() != OK)
- return(ERROR);
- if(t == '-')
- t = UNMINUS;
- *tk++ = t;
- } else if(class == SUNARY)
- switch((int)*tok++) {
- case CR_TIME:
- *tk++ = CONST;
- *tk++ = dos_time();
- break;
- case CR_DATE:
- *tk++ = CONST;
- *tk++ = 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;
- break;
- case CR_DEFINED:
- w = DEFINED;
- goto getsym;
- case CR_REFERENCED:
- w = REFERENCED;
-
- getsym:
-
- 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;
- break;
- case CR_STREQ:
- if(*tok != SYMBOL && *tok != STRING) return(error(str_error));
- p = (char *)tok[1];
- tok +=2;
-
- if(*tok++ != ',') return(error(comma_error));
-
- if(*tok != SYMBOL && *tok != STRING) return(error(str_error));
- p2 = (char *)tok[1];
- tok += 2;
-
- w = (WORD)(!strcmp(p, p2));
- *tk++ = CONST;
- *tk++ = (TOKEN)w;
- break;
- }
- else
- return(expr2());
-
- return(OK);
+ if (*tok++ != ',')
+ return error(comma_error);
+
+ if (*tok != SYMBOL && *tok != STRING)
+ return error(str_error);
+
+ p2 = string[tok[1]];
+ tok += 2;
+
+ w = (WORD)(!strcmp(p, p2));
+ *evalTokenBuffer++ = CONST;
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = (TOKEN)w;
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ break;
+ }
+ }
+ else
+ return expr2();
+
+ return OK;
}
+
//
-// --- Terminals (CONSTs) and parenthesis grouping -------------------------------------------------
+// Terminals (CONSTs) and parenthesis grouping
//
+int expr2(void)
+{
+ char * p;
+ SYM * sy;
+ int j;
+ uint64_t * evalTokenBuffer64;
+ uint64_t * tok64;
+
+ switch ((int)*tok++)
+ {
+ case CONST:
+ *evalTokenBuffer++ = CONST;
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ tok64 = (uint64_t *)tok;
+ *evalTokenBuffer64++ = *tok64++;
+ tok = (TOKEN *)tok64;
+ evalTokenBuffer = (TOKEN *)evalTokenBuffer64;
+ break;
+ case FCONST:
+ *evalTokenBuffer++ = FCONST;
+ evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ tok64 = (uint64_t *)tok;
+ *evalTokenBuffer64++ = *tok64++;
+ tok = (TOKEN *)tok64;
+ evalTokenBuffer = (TOKEN *)evalTokenBuffer64;
+ break;
+ case SYMBOL:
+ p = string[*tok++];
+ j = (*p == '.' ? curenv : 0);
+ sy = lookup(p, LABEL, j);
+
+ 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);
-int expr2(void) {
- char *p;
- SYM *sy;
- int j;
-
- switch((int)*tok++) {
- case CONST:
- *tk++ = CONST;
- *tk++ = *tok++;
- break;
- case SYMBOL:
- p = (char *)*tok++;
- j = 0;
- if(*p == '.')
- j = curenv;
- sy = lookup(p, LABEL, j);
- if(sy == NULL)
- sy = newsym(p, LABEL, j);
-
- if(sy->sattre & EQUATEDREG) { // Check register bank usage
- 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_1) && (sy->sattre & BANK_0) && !altbankok)
- warns("equated symbol \'%s\' cannot be used in register bank 1", sy->sname);
- }
-
- *tk++ = SYMBOL;
- *tk++ = (TOKEN)sy;
- break;
- case STRING:
- *tk++ = CONST;
- *tk++ = str_value((char *)*tok++);
- break;
- case '(':
- if(expr0() != OK)
- return(ERROR);
- if(*tok++ != ')')
- return(error("missing close parenthesis ')'"));
- break;
- case '[':
- if(expr0() != OK)
- return(ERROR);
- if(*tok++ != ']')
- return(error("missing close parenthesis ']'"));
- break;
- case '$':
- *tk++ = ACONST; // Attributed const
- *tk++ = sloc; // Current location
- *tk++ = cursect | DEFINED; // Store attribs
- break;
- case '*':
- *tk++ = ACONST; // Attributed const
- if(orgactive)
- *tk++ = orgaddr;
- else
- *tk++ = pcloc; // Location at start of line
- *tk++ = ABS | DEFINED; // Store attribs
- break;
- default:
- return(error("bad expression"));
- }
- return(OK);
+ if ((regbank == BANK_1) && (sy->sattre & BANK_0) && !altbankok)
+ warn("equated symbol \'%s\' cannot be used in register bank 1", sy->sname);
+ }
+
+ *evalTokenBuffer++ = SYMBOL;
+ *evalTokenBuffer++ = symbolNum;
+ symbolPtr[symbolNum] = sy;
+ symbolNum++;
+ break;
+ case STRING:
+ *evalTokenBuffer++ = CONST;
+ uint64_t *evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = str_value(string[*tok++]);
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ break;
+ case '(':
+ if (expr0() != OK)
+ return ERROR;
+
+ if (*tok++ != ')')
+ return error("missing closing parenthesis ')'");
+
+ break;
+ case '[':
+ if (expr0() != OK)
+ return ERROR;
+
+ if (*tok++ != ']')
+ return error("missing closing bracket ']'");
+
+ break;
+ case '$':
+ *evalTokenBuffer++ = ACONST; // Attributed const
+ *evalTokenBuffer++ = sloc; // Current location
+ *evalTokenBuffer++ = cursect | DEFINED; // Store attribs
+ break;
+ case '*':
+ *evalTokenBuffer++ = ACONST; // Attributed const
+
+ // pcloc == location at start of line
+ *evalTokenBuffer++ = (orgactive ? orgaddr : pcloc);
+ // '*' takes attributes of current section, not ABS!
+ *evalTokenBuffer++ = cursect | DEFINED;
+ break;
+ case '{':
+ if (expr0() != OK) // Eat up first parameter (register or immediate)
+ return ERROR;
+
+ if (*tok++ != ':') // Demand a ':' there
+ return error("missing colon ':'");
+
+ if (expr0() != OK) // Eat up second parameter (register or immediate)
+ return ERROR;
+
+ if (*tok++ != '}')
+ return error("missing closing brace '}'");
+
+ break;
+ default:
+ return error("bad expression");
+ }
+
+ return OK;
}
+
//
-// --- Recursive-descent expression analyzer (with some simple speed hacks) ------------------------
+// Recursive-descent expression analyzer (with some simple speed hacks)
//
+int expr(TOKEN * otk, uint64_t * a_value, WORD * a_attr, SYM ** a_esym)
+{
+ // 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;
+
+ evalTokenBuffer = otk; // Set token pointer to 'exprbuf' (direct.c)
+ // Also set in various other places too (riscasm.c,
+ // e.g.)
+
+//printf("expr(): tokens 0-2: %i %i %i (%c %c %c); tc[2] = %i\n", tok[0], tok[1], tok[2], tok[0], tok[1], tok[2], tokenClass[tok[2]]);
+ // Optimize for single constant or single symbol.
+ // Shamus: Subtle bug here. EOL token is 101; if you have a constant token
+ // followed by the value 101, it will trigger a bad evaluation here.
+ // This is probably a really bad assumption to be making here...!
+ // (assuming tok[1] == EOL is a single token that is)
+ // Seems that even other tokens (SUNARY type) can fuck this up too.
+// if ((tok[1] == EOL)
+ if ((tok[1] == EOL && ((tok[0] != CONST || tok[0] != FCONST) && tokenClass[tok[0]] != SUNARY))
+// || (((*tok == CONST || *tok == FCONST || *tok == SYMBOL) || (*tok >= KW_R0 && *tok <= KW_R31))
+// && (tokenClass[tok[2]] < UNARY)))
+ || (((tok[0] == SYMBOL) || (tok[0] >= KW_R0 && tok[0] <= KW_R31))
+ && (tokenClass[tok[2]] < UNARY))
+ || ((tok[0] == CONST || tok[0] == FCONST) && (tokenClass[tok[3]] < UNARY))
+ )
+ {
+ if (*tok >= KW_R0 && *tok <= KW_R31)
+ {
+ *evalTokenBuffer++ = CONST;
+ uint64_t *evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ *evalTokenBuffer64++ = *a_value = (*tok - KW_R0);
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+ *a_attr = ABS | DEFINED;
+
+ if (a_esym != NULL)
+ *a_esym = NULL;
+
+ tok++;
+ }
+ else if (*tok == CONST)
+ {
+ *evalTokenBuffer++ = CONST;
+ uint64_t *evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+ uint64_t *tok64 = (uint64_t *)&tok[1];
+ *evalTokenBuffer64++ = *tok64++;
+ evalTokenBuffer = (TOKEN *)evalTokenBuffer64;
+ *a_value = tok[1];
+ *a_attr = ABS | DEFINED;
+
+ if (a_esym != NULL)
+ *a_esym = NULL;
+
+ tok += 3;
+//printf("Quick eval in expr(): CONST = %i, tokenClass[tok[2]] = %i\n", *a_value, tokenClass[*tok]);
+ }
+ else if (*tok == FCONST)
+ {
+ *evalTokenBuffer++ = FCONST;
+ *((double *)evalTokenBuffer) = *((double *)&tok[1]);
+ evalTokenBuffer += 2;
+ //*(double *)evalTokenBuffer++ = tok[2];
+ *a_value = *((uint64_t *)&tok[1]);
+ *a_attr = ABS | DEFINED | FLOAT;
+
+ if (a_esym != NULL)
+ *a_esym = NULL;
+
+ tok += 3;
+//printf("Quick eval in expr(): CONST = %i, tokenClass[tok[2]] = %i\n", *a_value, tokenClass[*tok]);
+ }
+ else if (*tok == '*')
+ {
+ *evalTokenBuffer++ = CONST;
+ uint64_t *evalTokenBuffer64 = (uint64_t *)evalTokenBuffer;
+
+ if (orgactive)
+ *evalTokenBuffer64++ = *a_value = orgaddr;
+ else
+ *evalTokenBuffer64++ = *a_value = pcloc;
+ evalTokenBuffer = (uint32_t *)evalTokenBuffer64;
+
+ // '*' takes attributes of current section, not ABS!
+ *a_attr = cursect | DEFINED;
+
+ if (a_esym != NULL)
+ *a_esym = NULL;
+
+ tok++;
+ }
+ else if (*tok == STRING || *tok == SYMBOL)
+ {
+ 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, 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)
+ {
+ 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++ = 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;
+
+/*
+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)(symbol->sattr & ~GLOBAL);
+
+ if ((symbol->sattr & (GLOBAL | DEFINED)) == GLOBAL
+ && a_esym != NULL)
+ *a_esym = symbol;
-int expr(TOKEN *otk, VALUE *a_value, WORD *a_attr, SYM **a_esym) {
- SYM *sy;
- char *p;
- int j;
-
- tk = otk;
-
- // 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))) {
-
- if(*tok >= KW_R0 && *tok <= KW_R31) {
- *tk++ = CONST;
- *tk++ = *a_value = (*tok - KW_R0);
- *a_attr = ABS | DEFINED;
- if(a_esym != NULL)
- *a_esym = NULL;
- tok++;
- *tk++ = ENDEXPR;
- return(OK);
- } else if(*tok == CONST) {
- *tk++ = CONST;
- *tk++ = *a_value = tok[1];
- *a_attr = ABS | DEFINED;
- if(a_esym != NULL)
- *a_esym = NULL;
- } else if(*tok == '*') {
- *tk++ = CONST;
- if(orgactive)
- *tk++ = *a_value = orgaddr;
- else
- *tk++ = *a_value = pcloc;
- *a_attr = ABS | DEFINED;
- //*tk++ =
- if(a_esym != NULL)
- *a_esym = NULL;
- tok--;
- } else {
- p = (char *)tok[1];
- j = 0;
- if(*p == '.')
- j = curenv;
- sy = lookup(p, LABEL, j);
-
- if(sy == NULL)
- sy = newsym(p, LABEL, j);
- sy->sattr |= REFERENCED;
-
- if(sy->sattre & EQUATEDREG) { // Check register bank usage
- 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_1) && (sy->sattre & BANK_0) && !altbankok)
- warns("equated symbol \'%s\' cannot be used in register bank 1", sy->sname);
- }
-
- *tk++ = SYMBOL;
- *tk++ = (TOKEN)sy;
-
- if(sy->sattr & DEFINED)
- *a_value = sy->svalue;
- else *a_value = 0;
-
- if(sy->sattre & EQUATEDREG)
- *a_value &= 0x1F;
-
- *a_attr = (WORD)(sy->sattr & ~GLOBAL);
-
- if((sy->sattr & (GLOBAL|DEFINED)) == GLOBAL && a_esym != NULL) {
- *a_esym = sy;
- }
- }
- tok += 2;
- *tk++ = ENDEXPR;
- return(OK);
- }
-
- if(expr0() != OK)
- return(ERROR);
- *tk++ = ENDEXPR;
- return(evexpr(otk, a_value, a_attr, a_esym));
+ tok += 2;
+ }
+ else
+ {
+ // Unknown type here... Alert the user!,
+ error("undefined RISC register in expression");
+ // Prevent spurious error reporting...
+ tok++;
+ return ERROR;
+ }
+
+ *evalTokenBuffer++ = ENDEXPR;
+ return OK;
+ }
+
+ if (expr0() != OK)
+ return ERROR;
+
+ *evalTokenBuffer++ = ENDEXPR;
+ return evexpr(otk, a_value, a_attr, a_esym);
}
+
//
-// -------------------------------------------------------------------------------------------------
// Evaluate expression.
-// If the expression involves only ONE external symbol, the expression is UNDEFINED, but it's value
-// includes everything but the symbol value, and `a_esym' is set to the external symbol.
-// -------------------------------------------------------------------------------------------------
+// If the expression involves only ONE external symbol, the expression is
+// UNDEFINED, but it's value includes everything but the symbol value, and
+// `a_esym' is set to the external symbol.
//
+int evexpr(TOKEN * tk, uint64_t * a_value, WORD * a_attr, SYM ** a_esym)
+{
+ WORD attr, attr2;
+ SYM * sy;
+ uint64_t * sval = evstk; // (Empty) initial stack
+ WORD * sattr = evattr;
+ SYM * esym = NULL; // No external symbol involved
+ WORD sym_seg = 0;
+ uint64_t *tk64;
-int evexpr(TOKEN *tk, VALUE *a_value, WORD *a_attr, SYM **a_esym) {
- WORD *sattr;
- VALUE *sval;
- WORD attr;
- SYM *sy;
- SYM *esym;
- WORD sym_seg;
-
- sval = evstk; // (Empty) initial stack
- sattr = evattr;
- 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
-
- if(!(sy->sattr & DEFINED)) {
- if(!(sy->sattr & GLOBAL)) { // Reference to undefined symbol
- *a_attr = 0;
- *a_value = 0;
- return(OK);
- }
- if(esym != NULL) // Check for multiple externals
- return(error(seg_error));
- esym = sy;
- }
-
- if(sy->sattr & DEFINED) {
- *++sval = sy->svalue; // Push symbol's value
- } else {
- *++sval = 0; // 0 for undefined symbols
- }
-
- *++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
- break;
- case ACONST:
- *++sval = *tk++; // Push value
- *++sattr = (WORD)*tk++; // Push attribs
- break;
-
- // Binary "+" and "-" matrix:
- //
- // ABS Sect Other
- // ----------------------------
- // ABS | ABS | Sect | Other |
- // Sect | Sect | [1] | Error |
- // Other | Other | Error | [1] |
- // ----------------------------
- //
- // [1] + : Error
- // - : ABS
- case '+':
- --sval; // Pop value
- --sattr; // Pop attrib
- *sval += sval[1]; // Compute value
-
- if(!(*sattr & (TEXT|DATA|BSS)))
- *sattr = sattr[1];
- else if(sattr[1] & (TEXT|DATA|BSS))
- return(error(seg_error));
- break;
- case '-':
- --sval; // Pop value
- --sattr; // Pop attrib
- *sval -= sval[1]; // Compute value
-
- attr = (WORD)(*sattr & (TEXT|DATA|BSS));
- 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);
- }
- }
- break;
- // Unary operators only work on ABS items
- case UNMINUS:
- if(*sattr & (TEXT|DATA|BSS))
- error(seg_error);
- *sval = -(int)*sval;
- *sattr = ABS|DEFINED; // Expr becomes absolute
- break;
- case '!':
- if(*sattr & (TEXT|DATA|BSS))
- error(seg_error);
- *sval = !*sval;
- *sattr = ABS|DEFINED; // Expr becomes absolute
- break;
- case '~':
- if(*sattr & (TEXT|DATA|BSS))
- error(seg_error);
- *sval = ~*sval;
- *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.
- case LE:
- --sattr;
- --sval;
- if((*sattr & TDB) != (sattr[1] & TDB)) error(seg_error);
- *sattr = ABS|DEFINED;
- *sval = *sval <= sval[1];
- break;
- case GE:
- --sattr;
- --sval;
- if((*sattr & TDB) != (sattr[1] & TDB)) error(seg_error);
- *sattr = ABS|DEFINED;
- *sval = *sval >= sval[1];
- break;
- case '>':
- --sattr;
- --sval;
- if((*sattr & TDB) != (sattr[1] & TDB)) error(seg_error);
- *sattr = ABS|DEFINED;
- *sval = *sval > sval[1];
- break;
- case '<':
- --sattr;
- --sval;
- if((*sattr & TDB) != (sattr[1] & TDB)) error(seg_error);
- *sattr = ABS|DEFINED;
- *sval = *sval < sval[1];
- break;
- case NE:
- --sattr;
- --sval;
- if((*sattr & TDB) != (sattr[1] & TDB)) error(seg_error);
- *sattr = ABS|DEFINED;
- *sval = *sval != sval[1];
- break;
- case '=':
- --sattr;
- --sval;
- if((*sattr & TDB) != (sattr[1] & TDB)) error(seg_error);
- *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.
- 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
- switch((int)tk[-1]) {
- case '*':
- --sval;
- --sattr; // Pop attrib
- *sval *= sval[1];
- break;
- case '/':
- --sval;
- --sattr; // Pop attrib
- if(sval[1] == 0)
- return(error("divide by zero"));
- *sval /= sval[1];
- break;
- case '%':
- --sval;
- --sattr; // Pop attrib
- if(sval[1] == 0)
- return(error("mod (%) by zero"));
- *sval %= sval[1];
- break;
- case SHL:
- --sval;
- --sattr; // Pop attrib
- *sval <<= sval[1];
- break;
- case SHR:
- --sval;
- --sattr; // Pop attrib
- *sval >>= sval[1];
- break;
- case '&':
- --sval;
- --sattr; // Pop attrib
- *sval &= sval[1];
- break;
- case '^':
- --sval;
- --sattr; // Pop attrib
- *sval ^= sval[1];
- break;
- case '|':
- --sval;
- --sattr; // Pop attrib
- *sval |= sval[1];
- break;
- default:
- interror(5); // Bad operator in expression stream
- }
- }
-
- if(esym != NULL) *sattr &= ~DEFINED;
- if(a_esym != NULL) *a_esym = esym;
-
- // sym_seg added in 1.0.16 to solve a problem with forward symbols in expressions where absolute
- // values also existed. The absolutes were overiding the symbol segments and not being included :(
- //*a_attr = *sattr | sym_seg; // Copy value + attrib
-
- *a_attr = *sattr; // Copy value + attrib
- *a_value = *sval;
-
- return(OK);
-}
+ while (*tk != ENDEXPR)
+ {
+ switch ((int)*tk++)
+ {
+ case SYMBOL:
+//printf("evexpr(): SYMBOL\n");
+ sy = symbolPtr[*tk++];
+ sy->sattr |= REFERENCED; // Set "referenced" bit
+
+ if (!(sy->sattr & DEFINED))
+ {
+ // Reference to undefined symbol
+ if (!(sy->sattr & GLOBAL))
+ {
+ *a_attr = 0;
+ *a_value = 0;
+ return OK;
+ }
+
+ if (esym != NULL) // Check for multiple externals
+ return error(seg_error);
+
+ esym = sy;
+ }
+
+ if (sy->sattr & DEFINED)
+ {
+ *++sval = sy->svalue; // Push symbol's value
+ }
+ else
+ {
+ *++sval = 0; // 0 for undefined symbols
+ }
+
+ *++sattr = (WORD)(sy->sattr & ~GLOBAL); // Push attribs
+ sym_seg = (WORD)(sy->sattr & TDB);
+ break;
+ case CONST:
+ tk64 = (uint64_t *)tk;
+ *++sval = *tk64++;
+ tk = (TOKEN *)tk64;
+//printf("evexpr(): CONST = %lX\n", *sval);
+ *++sattr = ABS | DEFINED; // Push simple attribs
+ break;
+ case FCONST:
+//printf("evexpr(): CONST = %i\n", *tk);
+ *((double *)sval) = *((double *)tk);
+ tk += 2;
+ *++sattr = ABS | DEFINED | FLOAT; // Push simple attribs
+ break;
+ case ACONST:
+//printf("evexpr(): ACONST = %i\n", *tk);
+ *++sval = *tk++; // Push value
+ *++sattr = (WORD)*tk++; // Push attribs
+ break;
+
+ // Binary "+" and "-" matrix:
+ //
+ // ABS Sect Other
+ // ----------------------------
+ // ABS | ABS | Sect | Other |
+ // Sect | Sect | [1] | Error |
+ // Other | Other | Error | [1] |
+ // ----------------------------
+ //
+ // [1] + : Error
+ // - : ABS
+ case '+':
+//printf("evexpr(): +\n");
+ --sval; // Pop value
+ --sattr; // Pop attrib
+//printf("--> N+N: %i + %i = ", *sval, sval[1]);
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+ attr2 = sattr[0] | sattr[1] & FLOAT; // Returns FLOAT if either of the two numbers are FLOAT
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float + Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *dst += *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float + Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *dst += *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int + Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *(double *)dst = *src + *dst;
+ }
+ else
+ {
+ *sval += sval[1]; // Compute value
+ }
+//printf("%i\n", *sval);
+
+ if (!(*sattr & TDB))
+ *sattr = sattr[1] | attr2;
+ else if (sattr[1] & TDB)
+ return error(seg_error);
+
+ break;
+ case '-':
+//printf("evexpr(): -\n");
+ --sval; // Pop value
+ --sattr; // Pop attrib
+//printf("--> N-N: %i - %i = ", *sval, sval[1]);
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+ attr2 = sattr[0] | sattr[1] & FLOAT; // Returns FLOAT if either of the two numbers are FLOAT
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float - Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *dst -= *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float - Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *dst -= *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int - Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *(double *)dst = *dst - *src;
+ }
+ else
+ {
+ *sval -= sval[1]; // Compute value
+ }
+
+//printf("%i\n", *sval);
+
+ attr = (WORD)(*sattr & TDB);
+#if 0
+printf("EVEXPR (-): sym1 = %X, sym2 = %X\n", attr, sattr[1]);
+#endif
+ *sattr |= attr2; // Inherit FLOAT attribute
+ // If symbol1 is ABS, take attributes from symbol2
+ if (!attr)
+ *sattr = sattr[1];
+ // 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 & TDB)
+ return error(seg_error);
+
+ if (*sattr & FLOAT)
+ {
+ double *dst = (double *)sval;
+ *dst = -*dst;
+ *sattr = ABS | DEFINED | FLOAT; // Expr becomes absolute
+ }
+ else
+ {
+ *sval = -(int)*sval;
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ }
+ break;
+ case '!':
+//printf("evexpr(): !\n");
+ if (*sattr & TDB)
+ return error(seg_error);
+
+ if (*sattr & FLOAT)
+ return error("floating point numbers not allowed with operator '!'.");
+
+ *sval = !*sval;
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ break;
+ case '~':
+//printf("evexpr(): ~\n");
+ if (*sattr & TDB)
+ return error(seg_error);
+
+ if (*sattr & FLOAT)
+ return error("floating point numbers not allowed with operator '~'.");
+
+ *sval = ~*sval;
+ *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.
+ case LE:
+//printf("evexpr(): LE\n");
+ sattr--;
+ sval--;
+
+ if ((*sattr & TDB) != (sattr[1] & TDB))
+ return error(seg_error);
+
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float <= Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst <= *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float <= Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *sval = *dst <= *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int <= Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst <= *src;
+ }
+ else
+ {
+ *sval = *sval <= sval[1];
+ }
+
+ *sattr = ABS | DEFINED;
+ break;
+ case GE:
+//printf("evexpr(): GE\n");
+ sattr--;
+ sval--;
+
+ if ((*sattr & TDB) != (sattr[1] & TDB))
+ return error(seg_error);
+
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float >= Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst >= *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float >= Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *sval = *dst >= *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int >= Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst >= *src;
+ }
+ else if (attr == 0)
+ {
+ *sval = *sval >= sval[1];
+ }
+ else
+
+ *sattr = ABS | DEFINED;
+
+ break;
+ case '>':
+//printf("evexpr(): >\n");
+ sattr--;
+ sval--;
+
+ if ((*sattr & TDB) != (sattr[1] & TDB))
+ return error(seg_error);
+
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float > Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst > *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float > Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *sval = *dst > *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int > Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst > *src;
+ }
+ else
+= {
+ *sval = *sval > sval[1];
+ }
+
+ *sattr = ABS | DEFINED;
+
+ break;
+ case '<':
+//printf("evexpr(): <\n");
+ sattr--;
+ sval--;
+
+ if ((*sattr & TDB) != (sattr[1] & TDB))
+ return error(seg_error);
+
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) > >1);
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float < Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst < *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float < Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *sval = *dst < *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int < Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *dst < *src;
+ }
+ else
+ {
+ *sval = *sval < sval[1];
+ }
+
+ *sattr = ABS | DEFINED;
+
+ break;
+ case NE:
+//printf("evexpr(): NE\n");
+ sattr--;
+ sval--;
+
+ if ((*sattr & TDB) != (sattr[1] & TDB))
+ return error(seg_error);
+
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float <> Float
+ return error("comparison for equality with float types not allowed.");
+ }
+ else if (attr == FLOAT)
+ {
+ // Float <> Int
+ return error("comparison for equality with float types not allowed.");
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int != Float
+ return error("comparison for equality with float types not allowed.");
+ }
+ else
+ {
+ *sval = *sval != sval[1];
+ }
+
+ *sattr = ABS | DEFINED;
+
+ break;
+ case '=':
+//printf("evexpr(): =\n");
+ sattr--;
+ sval--;
+
+ if ((*sattr & TDB) != (sattr[1] & TDB))
+ return error(seg_error);
+
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float = Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *src == *dst;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float = Int
+ return error("equality with float ");
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int == Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *sval = *src == *dst;
+ }
+ else
+ {
+ *sval = *sval == sval[1];
+ }
+
+ *sattr = ABS | DEFINED;
+
+ break;
+ // All other binary operators must have two ABS items
+ // to work with. They all produce an ABS value.
+ default:
+//printf("evexpr(): default\n");
+ // 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);
+
+ switch ((int)tk[-1])
+ {
+ case '*':
+ sval--;
+ sattr--; // Pop attrib
+//printf("--> NxN: %i x %i = ", *sval, sval[1]);
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+ attr2 = sattr[0] | sattr[1] & FLOAT; // Returns FLOAT if either of the two numbers are FLOAT
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float * Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ *dst *= *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float * Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ *dst *= *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int * Float
+ uint64_t * dst = (uint64_t *)sval;
+ double * src = (double *)(sval + 1);
+ *(double *)dst = *src * *dst;
+ }
+ else
+ {
+ *sval *= sval[1];
+ }
+//printf("%i\n", *sval);
+
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sattr |= attr2;
+
+ break;
+ case '/':
+ sval--;
+ sattr--; // Pop attrib
+
+
+//printf("--> N/N: %i / %i = ", sval[0], sval[1]);
+ // Extract float attributes from both terms and pack them
+ // into a single value
+ attr = sattr[0] & FLOAT | ((sattr[1] & FLOAT) >> 1);
+ attr2 = sattr[0] | sattr[1] & FLOAT; // Returns FLOAT if either of the two numbers are FLOAT
+
+ if (attr == (FLOAT | (FLOAT >> 1)))
+ {
+ // Float / Float
+ double * dst = (double *)sval;
+ double * src = (double *)(sval + 1);
+ if (*src == 0)
+ return error("divide by zero");
+ *dst = *dst / *src;
+ }
+ else if (attr == FLOAT)
+ {
+ // Float / Int
+ double * dst = (double *)sval;
+ uint64_t * src = (uint64_t *)(sval + 1);
+ if (*src == 0)
+ return error("divide by zero");
+ *dst = *dst / *src;
+ }
+ else if (attr == FLOAT >> 1)
+ {
+ // Int / Float
+ uint64_t * dst=(uint64_t *)sval;
+ double * src=(double *)(sval + 1);
+ if (*src == 0)
+ return error("divide by zero");
+ *(double *)dst = *dst / *src;
+ }
+ else
+ {
+ if (sval[1] == 0)
+ return error("divide by zero");
+//printf("--> N/N: %i / %i = ", sval[0], sval[1]);
+ // Compiler is picky here: Without casting these, it discards
+ // the sign if dividing a negative # by a positive one,
+ // creating a bad result. :-/
+ // Definitely a side effect of using uint32_ts intead of ints.
+ *sval = (int32_t)sval[0] / (int32_t)sval[1];
+ }
+
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sattr |= attr2;
+
+//printf("%i\n", *sval);
+ break;
+ case '%':
+ sval--;
+ sattr--; // Pop attrib
+ if ((*sattr | sattr[1]) & FLOAT)
+ return error("floating point numbers not allowed with operator '%'.");
+
+ if (sval[1] == 0)
+ return error("mod (%) by zero");
+
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sval %= sval[1];
+ break;
+ case SHL:
+ sval--;
+ sattr--; // Pop attrib
+ if ((*sattr | sattr[1]) & FLOAT)
+ return error("floating point numbers not allowed with operator '<<'.");
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sval <<= sval[1];
+ break;
+ case SHR:
+ sval--;
+ sattr--; // Pop attrib
+ if ((*sattr | sattr[1]) & FLOAT)
+ return error("floating point numbers not allowed with operator '>>'.");
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sval >>= sval[1];
+ break;
+ case '&':
+ sval--;
+ sattr--; // Pop attrib
+ if ((*sattr | sattr[1]) & FLOAT)
+ return error("floating point numbers not allowed with operator '&'.");
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sval &= sval[1];
+ break;
+ case '^':
+ sval--;
+ sattr--; // Pop attrib
+ if ((*sattr | sattr[1]) & FLOAT)
+ return error("floating point numbers not allowed with operator '^'.");
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sval ^= sval[1];
+ break;
+ case '|':
+ sval--;
+ sattr--; // Pop attrib
+ if ((*sattr | sattr[1]) & FLOAT)
+ return error("floating point numbers not allowed with operator '|'.");
+ *sattr = ABS | DEFINED; // Expr becomes absolute
+ *sval |= sval[1];
+ break;
+ default:
+ interror(5); // Bad operator in expression stream
+ }
+ }
+ }
+
+ if (esym != NULL)
+ *sattr &= ~DEFINED;
+
+ if (a_esym != NULL)
+ *a_esym = esym;
+
+ // sym_seg added in 1.0.16 to solve a problem with forward symbols in
+ // expressions where absolute values also existed. The absolutes were
+ // overiding the symbol segments and not being included :(
+ //*a_attr = *sattr | sym_seg; // Copy value + attrib
+
+ *a_attr = *sattr; // Copy value + attrib
+ *a_value = *sval;
+
+ return OK;
+}
projects / rmac / blobdiff