[nasm:master] pfmask: Limit the preferred mask to the vendor specific flags

[nasm-bot f. J. K. S. <jin...@in...>]

Commit-ID:  0873ef5626d7cdfcb87bf4c8643cc508e79549b8
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=0873ef5626d7cdfcb87bf4c8643cc508e79549b8
Author:     Jin Kyu Song <jin...@in...>
AuthorDate: Sat, 30 Nov 2013 16:38:42 -0800
Committer:  Jin Kyu Song <jin...@in...>
CommitDate: Mon, 2 Dec 2013 18:42:19 -0800

pfmask: Limit the preferred mask to the vendor specific flags

In ndisasm, the priority follows the order of instructions in insns.dat.
Other iflags could affect this mechanism when a proper instruction form
had a higher iflag bit set.
The preferred mask bits are now limited to vendor flags (Cyrix and AMD)
and other flags do not affect disassembler any more.

Signed-off-by: Jin Kyu Song <jin...@in...>


---
 iflag.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/iflag.h b/iflag.h
index 8754174..7bc31cc 100644
--- a/iflag.h
+++ b/iflag.h
@@ -143,10 +143,9 @@ static inline int iflag_cmp_cpu_level(const iflag_t *a, const iflag_t *b)
 
 static inline iflag_t _iflag_pfmask(const iflag_t *a)
 {
-	iflag_t r = (iflag_t) {
-		.field[1] = a->field[1],
-		.field[2] = a->field[2],
-	};
+	iflag_t r;
+
+	memset(&r, 0, sizeof(r));
 
 	if (iflag_test(a, IF_CYRIX))
 		iflag_set(&r, IF_CYRIX);