diff options
Diffstat (limited to 'lib/dis-arm.inc.h')
| -rw-r--r-- | lib/dis-arm.inc.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/lib/dis-arm.inc.h b/lib/dis-arm.inc.h index b537442..c95e450 100644 --- a/lib/dis-arm.inc.h +++ b/lib/dis-arm.inc.h @@ -44,10 +44,10 @@ static INLINE void P(GPR_Rn_GPR_Rm_unk_Rd_1_ADDrr)(tdis_ctx ctx, struct bitslice data(rout(Rd), r(Rm), r(Rn)); } static INLINE void P(GPR_Rn_so_reg_imm_shift_unk_Rd_1_ADDrsi)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rd, struct bitslice Rn) { - data(rs(shift, 0, 4), r(Rn), rout(Rd)); + data(rout(Rd), rs(shift, 0, 4), r(Rn)); } static INLINE void P(GPR_Rn_so_reg_reg_shift_unk_Rd_1_ADDrsr)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rd, struct bitslice Rn) { - data(rs(shift, 0, 4), rs(shift, 8, 4), r(Rn), rout(Rd)); + data(rout(Rd), rs(shift, 0, 4), rs(shift, 8, 4), r(Rn)); } static INLINE void P(GPR_Rn_unk_Rd_1_ADDri)(tdis_ctx ctx, struct bitslice Rd, struct bitslice Rn) { data(rout(Rd), r(Rn)); @@ -56,7 +56,7 @@ static INLINE void P(GPR_Rt_4_MCR)(tdis_ctx ctx, struct bitslice Rt) { data(r(Rt)); } static INLINE void P(GPR_Rt_addr_offset_none_addr_S_3_STL)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rout(Rt)); + data(rout(Rt), r(addr)); } static INLINE void P(GPR_Rt_addr_offset_none_addr_am2offset_imm_offset_S_4_STRBT_POST_IMM)(tdis_ctx ctx, UNUSED struct bitslice offset, struct bitslice Rt, struct bitslice addr) { data(r(addr), r(Rt)); @@ -105,16 +105,16 @@ static INLINE void P(addr_offset_none_addr_S_4_STC2L_OPTION)(tdis_ctx ctx, struc data(r(addr)); } static INLINE void P(addr_offset_none_addr_am2offset_imm_offset_unk_Rt_4_LDRBT_POST_IMM)(tdis_ctx ctx, UNUSED struct bitslice offset, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rout(Rt)); + data(rout(Rt), r(addr)); } static INLINE void P(addr_offset_none_addr_am2offset_reg_offset_unk_Rt_4_LDRBT_POST_REG)(tdis_ctx ctx, struct bitslice offset, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rs(offset, 0, 4), rout(Rt)); + data(rout(Rt), r(addr), rs(offset, 0, 4)); } static INLINE void P(addr_offset_none_addr_am3offset_offset_unk_Rt_4_LDRD_POST)(tdis_ctx ctx, struct bitslice offset, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rs(offset, 0, 4), rout(Rt)); + data(rout(Rt), r(addr), rs(offset, 0, 4)); } static INLINE void P(addr_offset_none_addr_postidx_imm8_offset_unk_Rt_3_LDRHTi)(tdis_ctx ctx, UNUSED struct bitslice offset, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rout(Rt)); + data(rout(Rt), r(addr)); } static INLINE void P(addr_offset_none_addr_postidx_imm8s4_offset_4_LDC2L_POST)(tdis_ctx ctx, UNUSED struct bitslice offset, struct bitslice addr) { data(r(addr)); @@ -123,7 +123,7 @@ static INLINE void P(addr_offset_none_addr_postidx_imm8s4_offset_S_4_STC2L_POST) data(r(addr)); } static INLINE void P(addr_offset_none_addr_unk_Rt_13_LDA)(tdis_ctx ctx, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rout(Rt)); + data(rout(Rt), r(addr)); } static INLINE void P(addrmode3_addr_unk_Rt_4_LDRD)(tdis_ctx ctx, struct bitslice addr, UNUSED struct bitslice Rt) { /* ignoring Rt2 = Rt + 1, but it isn't supposed to load PC anyway */ @@ -133,7 +133,7 @@ static INLINE void P(addrmode3_pre_addr_unk_Rt_4_LDRD_PRE)(tdis_ctx ctx, struct data(rs(addr, 9, 4), rs(addr, 0, 4)); } static INLINE void P(addrmode5_addr_8_LDC2L_OFFSET)(tdis_ctx ctx, struct bitslice addr) { - data(rsout(addr, 9, 4)); + data(rs(addr, 9, 4)); } static INLINE void P(addrmode5_addr_S_4_STC2L_OFFSET)(tdis_ctx ctx, struct bitslice addr) { data(rs(addr, 9, 4)); @@ -145,10 +145,10 @@ static INLINE void P(addrmode5_pre_addr_S_4_STC2L_PRE)(tdis_ctx ctx, struct bits data(rs(addr, 9, 4)); } static INLINE void P(addrmode_imm12_addr_unk_Rt_2_LDRBi12)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) { - data(rs(addr, 13, 4), rout(Rt)); + data(rout(Rt), rs(addr, 13, 4)); } static INLINE void P(addrmode_imm12_pre_addr_unk_Rt_2_LDRB_PRE_IMM)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) { - data(rs(addr, 13, 4), rout(Rt)); + data(rout(Rt), rs(addr, 13, 4)); } static INLINE void P(adrlabel_label_unk_Rd_1_ADR)(tdis_ctx ctx, struct bitslice label, struct bitslice Rd) { return P(pcrel)(ctx, ctx->pc + 8 + bs_get(label, ctx->op), bs_get(Rd, ctx->op), PLM_ADR); @@ -158,10 +158,10 @@ static INLINE void P(br_target_target_B_1_Bcc)(tdis_ctx ctx, struct bitslice tar return P(branch)(ctx, ctx->pc + 8 + sext(bs_get(target, ctx->op), 24), /*cond*/ cond); } static INLINE void P(ldst_so_reg_addr_unk_Rt_2_LDRB_PRE_REG)(tdis_ctx ctx, struct bitslice addr, struct bitslice Rt) { - data(rs(addr, 0, 4), rs(addr, 13, 4), rout(Rt)); + data(rout(Rt), rs(addr, 0, 4), rs(addr, 13, 4)); } static INLINE void P(ldst_so_reg_shift_unk_Rt_2_LDRBrs)(tdis_ctx ctx, struct bitslice shift, struct bitslice Rt) { - data(rs(shift, 0, 4), rs(shift, 13, 4), rout(Rt)); + data(rout(Rt), rs(shift, 0, 4), rs(shift, 13, 4)); } static INLINE void P(tcGPR_Rm_unk_Rd_1_MOVr_TC)(tdis_ctx ctx, struct bitslice Rm, struct bitslice Rd) { data(rout(Rd), r(Rm)); @@ -188,7 +188,7 @@ static INLINE void P(GPR_Rt_addr_offset_none_addr_unk_Rd_S_6_STLEX)(tdis_ctx ctx data(r(addr), r(Rt), r(Rd)); } static INLINE void P(addr_offset_none_addr_postidx_reg_Rm_unk_Rt_3_LDRHTr)(tdis_ctx ctx, struct bitslice Rm, struct bitslice Rt, struct bitslice addr) { - data(r(addr), rout(Rt), r(Rm)); + data(rout(Rt), r(addr), r(Rm)); } static INLINE void P(GPR_Rt_addr_offset_none_addr_postidx_reg_Rm_S_1_STRHTr)(tdis_ctx ctx, struct bitslice Rm, struct bitslice Rt, struct bitslice addr) { data(r(addr), r(Rt), r(Rm)); |