X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=6502.c;h=27a8e1ac9ac41f153c882c95d1f65c1149931d81;hp=55c604808283f56c12b5d45373300b70029e9cb1;hb=bdbf34766f4d074a5933eb1326fe4ce03d249e10;hpb=0561939cf64e5d66153c2e7903e2411b802ff5c8

diff --git a/6502.c b/6502.c
index 55c6048..27a8e1a 100644
--- a/6502.c
+++ b/6502.c
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // 6502.C - 6502 Assembler
-// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -344,6 +344,7 @@ void m6502cg(int op)
 		{
 			// (foo,x)
 			tok++;
+#if 0
 			p = string[tok[1]];
 
 			// Sleazo tolower() -----------------vvvvvvvvvvv
@@ -351,17 +352,27 @@ void m6502cg(int op)
 				goto badmode;
 
 			tok += 2;
-
 			if (*tok++ != ')')
 				goto badmode;
 
 			amode = A65_INDX;
+#else
+			if (tok[0] == KW_X)
+				amode = A65_INDX;
+
+			if ((tok[1] != ')') || (tok[2] != EOL))
+				goto badmode;
+
+			tok += 2;
+#endif
 		}
 		else
 			goto badmode;
 
 		break;
 
+	// I'm guessing that the form of this is @<expr>(X) or @<expr>(Y), which
+	// I've *never* seen before.  :-/
 	case '@':
 		tok++;
 
@@ -371,6 +382,7 @@ void m6502cg(int op)
 		if (*tok == '(')
 		{
 			tok++;
+#if 0
 			p = string[tok[1]];
 
 			if (*tok != SYMBOL || p[1] != EOS || tok[2] != ')' || tok[3] != EOL)
@@ -386,6 +398,19 @@ void m6502cg(int op)
 				goto badmode;
 
 			tok += 3;		// Past SYMBOL <string> ')' EOL
+#else
+			if ((tok[1] != ')') || (tok[2] != EOL))
+				goto badmode;
+
+			if (tok[0] == KW_X)
+				amode = A65_INDX;
+			else if (tok[0] == KW_Y)
+				amode = A65_INDY;
+			else
+				goto badmode;
+
+			tok += 2;
+#endif
 			zpreq = 1;		// Request zeropage optimization
 		}
 		else if (*tok == EOL)