diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2018-10-01 08:03:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-01 08:03:25 +0200 |
| commit | b3a81e922b8c5d74b4b7bff0b3be717ff08a7fca (patch) | |
| tree | 8c6b50f3cecdc8f119bb390e92175a3cc8f2e250 | |
| parent | 9c8596646ba6150694deb984f25aaad73d2c7125 (diff) | |
| parent | a34669aafdf86e2229271f1a865bc03ff881f8fa (diff) | |
| download | miasm-b3a81e922b8c5d74b4b7bff0b3be717ff08a7fca.tar.gz miasm-b3a81e922b8c5d74b4b7bff0b3be717ff08a7fca.zip | |
Merge pull request #860 from jetsecurity/blx_r8
ARM Thumb: Support BLX Rd with Rd > R7
| -rw-r--r-- | miasm2/arch/arm/arch.py | 2 | ||||
| -rw-r--r-- | test/arch/arm/arch.py | 3 |
2 files changed, 4 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]) diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py index d92c24b2..ae8e3e79 100644 --- a/test/arch/arm/arch.py +++ b/test/arch/arm/arch.py @@ -431,6 +431,9 @@ reg_tests_armt = [ ("00000000 BLX R7", "B847"), + ("00000000 BLX R8", + "C047"), + ("00000000 CBZ R4, 0x2E", "bcb1"), ("00000000 CBNZ R0, 0x2A", |