IFENT * ifent; // Current ifent
static IFENT ifent0; // Root ifent
-static IFENT * f_ifent; // Freelist of ifents
-static int disabled; // Assembly conditionally disabled
+IFENT * f_ifent; // Freelist of ifents
+int disabled; // Assembly conditionally disabled
int just_bss; // 1, ds.b in microprocessor mode
-VALUE pcloc; // Value of "PC" at beginning of line
+uint32_t pcloc; // Value of "PC" at beginning of line
SYM * lab_sym; // Label on line (or NULL)
const char extra_stuff[] = "extra (unexpected) text found after addressing mode";
0L, // 0115
0L, // 0116
0L, // 0117
- M_CREG, // 0120 (caches - TODO: is this correct or does it need its own bitfield?)
+ M_CACHE40, // 0120
M_CREG, // 0121
M_FREG, // 0122
M_FPSCR // 0123
char * equate; // Symbol (or NULL)
int labtyp = 0; // Label type (':', DCOLON)
int equtyp = 0; // Equ type ('=', DEQUALS)
- VALUE eval; // Expression value
+ uint64_t eval; // Expression value
WORD eattr; // Expression attributes
SYM * esym; // External symbol involved in expr.
WORD siz = 0; // Size suffix to mnem/diretve/macro
lab_sym = NULL; // No (exported) label
equate = NULL; // No equate
tk = tok; // Save first token in line
- pcloc = (VALUE)sloc; // Set beginning-of-line PC
+ pcloc = (uint32_t)sloc; // Set beginning-of-line PC
loop1: // Internal line processing loop
if (*tok == EOL)
goto normal;
- // Next token MUST be a symbol
+ // First token MUST be a symbol (if we get here, tok didn't advance)
if (*tok++ != SYMBOL)
{
error("syntax error; expected symbol");
// Check for ".b" ".w" ".l" after directive, macro or mnemonic.
siz = SIZN;
- if (*tok == DOTW)
- siz = SIZW, tok++;
- else if (*tok == DOTL)
- siz = SIZL, tok++;
- else if (*tok == DOTB)
- siz = SIZB, tok++;
- else if(*tok == DOTD)
- siz = SIZD, tok++;
- else if(*tok == DOTP)
- siz = SIZP, tok++;
- else if(*tok == DOTQ)
- siz = SIZQ, tok++;
- else if(*tok == DOTS)
- siz = SIZS, tok++;
- else if(*tok == DOTX)
- siz = SIZX, tok++;
-
+ switch (*tok)
+ {
+ case DOTW: siz = SIZW, tok++; break;
+ case DOTL: siz = SIZL, tok++; break;
+ case DOTB: siz = SIZB, tok++; break;
+ case DOTD: siz = SIZD, tok++; break;
+ case DOTP: siz = SIZP, tok++; break;
+ case DOTQ: siz = SIZQ, tok++; break;
+ case DOTS: siz = SIZS, tok++; break;
+ case DOTX: siz = SIZX, tok++; break;
+ }
// Do special directives (500..999) (These must be handled in "real time")
if (state >= 500 && state < 1000)
{
case MN_IF:
d_if();
- goto loop;
+ goto loop;
+
case MN_ELSE:
d_else();
goto loop;
+
case MN_ENDIF:
d_endif();
goto loop;
+
case MN_IIF: // .iif --- immediate if
if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK)
goto loop;
goto loop;
goto loop1;
+
case MN_MACRO: // .macro --- macro definition
if (!disabled)
{
}
goto loop;
+
case MN_EXITM: // .exitm --- exit macro
case MN_ENDM: // .endm --- same as .exitm
if (!disabled)
}
goto loop;
+
case MN_REPT:
if (!disabled)
{
goto loop;
}
- DefineRept();
+ HandleRept();
}
goto loop;
+
case MN_ENDR:
if (!disabled)
error("mis-nested .endr");
tok += 3;
// Anything other than a 0 or a 1 will result in "No Bank"
- if (*tok == 0)
+ if (*(uint64_t *)tok == 0)
registerbank = BANK_0;
- else if (*tok == 1)
+ else if (*(uint64_t *)tok == 1)
registerbank = BANK_1;
}
if (reglist(&rmask) < 0)
goto loop;
- eval = (VALUE)rmask;
+ eval = (uint32_t)rmask;
eattr = ABS | DEFINED;
}
else if (equtyp == CCDEF)
}
sy->sattr |= eattr | EQUATED; // Symbol inherits value and attributes
- sy->svalue = eval;
+ sy->svalue = (uint32_t)eval;
if (list_flag) // Put value in listing
- listvalue(eval);
+ listvalue((uint32_t)eval);
at_eol(); // Must be at EOL now
goto loop;
lab_sym = symbol;
+ // Yes, our CS professors told us to write checks for equality this way,
+ // but damn, it hurts my brain every time I look at it. :-/
if (0 == environment)
curenv++;
return 0;
}
-
-//
-// .if, Start conditional assembly
-//
-int d_if(void)
-{
- IFENT * rif;
- WORD eattr;
- VALUE eval;
- SYM * esym;
-
- // Alloc an IFENTRY
- if ((rif = f_ifent) == NULL)
- rif = (IFENT *)malloc(sizeof(IFENT));
- else
- f_ifent = rif->if_prev;
-
- rif->if_prev = ifent;
- ifent = rif;
-
- if (!disabled)
- {
- if (expr(exprbuf, &eval, &eattr, &esym) != OK)
- return 0;
-
- if ((eattr & DEFINED) == 0)
- return error(undef_error);
-
- disabled = !eval;
- }
-
- rif->if_state = (WORD)disabled;
- return 0;
-}
-
-
-//
-// .else, Do alternate case for .if
-//
-int d_else(void)
-{
- IFENT * rif = ifent;
-
- if (rif->if_prev == NULL)
- return error("mismatched .else");
-
- if (disabled)
- disabled = rif->if_prev->if_state;
- else
- disabled = 1;
-
- rif->if_state = (WORD)disabled;
- return 0;
-}
-
-
-//
-// .endif, End of conditional assembly block
-// This is also called by fpop() to pop levels of IFENTs in case a macro or
-// include file exits early with `exitm' or `end'.
-//
-int d_endif (void)
-{
- IFENT * rif = ifent;
-
- if (rif->if_prev == NULL)
- return error("mismatched .endif");
-
- ifent = rif->if_prev;
- disabled = rif->if_prev->if_state;
- rif->if_prev = f_ifent;
- f_ifent = rif;
- return 0;
-}
-
projects / rmac / blobdiff