1

Author: b14aa178

.gitignore

@@ -3,4 +3,5 @@
 # Emacs files
 *~
 # Compiled python files
-*\.pyc
+*\.pyc
+/.idea/

miasm/arch/arm/arch.py

@@ -1439,6 +1439,7 @@ def encode(self):
 imm12_off = bs(l=12, fname="imm")
 
 imm2_noarg = bs(l=2, fname="imm")
+imm3_noarg = bs(l=3, fname="imm3")
 imm4_noarg = bs(l=4, fname="imm4")
 
 
@@ -2431,6 +2432,7 @@ class arm_sp(arm_reg):
 armtop("addsubi", [bs('000111'),  bs_addsub_name, off3, rsl, rdl], [rdl, rsl, off3])
 armtop("mcas", [bs('001'), bs_mov_cmp_add_sub_name, rnl, off8])
 armtop("alu", [bs('010000'), bs_alu_name, rsl, rdl], [rdl, rsl])
+
   # should not be used ??
 armtop("hiregop00", [bs('010001'), bs_hiregop_name, bs('00'), rsl, rdl], [rdl, rsl])
 armtop("hiregop01", [bs('010001'), bs_hiregop_name, bs('01'), rsh, rdl], [rdl, rsh])
@@ -3370,3 +3372,6 @@ def check_fbits(self, v):
 armtop("dsb",  [bs('111100111011'), bs('1111'), bs('1000'), bs('1111'), bs('0100'), barrier_option])
 
 armtop("adr", [bs('11110'), imm12_1, bs('100000'), bs('1111'), bs('0'), imm12_3, rd, imm12_8_t4], [rd, imm12_8_t4])
+
+
+armtop("teq", [bs('111010101001'), rn_noarg, bs('0'), imm3_noarg, bs('1111'), imm2_noarg, imm_stype, rm_noarg])

miasm/arch/arm/jit.py

@@ -34,7 +34,7 @@ def block2assignblks(self, block):
 
             if instr.name.startswith("IT"):
                 assignments = []
-                label = self.ir_arch.get_instr_label(instr)
+                label = self.ir_arch.get_loc_key_for_instr(instr)
                 irblocks = []
                 index, irblocks = self.ir_arch.do_it_block(label, index, block, assignments, True)
                 irblocks_list += irblocks