assemble: add an OPT instruction flags for optimizing assembly only

Add an OPT flag to only use a pattern for optimizing assembly only.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

2 files changed, 8 insertions, 1 deletions

diff --git a/assemble.c b/assemble.c
index 6fb5de9..3aff669 100644
--- a/assemble.c
+++ b/assemble.c
@@ -2046,6 +2046,12 @@ static enum match_result matches(const struct itemplate *itemp,
         return MERR_INVALOP;
 
     /*
+     * Is it legal?
+     */
+    if (!(optimizing > 0) && (itemp->flags & IF_OPT))
+	return MERR_INVALOP;
+
+    /*
      * Check that no spurious colons or TOs are present
      */
     for (i = 0; i < itemp->operands; i++)
diff --git a/insns.h b/insns.h
index 4f3dd80..51fb5cd 100644
--- a/insns.h
+++ b/insns.h
@@ -87,6 +87,7 @@ extern const uint8_t nasm_bytecodes[];
 #define IF_AR4	  0x00000140UL  /* SB, SW, SD applies to argument 4 */
 #define IF_ARMASK 0x000001C0UL  /* mask for unsized argument spec */
 #define IF_ARSHFT 6		/* LSB in IF_ARMASK */
+#define IF_OPT    0x00000200UL  /* optimizing assembly only */
 /* The next 3 bits aren't actually used for anything */
 #define IF_PRIV   0x00000000UL  /* it's a privileged instruction */
 #define IF_SMM    0x00000000UL  /* it's only valid in SMM */
@@ -111,7 +112,7 @@ extern const uint8_t nasm_bytecodes[];
 #define IF_PMASK  0xFF000000UL  /* the mask for processor types */
 #define IF_PLEVEL 0x0F000000UL  /* the mask for processor instr. level */
                                 /* also the highest possible processor */
-#define IF_PFMASK 0xF01FFF00UL  /* the mask for disassembly "prefer" */
+#define IF_PFMASK 0xF01FF800UL  /* the mask for disassembly "prefer" */
 #define IF_8086   0x00000000UL  /* 8086 instruction */
 #define IF_186    0x01000000UL  /* 186+ instruction */
 #define IF_286    0x02000000UL  /* 286+ instruction */