#define DEF_KW // Declare keyword values
#include "kwtab.h" // Incl generated keyword tables & defs
+
int lnsave; // 1; strcpy() text of current line
int curlineno; // Current line number
int totlines; // Total # of lines
//
-// Make `fnum' the Current `curfname'
+// Initialize Tokenizer
//
-void setfnum(WORD fnum)
+void InitTokenizer(void)
{
- FILEREC * fr;
+ int i; // Iterator
+ char * htab = "0123456789abcdefABCDEF"; // Hex character table
- for(fr=filerec; fr!=NULL && fnum--; fr=fr->frec_next);
+ lnsave = 0; // Don't save lines
+ curfname = ""; // No file, empty filename
+ filecount = (WORD)-1;
+ cfileno = (WORD)-1; // cfileno gets bumped to 0
+ curlineno = 0;
+ totlines = 0;
+ etok = tokbuf;
+ f_inobj = NULL;
+ f_ifile = NULL;
+ f_imacro = NULL;
+ cur_inobj = NULL;
+ filerec = NULL;
+ last_fr = NULL;
+ lntag = SPACE;
- if (fr == NULL)
+ // Initialize hex, "dot" and tolower tables
+ for(i=0; i<128; i++)
+ {
+ hextab[i] = -1;
+ dotxtab[i] = 0;
+ tolowertab[i] = (char)i;
+ }
+
+ for(i=0; htab[i]!=EOS; i++)
+ hextab[htab[i]] = (char)((i < 16) ? i : i - 6);
+
+ for(i='A'; i<='Z'; i++)
+ tolowertab[i] |= 0x20;
+
+ // These characters are legal immediately after a period
+ dotxtab['b'] = DOTB; // .b .B .s .S
+ dotxtab['B'] = DOTB;
+ dotxtab['s'] = DOTB;
+ dotxtab['S'] = DOTB;
+ dotxtab['w'] = DOTW; // .w .W
+ dotxtab['W'] = DOTW;
+ dotxtab['l'] = DOTL; // .l .L
+ dotxtab['L'] = DOTL;
+ dotxtab['i'] = DOTI; // .i .I (???)
+ dotxtab['I'] = DOTI;
+}
+
+
+void SetFilenameForErrorReporting(void)
+{
+ WORD fnum = cfileno;
+
+ // Check for absolute top filename (this should never happen)
+ if (fnum == -1)
+ {
curfname = "(*top*)";
- else
- curfname = fr->frec_name;
+ return;
+ }
+
+ FILEREC * fr = filerec;
+
+ // Advance to the correct record...
+ while (fr != NULL && fnum != 0)
+ {
+ fr = fr->frec_next;
+ fnum--;
+ }
+
+ // Check for file # record not found (this should never happen either)
+ if (fr == NULL)
+ {
+ curfname = "(*NOT FOUND*)";
+ return;
+ }
+
+ curfname = fr->frec_name;
}
continue;
}
- if (tk != NULL) // arg # is in range, so expand it
+ // Argument # is in range, so expand it
+ if (tk != NULL)
{
while (*tk != EOL)
{
//
// Get Next Line of Text from a Macro
//
-char * getmln(void)
+char * GetNextMacroLine(void)
{
unsigned source_addr;
// ExpandMacro((char *)(strp + 1), imacro->im_lnbuf, LNSIZ);
ExpandMacro(strp->line, imacro->im_lnbuf, LNSIZ);
- if (!strcmp(imacro->im_macro->sname, "mjump") && !mjump_align)
- {
- // if we need to adjust the alignment of the jump source address to
- // meet the rules of gpu main execution we need to skip the first nop
- // of the macro. This is simpler than trying to insert nop's mid macro.
- source_addr = (orgactive ? orgaddr : sloc);
- source_addr += 8;
-
- if (source_addr % 4)
- {
- strp = imacro->im_nextln;
-
- if (strp == NULL)
- return NULL;
-
-// imacro->im_nextln = (LONG *)*strp;
-// ExpandMacro((char *)(strp + 1), imacro->im_lnbuf, LNSIZ);
- imacro->im_nextln = strp->next;
- ExpandMacro(strp->line, imacro->im_lnbuf, LNSIZ);
- }
-
- mjump_align = 1;
- }
-
return imacro->im_lnbuf;
}
//
// Get Next Line of Text from a Repeat Block
//
-char * getrln(void)
+char * GetNextRepeatLine(void)
{
IREPT * irept = cur_inobj->inobj.irept;
return NULL;
}
- strp = irept->ir_nextln; //strp
+ strp = irept->ir_nextln;
}
strcpy(irbuf, (char *)(irept->ir_nextln + 1));
// Verbose mode
if (verb_flag)
- printf("[Including: %s]\n", fname);
+ printf("[include: %s, cfileno=%u]\n", fname, cfileno);
// Alloc and initialize include-descriptors
inobj = a_inobj(SRC_IFILE);
ifile->ifoldlineno = curlineno; // Save old line number
ifile->ifoldfname = curfname; // Save old filename
ifile->ifno = cfileno; // Save old file number
- cfileno = filecount++; // Compute new file number
+
+// cfileno = filecount++; // Compute new file number
+ // NB: This *must* be preincrement, we're adding one to the filecount here!
+ cfileno = ++filecount; // Compute NEW file number
curfname = strdup(fname); // Set current filename (alloc storage)
curlineno = 0; // Start on line zero
// Add another file to the file-record
-// fr = (FILEREC *)amem((LONG)sizeof(FILEREC));
fr = (FILEREC *)malloc(sizeof(FILEREC));
fr->frec_next = NULL;
fr->frec_name = curfname;
last_fr->frec_next = fr; // Append to list of filerecs
last_fr = fr;
+ DEBUG printf("[include: curfname: %s, cfileno=%u]\n", curfname, cfileno);
return OK;
}
-//
-// Initialize Tokenizer
-//
-void init_token(void)
-{
- int i; // Iterator
- char * htab = "0123456789abcdefABCDEF"; // Hex character table
-
- lnsave = 0; // Don't save lines
- curfname = ""; // No file, empty filename
- filecount = (WORD)-1;
- cfileno = (WORD)-1; // cfileno gets bumped to 0
- curlineno = 0;
- totlines = 0;
- etok = tokbuf;
- f_inobj = NULL;
- f_ifile = NULL;
- f_imacro = NULL;
- cur_inobj = NULL;
- filerec = NULL;
- last_fr = NULL;
- lntag = SPACE;
-
- // Initialize hex, "dot" and tolower tables
- for(i=0; i<128; i++)
- {
- hextab[i] = -1;
- dotxtab[i] = 0;
- tolowertab[i] = (char)i;
- }
-
- for(i=0; htab[i]!=EOS; i++)
- hextab[htab[i]] = (char)((i < 16) ? i : i - 6);
-
- for(i='A'; i<='Z'; i++)
- tolowertab[i] |= 0x20;
-
- // These characters are legal immediately after a period
- dotxtab['b'] = DOTB; // .b .B .s .S
- dotxtab['B'] = DOTB;
- dotxtab['s'] = DOTB;
- dotxtab['S'] = DOTB;
- dotxtab['w'] = DOTW; // .w .W
- dotxtab['W'] = DOTW;
- dotxtab['l'] = DOTL; // .l .L
- dotxtab['L'] = DOTL;
- dotxtab['I'] = DOTI; // .l .L
- dotxtab['I'] = DOTI;
-}
-
-
//
// Pop the Current Input Level
//
ifile->if_link = f_ifile;
f_ifile = ifile;
close(ifile->ifhandle); // Close source file
+if (verb_flag) printf("[fpop (pre): curfname=%s]\n", curfname);
curfname = ifile->ifoldfname; // Set current filename
+if (verb_flag) printf("[fpop (post): curfname=%s]\n", curfname);
+if (verb_flag) printf("[fpop: (pre) cfileno=%d ifile->ifno=%d]\n", (int)cfileno, (int)ifile->ifno);
curlineno = ifile->ifoldlineno; // Set current line#
DEBUG printf("cfileno=%d ifile->ifno=%d\n", (int)cfileno, (int)ifile->ifno);
cfileno = ifile->ifno; // Restore current file number
+if (verb_flag) printf("[fpop: (post) cfileno=%d ifile->ifno=%d]\n", (int)cfileno, (int)ifile->ifno);
break;
case SRC_IMACRO: // Pop and release an IMACRO
imacro = inobj->inobj.imacro;
// Get line from file into buf, return NULL on EOF or ptr to the start of a
// null-term line
//
-char * getln(void)
+char * GetNextLine(void)
{
int i, j;
char * p, * d;
//
// Tokenize a Line
//
-int tokln(void)
+int TokenizeLine(void)
{
char * ln = NULL; // Ptr to current position in line
char * p; // Random character ptr
char c1;
int stringNum = 0; // Pointer to string locations in tokenized line
- retry:
+retry:
if (cur_inobj == NULL) // Return EOF if input stack is empty
return TKEOF;
// o tag the listing-line with a space;
// o kludge lines generated by Alcyon C.
case SRC_IFILE:
- if ((ln = getln()) == NULL)
+ if ((ln = GetNextLine()) == NULL)
{
+if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
fpop(); // Pop input level
goto retry; // Try for more lines
}
// o Handle end-of-macro;
// o tag the listing-line with an at (@) sign.
case SRC_IMACRO:
- if ((ln = getmln()) == NULL)
+ if ((ln = GetNextMacroLine()) == NULL)
{
ExitMacro(); // Exit macro (pop args, do fpop(), etc)
goto retry; // Try for more lines...
// o Handle end-of-repeat-block;
// o tag the listing-line with a pound (#) sign.
case SRC_IREPT:
- if ((ln = getrln()) == NULL)
+ if ((ln = GetNextRepeatLine()) == NULL)
{
+if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
fpop();
goto retry;
}
j = -1;
}
+ // Make j = -1 if user tries to use a RISC register while in 68K mode
+ if (!(rgpu || rdsp) && ((TOKEN)j >= KW_R0 && (TOKEN)j <= KW_R31))
+ {
+ j = -1;
+ }
+
//make j = -1 if time, date etc with no preceeding ^^
//defined, referenced, streq, macdef, date and time
switch ((TOKEN)j)
case 120: // time
case 121: // date
j = -1;
- break;
+// break;
}
+ // If not tokenized keyword OR token was not found
if (j < 0 || state < 0)
{
*tk++ = SYMBOL;
break;
default:
warn("bad backslash code in string");
- --ln;
+ ln--;
break;
}
}
if (*ln == '.')
{
- if ((*(ln+1) == 'b') || (*(ln+1) == 'B'))
+ if ((*(ln + 1) == 'b') || (*(ln + 1) == 'B'))
{
v &= 0x000000FF;
ln += 2;
}
- if ((*(ln+1) == 'w') || (*(ln+1) == 'W'))
+ if ((*(ln + 1) == 'w') || (*(ln + 1) == 'W'))
{
v &= 0x0000FFFF;
ln += 2;
}
- if ((*(ln+1) == 'l') || (*(ln+1) == 'L'))
+ if ((*(ln + 1) == 'l') || (*(ln + 1) == 'L'))
{
ln += 2;
}
{
case '>':
*tk++ = SHR;
- ++ln;
+ ln++;
continue;
case '=':
*tk++ = GE;
- ++ln;
+ ln++;
continue;
default:
*tk++ = '>';
while ((int)chrtab[*ln] & DIGIT)
v = (v * 10) + *ln++ - '0';
- // See if there's a .[bwl] after the constant, & deal with it
+ // See if there's a .[bwl] after the constant & deal with it if so
if (*ln == '.')
{
- if ((*(ln+1) == 'b') || (*(ln+1) == 'B'))
+ if ((*(ln + 1) == 'b') || (*(ln + 1) == 'B'))
{
v &= 0x000000FF;
ln += 2;
}
-
- if ((*(ln+1) == 'w') || (*(ln+1) == 'W'))
+ else if ((*(ln + 1) == 'w') || (*(ln + 1) == 'W'))
{
v &= 0x0000FFFF;
ln += 2;
}
-
- if ((*(ln+1) == 'l') || (*(ln+1) == 'L'))
+ else if ((*(ln + 1) == 'l') || (*(ln + 1) == 'L'))
{
ln += 2;
}
*tk++ = CONST;
*tk++ = v;
+//printf("CONST: %i\n", v);
continue;
}
{
// Compare names (sleazo string compare)
// This string compare is not right. Doesn't check for lengths.
+ // (actually it does, but in a crappy, unclear way.)
#warning "!!! Bad string comparison !!!"
s1 = sym;
// s2 = (char *)(defln + 1) + 1;
return error("goto label not found");
}
+
void DumpTokenBuffer(void)
{
TOKEN * t;
printf("[EOL]\n");
}
+
projects / rmac / blobdiff