# HG changeset patch
# User lost@l-w.ca
# Date 1302143023 21600
# Node ID 1830faeef332f16b467091da868b57fc96388673
# Parent  62372522ce9cf7c081528b980ac2672e049977ad
Added ?? prefix for opcode to inhibit macro expansion

diff -r 62372522ce9c -r 1830faeef332 lwasm/pass1.c
--- a/lwasm/pass1.c	Wed Apr 06 00:40:40 2011 -0600
+++ b/lwasm/pass1.c	Wed Apr 06 20:23:43 2011 -0600
@@ -58,8 +58,11 @@
 	char *tok, *sym;
 	int opnum;
 	int lc = 1;
+	int nomacro;
+	
 	for (;;)
 	{
+		nomacro = 0;
 		sym = NULL;
 		line = input_readline(as);
 		if (!line)
@@ -231,6 +234,14 @@
 		cl -> symset = 0;
 		
 		// tok points to the opcode for the line or NUL if none
+		
+		// if the first two chars of the opcode are "??", that's
+		// a flag to inhibit macro expansion
+		if (*tok && tok[0] == '?' && tok[1] == '?')
+		{
+			nomacro = 1;
+			tok += 2;
+		}
 		if (*tok)
 		{
 			// look up operation code
@@ -260,7 +271,7 @@
 			if (as -> skipcond && !(instab[opnum].flags & lwasm_insn_cond))
 				goto linedone;
         	
-        	if (as -> pragmas & PRAGMA_SHADOW)
+        	if (!nomacro && (as -> pragmas & PRAGMA_SHADOW))
         	{
         		// check for macros even if they shadow real operations
         		// NOTE: "ENDM" cannot be shadowed
@@ -276,7 +287,8 @@
 				if (*tok != ';' && *tok != '*')
 				{
 					// bad opcode; check for macro here
-					if (expand_macro(as, cl, &p1, sym) != 0)
+					// but don't expand it if "nomacro" is in effect
+					if (nomacro || expand_macro(as, cl, &p1, sym) != 0)
 					{
 						// macro expansion failed
 						if (expand_struct(as, cl, &p1, sym) != 0)