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>2015-02-20 22:52:16 +0100
committerserpilliere <serpilliere@users.noreply.github.com>2015-02-20 22:52:16 +0100
commit1db45ff969a41d0576cf00f00f7b59e1bb332de2 (patch)
treea062d34aacc6e6f3692cb6b92567a29081500d93 /miasm2/arch/x86/arch.py
parentf1966ac767894b4fe954613d2134f87cdc3697ca (diff)
parentc37fd6a238c617d1ca9a29871a229a64ba14b41e (diff)
downloadmiasm-1db45ff969a41d0576cf00f00f7b59e1bb332de2.tar.gz
miasm-1db45ff969a41d0576cf00f00f7b59e1bb332de2.zip
Merge pull request #81 from ggqb/master
x86 fix for PUSHFW / POPFW instructions
Diffstat (limited to 'miasm2/arch/x86/arch.py')
-rw-r--r--miasm2/arch/x86/arch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py
index c5535153..c059e1be 100644
--- a/miasm2/arch/x86/arch.py
+++ b/miasm2/arch/x86/arch.py
@@ -3745,7 +3745,7 @@ addop("popad", [bs8(0x61), bs_opmode32])
 # popf_name = {16:'POPF', 32:'POPFD', 64:'POPFQ'}
 # bs_popf_name = bs_modname_size(l=0, name=popf_name)
 # addop("popf", [bs8(0x9d), bs_popf_name])
-addop("popf", [bs8(0x9d), bs_opmode16])
+addop("popfw", [bs8(0x9d), bs_opmode16])
 addop("popfd", [bs8(0x9d), bs_opmode32])
 addop("popfq", [bs8(0x9d), bs_opmode64])
 
@@ -3775,7 +3775,7 @@ addop("pushad", [bs8(0x60), bs_opmode32_no64])
 # pushf_name = {16:'PUSHF', 32:'PUSHFD', 64:'PUSHFQ'}
 # bs_pushf_name = bs_modname_size(l=0, name=pushf_name)
 # addop("pushf", [bs8(0x9c), bs_pushf_name])
-addop("pushf", [bs8(0x9c), bs_opmode16])
+addop("pushfw", [bs8(0x9c), bs_opmode16])
 addop("pushfd", [bs8(0x9c), bs_opmode32])
 addop("pushfq", [bs8(0x9c), bs_opmode64])