diff options
| author | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2014-09-29 16:37:00 +0200 |
|---|---|---|
| committer | Fabrice Desclaux <fabrice.desclaux@cea.fr> | 2014-09-29 16:37:00 +0200 |
| commit | 6317588a7df1fb600cb1d9b218ef8c248255be64 (patch) | |
| tree | 0116f1da1e6110e656a026be0e53d929213d94cb | |
| parent | d2d915478eb2cfe87c0e437611b7f35a68d9d34c (diff) | |
| download | miasm-6317588a7df1fb600cb1d9b218ef8c248255be64.tar.gz miasm-6317588a7df1fb600cb1d9b218ef8c248255be64.zip | |
Arm: swi is svc
| -rw-r--r-- | miasm2/arch/arm/arch.py | 4 | ||||
| -rw-r--r-- | test/arch/arm/arch.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/miasm2/arch/arm/arch.py b/miasm2/arch/arm/arch.py index 9bf36024..e5aa40d6 100644 --- a/miasm2/arch/arm/arch.py +++ b/miasm2/arch/arm/arch.py @@ -1878,8 +1878,6 @@ pclr = bs(l=1, fname='pclr') sp = bs(l=0, cls=(arm_sp,)) -tswi_i = bs(l=8, cls=(arm_imm,), fname="swi_i") - off8s = bs(l=8, cls=(arm_offs,), fname="offs") trlistpclr = bs(l=8, cls=(armt_rlist_pclr,)) @@ -1982,7 +1980,7 @@ armtop("pushpop", 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("swi", [bs('11011111'), tswi_i]) +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 8e61b2f9..63217352 100644 --- a/test/arch/arm/arch.py +++ b/test/arch/arm/arch.py @@ -456,6 +456,8 @@ reg_tests_armt = [ "C5B2"), ("xxxxxxxx BKPT 0x13", "13be"), + ("xxxxxxxx SVC 0x13", + "13df"), ] print "#" * 40, 'armthumb', '#' * 40 |