Mercurial > hg > index.cgi

changeset 371:2593fd529be5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change PRAGMA_SHADOW to behave more as expected Removed hack that allowed shadowing 6309 operation codes in 6809 mode. With recent changes to the assembler adding flexibility to 6809/6309 modes with pragmas, this adds complexity that is not clearly beneficial and would almost certainly lead to a great deal of confusion on the part of the user.
author William Astle <lost@l-w.ca>
date Mon, 22 Jun 2015 19:16:13 -0600
parents 8764142b3192
children 39490cf2d1c2
files lwasm/pass1.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lwasm/pass1.c	Mon Jun 22 18:49:38 2015 -0600
+++ b/lwasm/pass1.c	Mon Jun 22 19:16:13 2015 -0600
@@ -299,7 +299,7 @@
 			if (as -> skipcond && !(instab[opnum].flags & lwasm_insn_cond))
 				goto linedone;
         	
-			if (!nomacro && ((as->pragmas & PRAGMA_SHADOW) || (!CURPRAGMA(cl, PRAGMA_6809) && (instab[opnum].flags & lwasm_insn_is6309))))
+			if (!nomacro && (as->pragmas & PRAGMA_SHADOW))
         	{
         		// check for macros even if they shadow real operations
         		// NOTE: "ENDM" cannot be shadowed