X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=procln.c;h=c4612cbce65cb438c1351a7f40a2f7b6399c5ff6;hp=d849b000c4b416b82d08a24e5cf4a0448c9260f7;hb=feabdce307d2077374739a7f596846382784b35e;hpb=3f2bccb78ab4cd59654d521c8aedfe5512ee6608 diff --git a/procln.c b/procln.c index d849b00..c4612cb 100644 --- a/procln.c +++ b/procln.c @@ -1,24 +1,25 @@ // // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System // PROCLN.C - Line Processing -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 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 "procln.h" -#include "listing.h" +#include "6502.h" #include "amode.h" +#include "direct.h" #include "error.h" -#include "sect.h" #include "expr.h" +#include "listing.h" #include "mach.h" -#include "direct.h" #include "macro.h" -#include "symbol.h" #include "riscasm.h" +#include "sect.h" +#include "symbol.h" -#define DEF_KW // Declare keyword values +#define DEF_KW // Declare keyword values #include "kwtab.h" // Incl generated keyword tables & defs #define DEF_MN // Incl 68k keyword definitions @@ -29,14 +30,16 @@ #define DECL_MR #include "risckw.h" +#define DEF_MP // Include 6502 keyword definitions +#define DECL_MP // Include 6502 keyword state machine tables +#include "6502kw.h" IFENT * ifent; // Current ifent static IFENT ifent0; // Root ifent static IFENT * f_ifent; // Freelist of ifents static int disabled; // Assembly conditionally disabled -int just_bss; // 1, ds.b in microprocessor mode -VALUE pcloc; // Value of "PC" at beginning of line -IFENT * ifent; // Current ifent +int just_bss; // 1, ds.b in microprocessor mode +VALUE 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"; @@ -77,15 +80,15 @@ LONG amsktab[0112] = { 0L, // 076 0L, // 077 M_ABASE, // 0100 - M_MEMPOST, // 0101 - M_MEMPRE, // 0102 + M_MEMPOST, // 0101 + M_MEMPRE, // 0102 M_PCBASE, // 0103 M_PCMPOST, // 0104 M_PCMPRE, // 0105 M_AM_USP, // 0106 - M_AM_SR, // 0107 + M_AM_SR, // 0107 M_AM_CCR, // 0110 - M_AM_NONE // 0111 + M_AM_NONE // 0111 }; // 0112 length @@ -137,7 +140,7 @@ loop: // Line processing loop label // Get another line of tokens if (TokenizeLine() == TKEOF) { -if (verb_flag) printf("Assemble: Found TKEOF flag...\n"); +if (debug) printf("Assemble: Found TKEOF flag...\n"); if (list_flag && listflag) // Flush last line of source listeol(); @@ -252,7 +255,7 @@ as68label: // Check for ".b" ".w" ".l" after directive, macro or mnemonic. siz = SIZN; - if (*tok == DOTW) + if (*tok == DOTW) siz = SIZW, tok++; else if (*tok == DOTL) siz = SIZL, tok++; @@ -265,13 +268,13 @@ as68label: switch (state) { case MN_IF: - d_if (); + d_if(); goto loop; case MN_ELSE: d_else(); goto loop; case MN_ENDIF: - d_endif (); + d_endif(); goto loop; case MN_IIF: // .iif --- immediate if if (disabled || expr(exprbuf, &eval, &eattr, &esym) != OK) @@ -369,9 +372,9 @@ normal: { if ((equtyp == EQUREG) && (sy->sattre & UNDEF_EQUR)) { -//REALLY? sy->sattre |= ~UNDEF_EQUR; - sy->sattre &= ~UNDEF_EQUR; - sy->svalue = 0; +//REALLY? sy->sattre |= ~UNDEF_EQUR; + sy->sattre &= ~UNDEF_EQUR; + sy->svalue = 0; } else if ((equtyp == CCDEF) && (sy->sattre & UNDEF_CC)) { @@ -386,9 +389,8 @@ normal: } } - // Put symbol in "order of definition" list - if (!(sy->sattr & SDECLLIST)) - AddToSymbolOrderList(sy); + // Put symbol in "order of definition" list if it's not already there + AddToSymbolDeclarationList(sy); // Parse value to equate symbol to; // o .equr @@ -396,13 +398,13 @@ normal: // o everything else if (equtyp == EQUREG) { -//Linko's request to issue a warning on labels that equated to the same register -//would go here. Not sure how to implement it though. :-/ +//Linko's request to issue a warning on labels that equated to the same +//register would go here. Not sure how to implement it though. :-/ /* Maybe like this way: have an array of bools with 64 entries. Whenever a register is equated, set the -corresponding register bool to true. Whenever it's undef'ed, set it to false. When -checking to see if it's already been equated, issue a warning. +corresponding register bool to true. Whenever it's undef'ed, set it to false. +When checking to see if it's already been equated, issue a warning. */ // Check that we are in a RISC section if (!rgpu && !rdsp) @@ -568,6 +570,41 @@ checking to see if it's already been equated, issue a warning. if (state == -3) goto loop; + // If we're in 6502 mode and are still in need of a mnemonic, then search + // for valid 6502 mnemonic. + if (m6502 && (state < 0 || state >= 1000)) + { +#ifdef ST + state = kmatch(opname, mpbase, mpcheck, mptab, mpaccept); +#else + for(state=0, p=opname; state>= 0; ) + { + j = mpbase[state] + tolowertab[*p]; + + if (mpcheck[j] != state) // Reject, character doesn't match + { + state = -1; // No match + break; + } + + if (!*++p) + { // Must accept or reject at EOS + state = mpaccept[j]; // (-1 on no terminal match) + break; + } + + state = mptab[j]; + } +#endif + + // Call 6502 code generator if we found a mnemonic + if (state >= 2000) + { + m6502cg(state - 2000); + goto loop; + } + } + // If we are in GPU or DSP mode and still in need of a mnemonic then search // for one if ((rgpu || rdsp) && (state < 0 || state >= 1000)) @@ -604,7 +641,7 @@ checking to see if it's already been equated, issue a warning. // Invoke macro or complain about bad mnemonic if (state < 0) { - if ((sy = lookup(opname, MACRO, 0)) != NULL) + if ((sy = lookup(opname, MACRO, 0)) != NULL) InvokeMacro(sy, siz); else errors("unknown op '%s'", opname); @@ -630,10 +667,10 @@ checking to see if it's already been equated, issue a warning. goto loop; } - if (sloc & 1) // Automatic .even + if (sloc & 1) // Automatic .even auto_even(); - if (challoc - ch_size < 18) // Make sure have space in current chunk + if (challoc - ch_size < 18) // Make sure have space in current chunk chcheck(0); m = &machtab[state - 1000]; @@ -645,7 +682,7 @@ checking to see if it's already been equated, issue a warning. goto loop; } - if (amode(1) < 0) // Parse 0, 1 or 2 addr modes + if (amode(1) < 0) // Parse 0, 1 or 2 addr modes goto loop; if (*tok != EOL) @@ -662,6 +699,9 @@ checking to see if it's already been equated, issue a warning. goto loop; } + // Keep a backup of chptr (used for optimisations during codegen) + chptr_opcode = chptr; + for(;;) { if ((m->mnattr & siz) && (amsk0 & m->mn0) != 0 && (amsk1 & m->mn1) != 0) @@ -694,9 +734,8 @@ int HandleLabel(char * label, int labelType) else if (symbol->sattr & DEFINED) return errors("multiply-defined label '%s'", label); - // Put symbol in "order of definition" list - if (!(symbol->sattr & SDECLLIST)) - AddToSymbolOrderList(symbol); + // Put symbol in "order of definition" list if it's not already in it + AddToSymbolDeclarationList(symbol); if (orgactive) { @@ -727,7 +766,7 @@ int HandleLabel(char * label, int labelType) } -// +// // .if, Start conditional assembly // int d_if(void) @@ -762,7 +801,7 @@ int d_if(void) } -// +// // .else, Do alternate case for .if // int d_else(void)