about summary refs log tree commit diff stats
path: root/miasm2/arch/x86/arch.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2019-02-05 23:37:54 +0100
committerGitHub <noreply@github.com>2019-02-05 23:37:54 +0100
commit5cfdeb7ab8d889232044bb93f2505cfb23c4f92f (patch)
tree29903f4208266f342c4f0aac55dc4c6788acb9ba /miasm2/arch/x86/arch.py
parentca6cdc24302fd065b0bdde41573ffe077c5ddcaf (diff)
parent4b9858ef4fef46f730a55ec2fdca1211078153c8 (diff)
downloadmiasm-5cfdeb7ab8d889232044bb93f2505cfb23c4f92f.tar.gz
miasm-5cfdeb7ab8d889232044bb93f2505cfb23c4f92f.zip
Merge pull request #960 from WilliamBruneau/add_endbr
Add ENDBR64 and ENDBR32 instructions
Diffstat (limited to '')
-rw-r--r--miasm2/arch/x86/arch.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py
index 7f9d50e6..ef7b9ef6 100644
--- a/miasm2/arch/x86/arch.py
+++ b/miasm2/arch/x86/arch.py
@@ -4607,6 +4607,8 @@ addop("maskmovdqu", [bs8(0x0f), bs8(0xf7), pref_66] +
 
 addop("emms", [bs8(0x0f), bs8(0x77)])
 
+addop("endbr64", [pref_f3, bs8(0x0f), bs8(0x1e), bs8(0xfa)])
+addop("endbr32", [pref_f3, bs8(0x0f), bs8(0x1e), bs8(0xfb)])
 
 mn_x86.bintree = factor_one_bit(mn_x86.bintree)
 # mn_x86.bintree = factor_fields_all(mn_x86.bintree)