X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=addff0462d8247e6cdc02632f88939e75f531b3e;hp=989bc68f6538ddb4f248978e6fd4cdfb57add038;hb=9153334781cd2e23750f4dc002e847606c07a1f0;hpb=96a5cd69571096f11a3a2a40f6133374f0adc9bb diff --git a/procln.c b/procln.c index 989bc68..addff04 100644 --- a/procln.c +++ b/procln.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for all Atari computers // PROCLN.C - Line Processing -// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -36,10 +36,10 @@ 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"; @@ -95,7 +95,7 @@ LONG amsktab[0124] = { 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 @@ -131,7 +131,7 @@ void Assemble(void) 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 @@ -177,7 +177,7 @@ DEBUG { printf("Assemble: Found TKEOF flag...\n"); } 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 @@ -229,7 +229,7 @@ as68label: 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"); @@ -269,23 +269,17 @@ as68label: // 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) @@ -294,13 +288,16 @@ as68label: { 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; @@ -321,6 +318,7 @@ as68label: goto loop; goto loop1; + case MN_MACRO: // .macro --- macro definition if (!disabled) { @@ -332,6 +330,7 @@ as68label: } goto loop; + case MN_EXITM: // .exitm --- exit macro case MN_ENDM: // .endm --- same as .exitm if (!disabled) @@ -343,6 +342,7 @@ as68label: } goto loop; + case MN_REPT: if (!disabled) { @@ -353,10 +353,11 @@ as68label: goto loop; } - defrept(); + HandleRept(); } goto loop; + case MN_ENDR: if (!disabled) error("mis-nested .endr"); @@ -397,13 +398,11 @@ normal: { if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR)) { -//REALLY? sy->sattre |= ~UNDEF_EQUR; sy->sattre &= ~UNDEF_EQUR; sy->svalue = 0; } else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC)) { -//REALLY? sy->sattre |= ~UNDEF_CC; sy->sattre &= ~UNDEF_CC; sy->svalue = 0; } @@ -465,9 +464,9 @@ When checking to see if it's already been equated, issue a warning. 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; } @@ -484,8 +483,6 @@ When checking to see if it's already been equated, issue a warning. sy->sattre |= regbank; // Store register bank #endif eattr = ABS | DEFINED | GLOBAL; -// & what does this $80000080 constant mean??? -// eval = 0x80000080 + (riscreg) + (registerbank << 8); eval = riscreg; tok++; } @@ -519,7 +516,7 @@ When checking to see if it's already been equated, issue a warning. if (reglist(&rmask) < 0) goto loop; - eval = (VALUE)rmask; + eval = (uint32_t)rmask; eattr = ABS | DEFINED; } else if (equtyp == CCDEF) @@ -547,7 +544,7 @@ When checking to see if it's already been equated, issue a warning. else if (expr(exprbuf, &eval, &eattr, &esym) != OK) goto loop; } - //equ a equr + // equ an equr else if (*tok == SYMBOL) { sy2 = lookup(string[tok[1]], LABEL, j); @@ -557,7 +554,6 @@ When checking to see if it's already been equated, issue a warning. sy->stype = sy2->stype; sy->sattr = sy2->sattr; sy->sattre = sy2->sattre; -//ICK sy->svalue = (sy2->svalue & 0xFFFFF0FF); sy->svalue = sy2->svalue; goto loop; } @@ -577,7 +573,7 @@ When checking to see if it's already been equated, issue a warning. sy->svalue = eval; if (list_flag) // Put value in listing - listvalue(eval); + listvalue((uint32_t)eval); at_eol(); // Must be at EOL now goto loop; @@ -753,7 +749,6 @@ int HandleLabel(char * label, int labelType) { symbol = NewSymbol(label, LABEL, environment); symbol->sattr = 0; -// symbol->sattre = RISCSYM; symbol->sattre = 0; } else if (symbol->sattr & DEFINED) @@ -775,6 +770,8 @@ int HandleLabel(char * label, int labelType) 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++; @@ -790,78 +787,3 @@ int HandleLabel(char * label, int labelType) 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; -} -