about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--miasm2/arch/arm/arch.py1
-rw-r--r--miasm2/arch/arm/sem.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py
index 23ecc7d3..c50748e4 100644
--- a/miasm2/arch/arm/arch.py
+++ b/miasm2/arch/arm/arch.py
@@ -1699,6 +1699,7 @@ armop("rev16", [bs('01101011'), bs('1111'), rd, bs('1111'), bs('1011'), rm])
 armop("pld", [bs8(0xF5), bs_addi, bs_rw, bs('01'), mem_rn_imm, bs('1111'), imm12_off])
 
 armop("isb", [bs8(0xF5), bs8(0x7F), bs8(0xF0), bs8(0x6F)])
+armop("nop", [bs8(0xE3), bs8(0x20), bs8(0xF0), bs8(0)])
 
 class arm_widthm1(arm_imm, m_arg):
     def decode(self, v):
diff --git a/miasm2/arch/arm/sem.py b/miasm2/arch/arm/sem.py
index 3e017d1f..782a99fb 100644
--- a/miasm2/arch/arm/sem.py
+++ b/miasm2/arch/arm/sem.py
@@ -1493,6 +1493,7 @@ mnemo_condm0 = {'add': add,
                 'mla': mla,
                 'ldr': ldr,
                 'ldrd': ldrd,
+                'ldrsb': ldrsb,
                 'str': l_str,
                 'strd': l_strd,
                 'b': b,
@@ -1549,7 +1550,6 @@ mnemo_condm1 = {'adds': add,
                 'blx': blx,
 
                 'ldrb': ldrb,
-                'ldrsb': ldrsb,
                 'ldsb': ldrsb,
                 'strb': strb,
                 }