about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2018-10-01 08:07:03 +0200
committerGitHub <noreply@github.com>2018-10-01 08:07:03 +0200
commit75b389f70e7cc6640cbfb62268ba89f8985be1ed (patch)
treec8fe7edf7996dae0a2bdc1e1dbd2dd76ef759779
parentb3a81e922b8c5d74b4b7bff0b3be717ff08a7fca (diff)
parente2da18cefab031060f53ea60547c9f6ce8a775c8 (diff)
downloadmiasm-75b389f70e7cc6640cbfb62268ba89f8985be1ed.tar.gz
miasm-75b389f70e7cc6640cbfb62268ba89f8985be1ed.zip
Merge pull request #861 from jetsecurity/eor_immediate
ARM Thumb: Add EOR (immediate) instruction
-rw-r--r--miasm2/arch/arm/arch.py1
-rw-r--r--test/arch/arm/arch.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py
index d4ef3b4a..e1b015a5 100644
--- a/miasm2/arch/arm/arch.py
+++ b/miasm2/arch/arm/arch.py
@@ -3215,6 +3215,7 @@ armtop("add", [bs('11110'), imm12_1, bs('01000'), scc, rn, bs('0'), imm12_3, rd,
 armtop("bic", [bs('11110'), imm12_1, bs('00001'), scc, rn_nosppc, bs('0'), imm12_3, rd, imm12_8], [rd, rn_nosppc, imm12_8])
 armtop("and", [bs('11110'), imm12_1, bs('00000'), scc, rn, bs('0'), imm12_3, rd_nopc, imm12_8], [rd_nopc, rn, imm12_8])
 armtop("sub", [bs('11110'), imm12_1, bs('01101'), scc, rn, bs('0'), imm12_3, rd_nopc, imm12_8], [rd_nopc, rn, imm12_8])
+armtop("eor", [bs('11110'), imm12_1, bs('00100'), scc, rn, bs('0'), imm12_3, rd_nopc, imm12_8], [rd_nopc, rn, imm12_8])
 armtop("add", [bs('11110'), imm12_1, bs('10000'), scc, rn_nosppc, bs('0'), imm12_3, rd, imm12_8_t4], [rd, rn_nosppc, imm12_8_t4])
 armtop("cmp", [bs('11110'), imm12_1, bs('01101'), bs('1'), rn, bs('0'), imm12_3, bs('1111'), imm12_8] )
 
diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py
index ae8e3e79..2110ccf7 100644
--- a/test/arch/arm/arch.py
+++ b/test/arch/arm/arch.py
@@ -670,6 +670,9 @@ reg_tests_armt = [
     ("xxxxxxxx    EOR        R3, R3, R1",
      "83EA0103"),
 
+    ("xxxxxxxx    EOR        R0, R1, 0x42",
+     "81F04200"),
+
     ("xxxxxxxx    DSB        SY",
      "bff34f8f"),