about summary refs log tree commit diff stats
path: root/miasm2/arch/arm/sem.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2019-02-21 21:53:16 +0100
committerGitHub <noreply@github.com>2019-02-21 21:53:16 +0100
commit9c063fb1ddd5e6eaa54d6d83048715b3ab8b9191 (patch)
tree99eb05bdd896c6c1f1c506417141e373868f4580 /miasm2/arch/arm/sem.py
parent22bc2c09076802ac5e6aa02508f9d0e363847d48 (diff)
parent426133b3f84b4b566a382d803bf9c1497b5d123d (diff)
downloadmiasm-9c063fb1ddd5e6eaa54d6d83048715b3ab8b9191.tar.gz
miasm-9c063fb1ddd5e6eaa54d6d83048715b3ab8b9191.zip
Merge pull request #981 from hax0kartik/patch-1
implement NOP for arm and fix ldrsb
Diffstat (limited to 'miasm2/arch/arm/sem.py')
-rw-r--r--miasm2/arch/arm/sem.py2
1 files changed, 1 insertions, 1 deletions
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,
                 }