procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warn if trying to assemble obsolete instructions

Browse source 
Print a warning if one tries to assemble an obsolete instruction,
unless there is an exact match for the CPU directive.

For example:

	CPU 386
	POP CS		; Warning - obsolete instruction

	CPU 8086
	POP CS		; No warning

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2019-08-06 22:56:51 -07:00
parent d13a6f9708
commit 41bb8a8114
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
asm/assemble.c
View file

@ -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;

3
travis/test/pushseg.json
View file

@ -5,7 +5,8 @@
"format": "bin",
"source": "pushseg.asm",
"target": [
{ "output": "pushseg.bin" }
{ "output": "pushseg.bin" },
{ "stderr": "pushseg.stderr" }
]
}
]

1
travis/test/pushseg.stderr Normal file
View file

@ -0,0 +1 @@
./travis/test/pushseg.asm:17: warning: obsolete instruction invalid on the target CPU [-w+obsolete]