diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2019-02-21 21:53:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-21 21:53:16 +0100 |
| commit | 9c063fb1ddd5e6eaa54d6d83048715b3ab8b9191 (patch) | |
| tree | 99eb05bdd896c6c1f1c506417141e373868f4580 | |
| parent | 22bc2c09076802ac5e6aa02508f9d0e363847d48 (diff) | |
| parent | 426133b3f84b4b566a382d803bf9c1497b5d123d (diff) | |
| download | miasm-9c063fb1ddd5e6eaa54d6d83048715b3ab8b9191.tar.gz miasm-9c063fb1ddd5e6eaa54d6d83048715b3ab8b9191.zip | |
Merge pull request #981 from hax0kartik/patch-1
implement NOP for arm and fix ldrsb
| -rw-r--r-- | miasm2/arch/arm/arch.py | 1 | ||||
| -rw-r--r-- | miasm2/arch/arm/sem.py | 2 |
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, } |