Merge branch 'next' into msvc2
diff --git a/arch/ARM/ARMInstPrinter.c b/arch/ARM/ARMInstPrinter.c
index 05bee3d..3e6ccdc 100644
--- a/arch/ARM/ARMInstPrinter.c
+++ b/arch/ARM/ARMInstPrinter.c
@@ -571,6 +571,7 @@
// to reflect absolute address.
// Note: in ARM, PC is always 2 instructions ahead, so we have to
// add 8 in ARM mode, or 4 in Thumb mode
+ // printf(">> opcode: %u\n", MCInst_getOpcode(MI));
if (ARM_rel_branch(MI->csh, MCInst_getOpcode(MI))) {
// only do this for relative branch
if (MI->csh->mode & CS_MODE_THUMB)
diff --git a/arch/ARM/ARMMapping.c b/arch/ARM/ARMMapping.c
index 8c18f4e..d864ae2 100644
--- a/arch/ARM/ARMMapping.c
+++ b/arch/ARM/ARMMapping.c
@@ -13604,6 +13604,8 @@
// list all relative branch instructions
// ie: insns[i].branch && !insns[i].indirect_branch
static unsigned int insn_rel[] = {
+ ARM_BL,
+ ARM_BLX_pred,
ARM_Bcc,
ARM_t2B,
ARM_t2Bcc,
@@ -13612,8 +13614,10 @@
ARM_tCBNZ,
ARM_tCBZ,
ARM_BL_pred,
- ARM_BL,
ARM_BLXi,
+ ARM_tBL,
+ ARM_tB,
+ ARM_tBLXi,
0
};