Skip to content

Commit 6454de0

Browse files
committed
1
1 parent 41c661c commit 6454de0

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
# Emacs files
44
*~
55
# Compiled python files
6-
*\.pyc
6+
*\.pyc
7+
/.idea/

miasm/arch/arm/arch.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,7 @@ def encode(self):
14391439
imm12_off = bs(l=12, fname="imm")
14401440

14411441
imm2_noarg = bs(l=2, fname="imm")
1442+
imm3_noarg = bs(l=3, fname="imm3")
14421443
imm4_noarg = bs(l=4, fname="imm4")
14431444

14441445

@@ -2431,6 +2432,7 @@ class arm_sp(arm_reg):
24312432
armtop("addsubi", [bs('000111'), bs_addsub_name, off3, rsl, rdl], [rdl, rsl, off3])
24322433
armtop("mcas", [bs('001'), bs_mov_cmp_add_sub_name, rnl, off8])
24332434
armtop("alu", [bs('010000'), bs_alu_name, rsl, rdl], [rdl, rsl])
2435+
24342436
# should not be used ??
24352437
armtop("hiregop00", [bs('010001'), bs_hiregop_name, bs('00'), rsl, rdl], [rdl, rsl])
24362438
armtop("hiregop01", [bs('010001'), bs_hiregop_name, bs('01'), rsh, rdl], [rdl, rsh])
@@ -3370,3 +3372,6 @@ def check_fbits(self, v):
33703372
armtop("dsb", [bs('111100111011'), bs('1111'), bs('1000'), bs('1111'), bs('0100'), barrier_option])
33713373

33723374
armtop("adr", [bs('11110'), imm12_1, bs('100000'), bs('1111'), bs('0'), imm12_3, rd, imm12_8_t4], [rd, imm12_8_t4])
3375+
3376+
3377+
armtop("teq", [bs('111010101001'), rn_noarg, bs('0'), imm3_noarg, bs('1111'), imm2_noarg, imm_stype, rm_noarg])

miasm/arch/arm/jit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def block2assignblks(self, block):
3434

3535
if instr.name.startswith("IT"):
3636
assignments = []
37-
label = self.ir_arch.get_instr_label(instr)
37+
label = self.ir_arch.get_loc_key_for_instr(instr)
3838
irblocks = []
3939
index, irblocks = self.ir_arch.do_it_block(label, index, block, assignments, True)
4040
irblocks_list += irblocks

0 commit comments

Comments
 (0)