From 741a3eedf9eb6b00ce57a9831198d36040aa398f Mon Sep 17 00:00:00 2001
From: nickysn <nickysn@gmail.com>
Date: Mon, 11 Jan 2016 13:22:08 +0000
Subject: [PATCH] * fixed the cpu level of several 186+ instructions, that were
mistakenly marked as either 286+ or 8086+
git-svn-id: trunk@32921 -
---
compiler/i386/i386tab.inc | 24 ++++++++++++------------
compiler/i8086/i8086tab.inc | 24 ++++++++++++------------
compiler/x86/x86ins.dat | 24 ++++++++++++------------
compiler/x86_64/x8664tab.inc | 24 ++++++++++++------------
4 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/compiler/i386/i386tab.inc b/compiler/i386/i386tab.inc
index 5e56c5363c..50a9f8c904 100644
--- a/compiler/i386/i386tab.inc
+++ b/compiler/i386/i386tab.inc
@@ -2336,28 +2336,28 @@
ops : 3;
optypes : (ot_reg16,ot_rm_gpr,ot_immediate or ot_bits8 or ot_signed,ot_none);
code : #212#1#107#72#14;
- flags : if_286 or if_sm
+ flags : if_186 or if_sm
),
(
opcode : A_IMUL;
ops : 3;
optypes : (ot_reg16,ot_rm_gpr,ot_immediate,ot_none);
code : #212#1#105#72#26;
- flags : if_286 or if_sm or if_sw or if_ar2
+ flags : if_186 or if_sm or if_sw or if_ar2
),
(
opcode : A_IMUL;
ops : 2;
optypes : (ot_reg16,ot_immediate or ot_bits8 or ot_signed,ot_none,ot_none);
code : #212#1#107#64#13;
- flags : if_286
+ flags : if_186
),
(
opcode : A_IMUL;
ops : 2;
optypes : (ot_reg16,ot_immediate,ot_none,ot_none);
code : #212#1#105#64#25;
- flags : if_286 or if_sw
+ flags : if_186 or if_sw
),
(
opcode : A_IMUL;
@@ -4520,14 +4520,14 @@
ops : 1;
optypes : (ot_immediate or ot_bits16,ot_none,ot_none,ot_none);
code : #212#1#104#24#221;
- flags : if_286
+ flags : if_186
),
(
opcode : A_PUSH;
ops : 1;
optypes : (ot_immediate or ot_bits8 or ot_signed,ot_none,ot_none,ot_none);
code : #1#106#12#221;
- flags : if_286
+ flags : if_186
),
(
opcode : A_PUSH;
@@ -4618,7 +4618,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#130#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_RCL;
@@ -4660,7 +4660,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#131#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_RCR;
@@ -4807,7 +4807,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#128#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_ROL;
@@ -4849,7 +4849,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#129#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_ROR;
@@ -4919,7 +4919,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#132#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_SAL;
@@ -4968,7 +4968,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#135#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_SAR;
diff --git a/compiler/i8086/i8086tab.inc b/compiler/i8086/i8086tab.inc
index 9cc9e2c75f..b3b60964ff 100644
--- a/compiler/i8086/i8086tab.inc
+++ b/compiler/i8086/i8086tab.inc
@@ -2343,28 +2343,28 @@
ops : 3;
optypes : (ot_reg16,ot_rm_gpr,ot_immediate or ot_bits8 or ot_signed,ot_none);
code : #212#1#107#72#14;
- flags : if_286 or if_sm
+ flags : if_186 or if_sm
),
(
opcode : A_IMUL;
ops : 3;
optypes : (ot_reg16,ot_rm_gpr,ot_immediate,ot_none);
code : #212#1#105#72#26;
- flags : if_286 or if_sm or if_sw or if_ar2
+ flags : if_186 or if_sm or if_sw or if_ar2
),
(
opcode : A_IMUL;
ops : 2;
optypes : (ot_reg16,ot_immediate or ot_bits8 or ot_signed,ot_none,ot_none);
code : #212#1#107#64#13;
- flags : if_286
+ flags : if_186
),
(
opcode : A_IMUL;
ops : 2;
optypes : (ot_reg16,ot_immediate,ot_none,ot_none);
code : #212#1#105#64#25;
- flags : if_286 or if_sw
+ flags : if_186 or if_sw
),
(
opcode : A_IMUL;
@@ -4534,14 +4534,14 @@
ops : 1;
optypes : (ot_immediate or ot_bits16,ot_none,ot_none,ot_none);
code : #212#1#104#24#221;
- flags : if_286
+ flags : if_186
),
(
opcode : A_PUSH;
ops : 1;
optypes : (ot_immediate or ot_bits8 or ot_signed,ot_none,ot_none,ot_none);
code : #1#106#12#221;
- flags : if_286
+ flags : if_186
),
(
opcode : A_PUSH;
@@ -4632,7 +4632,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#130#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_RCL;
@@ -4674,7 +4674,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#131#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_RCR;
@@ -4821,7 +4821,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#128#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_ROL;
@@ -4863,7 +4863,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#129#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_ROR;
@@ -4933,7 +4933,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#132#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_SAL;
@@ -4982,7 +4982,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#135#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_SAR;
diff --git a/compiler/x86/x86ins.dat b/compiler/x86/x86ins.dat
index 9beace21b8..a8e17dd0f3 100644
--- a/compiler/x86/x86ins.dat
+++ b/compiler/x86/x86ins.dat
@@ -795,10 +795,10 @@ reg32|64,regmem,imm \320\1\x69\110\42 386,SM,SD,AR2
reg32|64,imm8 \320\1\x6B\100\15 386
reg32,imm \325\1\x69\100\41 386,SD
reg64,imm \326\1\x69\100\255 X86_64
-reg16,regmem,imm8 \324\1\x6B\110\16 286,SM
-reg16,regmem,imm \324\1\x69\110\32 286,SM,SW,AR2
-reg16,imm8 \324\1\x6B\100\15 286
-reg16,imm \324\1\x69\100\31 286,SW
+reg16,regmem,imm8 \324\1\x6B\110\16 186,SM
+reg16,regmem,imm \324\1\x69\110\32 186,SM,SW,AR2
+reg16,imm8 \324\1\x6B\100\15 186
+reg16,imm \324\1\x69\100\31 186,SW
rm8 \1\xF6\205 8086
; 64-bit variant does not exist
@@ -1613,8 +1613,8 @@ rm16 \324\1\xFF\206 8086
rm32 \325\1\xFF\206 386,NOX86_64
rm64 \335\1\xFF\206 X86_64
imm32 \325\1\x68\40\335 386
-imm16 \324\1\x68\30\335 286
-imm8 \1\x6A\14\335 286
+imm16 \324\1\x68\30\335 186
+imm8 \1\x6A\14\335 186
reg_fsgs \1\x0F\7\335 386,NOX86_64
reg_sreg \6 8086,NOX86_64
@@ -1655,7 +1655,7 @@ xmmreg,xmmrm \361\2\x0F\xEF\110 WILLAMETTE,SSE2,SM
(Ch_Mop2, Ch_Rop1, Ch_RWFlags)
rm16|32|64,unity \320\1\xD1\202 8086
rm16|32|64,reg_cl \320\1\xD3\202 8086
-rm16|32|64,imm \320\1\xC1\202\25 8086,SB
+rm16|32|64,imm \320\1\xC1\202\25 186,SB
rm8,unity \1\xD0\202 8086
rm8,reg_cl \1\xD2\202 8086
rm8,imm \1\xC0\202\25 186,SB
@@ -1664,7 +1664,7 @@ rm8,imm \1\xC0\202\25 186,SB
(Ch_Mop2, Ch_Rop1, Ch_RWFlags)
rm16|32|64,unity \320\1\xD1\203 8086
rm16|32|64,reg_cl \320\1\xD3\203 8086
-rm16|32|64,imm \320\1\xC1\203\25 8086,SB
+rm16|32|64,imm \320\1\xC1\203\25 186,SB
rm8,unity \1\xD0\203 8086
rm8,reg_cl \1\xD2\203 8086
rm8,imm \1\xC0\203\25 186,SB
@@ -1724,7 +1724,7 @@ imm \1\xC2\30 8086,SW
(Ch_Mop2, Ch_Rop1, Ch_RWFlags)
rm16|32|64,unity \320\1\xD1\200 8086
rm16|32|64,reg_cl \320\1\xD3\200 8086
-rm16|32|64,imm \320\1\xC1\200\25 8086,SB
+rm16|32|64,imm \320\1\xC1\200\25 186,SB
rm8,unity \1\xD0\200 8086
rm8,reg_cl \1\xD2\200 8086
rm8,imm \1\xC0\200\25 186,SB
@@ -1733,7 +1733,7 @@ rm8,imm \1\xC0\200\25 186,SB
(Ch_Mop2, Ch_Rop1, Ch_RWFlags)
rm16|32|64,unity \320\1\xD1\201 8086
rm16|32|64,reg_cl \320\1\xD3\201 8086
-rm16|32|64,imm \320\1\xC1\201\25 8086,SB
+rm16|32|64,imm \320\1\xC1\201\25 186,SB
rm8,unity \1\xD0\201 8086
rm8,reg_cl \1\xD2\201 8086
rm8,imm \1\xC0\201\25 186,SB
@@ -1759,7 +1759,7 @@ void \1\x9E 8086
(Ch_Mop2, Ch_Rop1, Ch_RWFlags)
rm16|32|64,unity \320\1\xD1\204 8086,ND
rm16|32|64,reg_cl \320\1\xD3\204 8086,ND
-rm16|32|64,imm \320\1\xC1\204\25 8086,ND,SB
+rm16|32|64,imm \320\1\xC1\204\25 186,ND,SB
rm8,unity \1\xD0\204 8086,ND
rm8,reg_cl \1\xD2\204 8086,ND
rm8,imm \1\xC0\204\25 186,ND,SB
@@ -1772,7 +1772,7 @@ void \1\xD6 8086,UNDOC,NOX86_64
(Ch_Mop2, Ch_Rop1, Ch_WFlags)
rm16|32|64,unity \320\1\xD1\207 8086
rm16|32|64,reg_cl \320\1\xD3\207 8086
-rm16|32|64,imm \320\1\xC1\207\25 8086,SB
+rm16|32|64,imm \320\1\xC1\207\25 186,SB
rm8,unity \1\xD0\207 8086
rm8,reg_cl \1\xD2\207 8086
rm8,imm \1\xC0\207\25 186,SB
diff --git a/compiler/x86_64/x8664tab.inc b/compiler/x86_64/x8664tab.inc
index 899f2869df..7d622ea684 100644
--- a/compiler/x86_64/x8664tab.inc
+++ b/compiler/x86_64/x8664tab.inc
@@ -2273,28 +2273,28 @@
ops : 3;
optypes : (ot_reg16,ot_rm_gpr,ot_immediate or ot_bits8 or ot_signed,ot_none);
code : #212#1#107#72#14;
- flags : if_286 or if_sm
+ flags : if_186 or if_sm
),
(
opcode : A_IMUL;
ops : 3;
optypes : (ot_reg16,ot_rm_gpr,ot_immediate,ot_none);
code : #212#1#105#72#26;
- flags : if_286 or if_sm or if_sw or if_ar2
+ flags : if_186 or if_sm or if_sw or if_ar2
),
(
opcode : A_IMUL;
ops : 2;
optypes : (ot_reg16,ot_immediate or ot_bits8 or ot_signed,ot_none,ot_none);
code : #212#1#107#64#13;
- flags : if_286
+ flags : if_186
),
(
opcode : A_IMUL;
ops : 2;
optypes : (ot_reg16,ot_immediate,ot_none,ot_none);
code : #212#1#105#64#25;
- flags : if_286 or if_sw
+ flags : if_186 or if_sw
),
(
opcode : A_IMUL;
@@ -4422,14 +4422,14 @@
ops : 1;
optypes : (ot_immediate or ot_bits16,ot_none,ot_none,ot_none);
code : #212#1#104#24#221;
- flags : if_286
+ flags : if_186
),
(
opcode : A_PUSH;
ops : 1;
optypes : (ot_immediate or ot_bits8 or ot_signed,ot_none,ot_none,ot_none);
code : #1#106#12#221;
- flags : if_286
+ flags : if_186
),
(
opcode : A_PUSHF;
@@ -4485,7 +4485,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#130#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_RCL;
@@ -4527,7 +4527,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#131#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_RCR;
@@ -4674,7 +4674,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#128#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_ROL;
@@ -4716,7 +4716,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#129#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_ROR;
@@ -4786,7 +4786,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#132#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_SAL;
@@ -4828,7 +4828,7 @@
ops : 2;
optypes : (ot_rm_gpr or ot_bits16 or ot_bits32 or ot_bits64,ot_immediate,ot_none,ot_none);
code : #208#1#193#135#21;
- flags : if_8086 or if_sb
+ flags : if_186 or if_sb
),
(
opcode : A_SAR;