X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=4acb8cb3c2083c1d60bb585d8e1082495dea4422;hp=564ff0cc895d9349644776c69021687927f7dd83;hb=c59f7a33730dacf753e066a4002e2f749051a137;hpb=bdbf34766f4d074a5933eb1326fe4ce03d249e10

diff --git a/token.c b/token.c
index 564ff0c..4acb8cb 100644
--- a/token.c
+++ b/token.c
@@ -1171,7 +1171,7 @@ DEBUG { printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n"); }
 			}
 
 			// 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))
+			if (!(rgpu || rdsp || dsp56001) && ((TOKEN)j >= KW_R0 && (TOKEN)j <= KW_R31))
 			{
 				j = -1;
 			}
@@ -1287,6 +1287,10 @@ dostring:
 						case '\\':
 							c = '\\';
 							break;
+						case '{':
+							// If we're evaluating a macro
+							// this is valid because it's
+							// a parameter expansion
 						case '!':
 							// If we're evaluating a macro
 							// this is valid and expands to