aboutsummaryrefslogtreecommitdiffstats
path: root/x86
diff options
context:
space:
mode:
authorH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
committerH. Peter Anvin (Intel) <hpa@zytor.com>2020-06-27 16:52:02 -0700
commitc59337797f2dac6c89c66440f3d30d468adf5bbc (patch)
tree56b3769fce933ffbcf2180124f925465acbd6043 /x86
parent513e19c8da06745525492b58795d8d8caa545049 (diff)
parent444905e48bc2e4e428064b3ad5ec6d6c5d23d2f1 (diff)
downloadnasm-master.tar.gz
nasm-master.tar.xz
nasm-master.zip
Merge remote-tracking branch 'origin/nasm-2.15.xx'HEADmaster
Resolved Conflicts: version Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'x86')
-rw-r--r--x86/iflags.ph1
-rw-r--r--x86/insns.dat16
2 files changed, 17 insertions, 0 deletions
diff --git a/x86/iflags.ph b/x86/iflags.ph
index 8f0a80fd..2c05b293 100644
--- a/x86/iflags.ph
+++ b/x86/iflags.ph
@@ -83,6 +83,7 @@ if_("AVX512VPOPCNTDQ", "AVX-512 VPOPCNTD/VPOPCNTQ");
if_("AVX5124FMAPS", "AVX-512 4-iteration multiply-add");
if_("AVX5124VNNIW", "AVX-512 4-iteration dot product");
if_("SGX", "Intel Software Guard Extensions (SGX)");
+if_("CET", "Intel Control-Flow Enforcement Technology (CET)");
# Put these last [hpa: why?]
if_("OBSOLETE", "Instruction removed from architecture");
diff --git a/x86/insns.dat b/x86/insns.dat
index a59c5306..980c5943 100644
--- a/x86/insns.dat
+++ b/x86/insns.dat
@@ -5983,6 +5983,22 @@ ENCLS void [ np 0f 01 cf] SGX,FUTURE
ENCLU void [ np 0f 01 d7] SGX,FUTURE
ENCLV void [ np 0f 01 c0] SGX,FUTURE
+;# Intel Control-Flow Enforcement Technology (CET)
+CLRSSBSY mem64 [m: f3 0f ae /6] CET,FUTURE
+ENDBR32 void [ f3 0f 1e fb] CET,FUTURE
+ENDBR64 void [ f3 0f 1e fa] CET,FUTURE
+INCSSPD reg32 [m: o32 f3 0f ae /5] CET,FUTURE
+INCSSPQ reg64 [m: o64 f3 0f ae /5] CET,FUTURE,X64
+RDSSPD reg32 [m: o32 f3 0f 1e /1] CET,FUTURE
+RDSSPQ reg64 [m: o64 f3 0f 1e /1] CET,FUTURE,X64
+RSTORSSP mem64 [m: f3 0f 01 /5] CET,FUTURE
+SAVEPREVSSP void [ f3 0f 01 ea] CET,FUTURE
+SETSSBSY void [ f3 0f 01 e8] CET,FUTURE
+WRUSSD mem,reg32 [mr: o32 66 0f 38 f5 /r] CET,FUTURE
+WRUSSQ mem,reg64 [mr: o64 66 0f 38 f5 /r] CET,FUTURE,X64
+WRSSD mem,reg32 [mr: o32 0f 38 f6 /r] CET,FUTURE
+WRSSQ mem,reg64 [mr: o64 0f 38 f6 /r] CET,FUTURE,X64
+
;# Systematic names for the hinting nop instructions
; These should be last in the file
HINT_NOP0 rm16 [m: o16 0f 18 /0] P6,UNDOC