about summary refs log tree commit diff stats
path: root/miasm2/arch/arm/arch.py
diff options
context:
space:
mode:
authorserpilliere <serpilliere@users.noreply.github.com>2018-10-01 08:03:25 +0200
committerGitHub <noreply@github.com>2018-10-01 08:03:25 +0200
commitb3a81e922b8c5d74b4b7bff0b3be717ff08a7fca (patch)
tree8c6b50f3cecdc8f119bb390e92175a3cc8f2e250 /miasm2/arch/arm/arch.py
parent9c8596646ba6150694deb984f25aaad73d2c7125 (diff)
parenta34669aafdf86e2229271f1a865bc03ff881f8fa (diff)
downloadmiasm-b3a81e922b8c5d74b4b7bff0b3be717ff08a7fca.tar.gz
miasm-b3a81e922b8c5d74b4b7bff0b3be717ff08a7fca.zip
Merge pull request #860 from jetsecurity/blx_r8
ARM Thumb: Support BLX Rd with Rd > R7
Diffstat (limited to '')
-rw-r--r--miasm2/arch/arm/arch.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py
index 67d73592..d4ef3b4a 100644
--- a/miasm2/arch/arm/arch.py
+++ b/miasm2/arch/arm/arch.py
@@ -2373,7 +2373,7 @@ armtop("addsp", [bs('10110000'), bs_addsubsp_name, sp, off7], [sp, off7])
 armtop("pushpop", [bs('1011'), bs_pushpop_name, bs('10'), pclr, trlistpclr], [trlistpclr])
 armtop("btransfersp", [bs('1100'),  bs_tbtransfer_name, rbl_wb, trlist])
 armtop("br", [bs('1101'),  bs_br_name, offs8])
-armtop("blx", [bs("01000111"),  bs('10'), rnl, bs('000')])
+armtop("blx", [bs("01000111"),  bs('1'), rm, bs('000')])
 armtop("svc", [bs('11011111'),  imm8])
 armtop("b", [bs('11100'),  offs11])
 armtop("und", [bs('1101'), bs('1110'), imm8_d1])