diff options
| author | Camille Mougey <commial@gmail.com> | 2018-08-19 12:36:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 12:36:01 -0700 |
| commit | 46bb6b39453ea8b5abb04dfd62492e429376a8ea (patch) | |
| tree | 5229dc764e247f779aabb1789541d8a9ece56fb9 | |
| parent | feea7b6ca5f0e9bb9f14619b195c21acd6799898 (diff) | |
| parent | dbf7bb972f812c70f210c5fc5ac99881602be910 (diff) | |
| download | miasm-46bb6b39453ea8b5abb04dfd62492e429376a8ea.tar.gz miasm-46bb6b39453ea8b5abb04dfd62492e429376a8ea.zip | |
Merge pull request #825 from cea-sec/x86_nop
X86: add nop form
| -rw-r--r-- | miasm2/arch/x86/arch.py | 7 | ||||
| -rw-r--r-- | test/arch/x86/arch.py | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/miasm2/arch/x86/arch.py b/miasm2/arch/x86/arch.py index 3a0fb78e..3e41d46e 100644 --- a/miasm2/arch/x86/arch.py +++ b/miasm2/arch/x86/arch.py @@ -3799,6 +3799,13 @@ addop("mul", [bs('1111011'), w8] + rmmod(d4, rm_arg_w8)) addop("neg", [bs('1111011'), w8] + rmmod(d3, rm_arg_w8)) addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d0, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d1, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d2, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d3, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d4, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d5, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d6, rm_arg)) # XXX TODO m512 +addop("nop", [bs8(0x0f), bs8(0x1f)] + rmmod(d7, rm_arg)) # XXX TODO m512 addop("not", [bs('1111011'), w8] + rmmod(d2, rm_arg_w8)) addop("or", [bs("0000110"), w8, d_eax, d_imm]) addop("or", [bs("100000"), se, w8] + rmmod(d1, rm_arg_w8) + [d_imm]) diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py index ce6012a0..44f5197e 100644 --- a/test/arch/x86/arch.py +++ b/test/arch/x86/arch.py @@ -1584,6 +1584,10 @@ reg_tests = [ (m32, "00000000 NOP DWORD PTR [EAX]", "0f1f00"), + (m32, "00000000 NOP EAX", + "0f1fc8"), + + (m32, "00000000 NOT BYTE PTR [EAX]", "f610"), (m32, "00000000 NOT EBX", |