]> Shamusworld >> Repos - rmac/blobdiff - token.c
Fixed subtle bug in expr().
[rmac] / token.c
diff --git a/token.c b/token.c
index a1d3be8203501a32bb1c5420a6251918aed6f0e9..e35e9bfc787697ea21e767f4a94397fb7ba223bb 100644 (file)
--- a/token.c
+++ b/token.c
@@ -16,6 +16,7 @@
 #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
@@ -116,61 +117,57 @@ static char * riscregname[] = {
 };
 
 
-// Removing this, provided it doesn't cause unwanted side-effects :-P
-#if 0
 //
-// Make `fnum' the Current `curfname'
-// NOTE: This is currently only called from error() in error.c
+// Initialize Tokenizer
 //
-void setfnum(WORD fnum)
+void InitTokenizer(void)
 {
-#if 0
-       // NOTE: fnum is ZERO based, this can cause problems if you're not careful!
-       FILEREC * fr = filerec;
+       int i;                                                                  // Iterator
+       char * htab = "0123456789abcdefABCDEF"; // Hex character table
 
-       DEBUG printf("[setfnum: fnum=%u]\n", fnum);
+       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;
 
-       // Advance to the correct record...
-       while (fr != NULL && fnum != 0)
+       // Initialize hex, "dot" and tolower tables
+       for(i=0; i<128; i++)
        {
-               fr = fr->frec_next;
-               fnum--;
+               hextab[i] = -1;
+               dotxtab[i] = 0;
+               tolowertab[i] = (char)i;
        }
 
-       if (fr == NULL)
-               curfname = "(*top*)";
-       else
-               curfname = fr->frec_name;
-
-       DEBUG printf("[setfnum: curfname=%s]\n", curfname);
-#else
-       // Check for absolute top filename (this should never happen)
-       if (fnum == -1)
-       {
-               curfname = "(*top*)";
-               return;
-       }
+       for(i=0; htab[i]!=EOS; i++)
+               hextab[htab[i]] = (char)((i < 16) ? i : i - 6);
 
-       FILEREC * fr = filerec;
+       for(i='A'; i<='Z'; i++)
+               tolowertab[i] |= 0x20;
 
-       // Advance to the correct record...
-       while (fr != NULL && fnum != 0)
-       {
-               fr = fr->frec_next;
-               fnum--;
-       }
+       // 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;
+}
 
-       // Check for file # record not found (this should never happen either)
-       if (fr == NULL)
-       {
-               curfname = "(*NOT FOUND*)";
-               return;
-       }
 
-       curfname = fr->frec_name;
-#endif
-}
-#else
 void SetFilenameForErrorReporting(void)
 {
        WORD fnum = cfileno;
@@ -200,7 +197,6 @@ void SetFilenameForErrorReporting(void)
 
        curfname = fr->frec_name;
 }
-#endif
 
 
 //
@@ -456,7 +452,8 @@ arg_num:
                                        continue;
                                }
 
-                               if (tk != NULL)                         // arg # is in range, so expand it
+                               // Argument # is in range, so expand it
+                               if (tk != NULL)
                                {
                                        while (*tk != EOL)
                                        {
@@ -618,7 +615,7 @@ overflow:
 //
 // Get Next Line of Text from a Macro
 //
-char * getmln(void)
+char * GetNextMacroLine(void)
 {
        unsigned source_addr;
 
@@ -634,30 +631,6 @@ char * getmln(void)
 //     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;
 }
 
@@ -665,7 +638,7 @@ char * getmln(void)
 //
 // Get Next Line of Text from a Repeat Block
 //
-char * getrln(void)
+char * GetNextRepeatLine(void)
 {
 
        IREPT * irept = cur_inobj->inobj.irept;
@@ -683,7 +656,7 @@ char * getrln(void)
                        return NULL;
                }
 
-               strp = irept->ir_nextln;                        //strp
+               strp = irept->ir_nextln;
        }
 
        strcpy(irbuf, (char *)(irept->ir_nextln + 1));
@@ -740,57 +713,6 @@ int include(int handle, char * fname)
 }
 
 
-//
-// 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
 //
@@ -861,7 +783,7 @@ if (verb_flag) printf("[fpop: (post) cfileno=%d ifile->ifno=%d]\n", (int)cfileno
 // 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;
@@ -946,7 +868,7 @@ char * getln(void)
 //
 // Tokenize a Line
 //
-int tokln(void)
+int TokenizeLine(void)
 {
        char * ln = NULL;                               // Ptr to current position in line
        char * p;                                               // Random character ptr
@@ -960,7 +882,7 @@ int tokln(void)
        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;
@@ -975,9 +897,9 @@ int tokln(void)
        // 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("tokln: Calling fpop() from SRC_IFILE...\n");
+if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
                        fpop();                                                 // Pop input level
                        goto retry;                                             // Try for more lines 
                }
@@ -1010,7 +932,7 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IFILE...\n");
        // 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...
@@ -1022,9 +944,9 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IFILE...\n");
        // 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("tokln: Calling fpop() from SRC_IREPT...\n");
+if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
                        fpop();
                        goto retry;
                }
@@ -1133,6 +1055,12 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
                                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)
@@ -1144,9 +1072,10 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
                        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;
@@ -1252,7 +1181,7 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
                                                        break;
                                                default:
                                                        warn("bad backslash code in string");
-                                                       --ln;
+                                                       ln--;
                                                        break;
                                                }
                                        }
@@ -1275,19 +1204,19 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
 
                                        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;
                                                }
@@ -1344,11 +1273,11 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
                                {
                                case '>':
                                        *tk++ = SHR;
-                                       ++ln;
+                                       ln++;
                                        continue;
                                case '=':
                                        *tk++ = GE;
-                                       ++ln;
+                                       ln++;
                                        continue;
                                default:
                                        *tk++ = '>';
@@ -1489,22 +1418,20 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
                        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;
                                }
@@ -1512,6 +1439,7 @@ if (verb_flag) printf("tokln: Calling fpop() from SRC_IREPT...\n");
 
                        *tk++ = CONST;
                        *tk++ = v;
+//printf("CONST: %i\n", v);
                        continue;
                }
 
@@ -1582,6 +1510,7 @@ int d_goto(WORD unused)
                {
                        // 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;
@@ -1610,6 +1539,7 @@ int d_goto(WORD unused)
        return error("goto label not found");
 }
 
+
 void DumpTokenBuffer(void)
 {
        TOKEN * t;
@@ -1698,3 +1628,4 @@ void DumpTokenBuffer(void)
 
        printf("[EOL]\n");
 }
+