X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=4039c8ebdd4a620d55f953b97e23985715816810;hp=78de051d7e7df3ae3281023a99f7eb65f96fe415;hb=5bea6621a5f369fdc9921965fc5f23571bb34715;hpb=b10167d55798ea184f97fafda075255c0852f3b6

diff --git a/token.c b/token.c
index 78de051..4039c8e 100644
--- a/token.c
+++ b/token.c
@@ -452,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)
 					{
@@ -794,11 +795,17 @@ char * GetNextLine(void)
 		// Scan for next end-of-line; handle stupid text formats by treating
 		// \r\n the same as \n. (lone '\r' at end of buffer means we have to
 		// check for '\n').
+#if 0
 		i = 0;
 		j = fl->ifcnt;
 		d = &fl->ifbuf[fl->ifind];
 
 		for(p=d; i<j; i++, p++)
+#else
+		d = &fl->ifbuf[fl->ifind];
+
+		for(p=d, i=0, j=fl->ifcnt; i<j; i++, p++)
+#endif
 		{
 			if (*p == '\r' || *p == '\n')
 			{
@@ -807,15 +814,12 @@ char * GetNextLine(void)
 				if (*p == '\r')
 				{
 					if (i >= j)
-					{
-						break;				// Look for '\n' to eat 
-					}
+						break;			// Need to read more, then look for '\n' to eat 
 					else if (p[1] == '\n')
-					{
 						i++;
-					}
 				}
 
+				// Cover up the newline with end-of-string sentinel
 				*p = '\0';
 
 				fl->ifind += i;
@@ -826,11 +830,19 @@ char * GetNextLine(void)
 
 		// Handle hanging lines by ignoring them (Input file is exhausted, no
 		// \r or \n on last line)
+		// Shamus: This is retarded. Never ignore any input!
 		if (!readamt && fl->ifcnt)
 		{
+#if 0
 			fl->ifcnt = 0;
 			*p = '\0';
 			return NULL;
+#else
+			// Really should check to see if we're at the end of the buffer! :-P
+			fl->ifbuf[fl->ifind + fl->ifcnt] = '\0';
+			fl->ifcnt = 0;
+			return &fl->ifbuf[fl->ifind];
+#endif
 		}
 
 		// Truncate and return absurdly long lines.
@@ -855,7 +867,9 @@ char * GetNextLine(void)
 			fl->ifind = fl->ifcnt & 1;
 		}
 
-		if ((readamt = read(fl->ifhandle, &fl->ifbuf[fl->ifind + fl->ifcnt], QUANTUM)) < 0)
+		readamt = read(fl->ifhandle, &fl->ifbuf[fl->ifind + fl->ifcnt], QUANTUM);
+
+		if (readamt < 0)
 			return NULL;
 
 		if ((fl->ifcnt += readamt) == 0)
@@ -1054,6 +1068,12 @@ if (verb_flag) printf("TokenizeLine: 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)
@@ -1065,9 +1085,10 @@ if (verb_flag) printf("TokenizeLine: 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;
@@ -1410,22 +1431,20 @@ if (verb_flag) printf("TokenizeLine: 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;
 				}
@@ -1433,6 +1452,7 @@ if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 
 			*tk++ = CONST;
 			*tk++ = v;
+//printf("CONST: %i\n", v);
 			continue;
 		}