diff options
| -rw-r--r-- | asm/assemble.c | 30 | ||||
| -rw-r--r-- | travis/test/pushseg.json | 3 | ||||
| -rw-r--r-- | travis/test/pushseg.stderr | 1 |
3 files changed, 29 insertions, 5 deletions
diff --git a/asm/assemble.c b/asm/assemble.c index 724779fc..5daf4c11 100644 --- a/asm/assemble.c +++ b/asm/assemble.c @@ -210,8 +210,8 @@ enum match_result { /* * Matching success; the conditional ones first */ - MOK_JUMP, /* Matching OK but needs jmp_match() */ - MOK_GOOD /* Matching unconditionally OK */ + MOK_JUMP, /* Matching OK but needs jmp_match() */ + MOK_GOOD /* Matching unconditionally OK */ }; typedef struct { @@ -764,8 +764,30 @@ int64_t assemble(int32_t segment, int64_t start, int bits, insn *instruction) if (m == MOK_GOOD) { /* Matches! */ - int64_t insn_size = calcsize(data.segment, data.offset, - bits, instruction, temp); + int64_t insn_size; + + if (unlikely(itemp_has(temp, IF_OBSOLETE))) { + /* + * If IF_OBSOLETE is set, warn unless we have *exactly* + * the correct CPU level set. + * + *!obsolete [on] instruction obsolete for the target CPU + *! warns if an instruction which has been removed + *! from the architecture, and is no longer included + *! in the CPU definition given in the \c{[CPU]} + *! directive, for example \c{POP CS}, the opcode for + *! which, \c{0Fh}, instead is an opcode prefix on + *! CPUs newer than the first generation 8086. + */ + + if (iflag_cmp_cpu_level(&insns_flags[temp->iflag_idx], &cpu)) { + nasm_warn(WARN_OBSOLETE, + "obsolete instruction invalid on the target CPU"); + } + } + + insn_size = calcsize(data.segment, data.offset, + bits, instruction, temp); nasm_assert(insn_size >= 0); data.itemp = temp; diff --git a/travis/test/pushseg.json b/travis/test/pushseg.json index 657b8b47..32bc0f72 100644 --- a/travis/test/pushseg.json +++ b/travis/test/pushseg.json @@ -5,7 +5,8 @@ "format": "bin", "source": "pushseg.asm", "target": [ - { "output": "pushseg.bin" } + { "output": "pushseg.bin" }, + { "stderr": "pushseg.stderr" } ] } ] diff --git a/travis/test/pushseg.stderr b/travis/test/pushseg.stderr new file mode 100644 index 00000000..2bf22630 --- /dev/null +++ b/travis/test/pushseg.stderr @@ -0,0 +1 @@ +./travis/test/pushseg.asm:17: warning: obsolete instruction invalid on the target CPU [-w+obsolete] |