Use symbolic labels for BL and ADR instructions

dstogov · dstogov · commit 60436b3ce30e · 2021-05-14T11:04:12.000+03:00
diff --git a/ext/opcache/jit/zend_jit_disasm.c b/ext/opcache/jit/zend_jit_disasm.c
@@ -234,7 +234,9 @@ static uint64_t zend_jit_disasm_branch_target(csh cs, const cs_insn *insn)
 		}
 	}
 #elif defined(__aarch64__)
-	if (cs_insn_group(cs, insn, ARM64_GRP_JUMP)) {
+	if (cs_insn_group(cs, insn, ARM64_GRP_JUMP)
+	 || insn->id == ARM64_INS_BL
+	 || insn->id == ARM64_INS_ADR) {
 		for (i = 0; i < insn->detail->arm64.op_count; i++) {
 			if (insn->detail->arm64.operands[i].type == ARM64_OP_IMM)
 				return insn->detail->arm64.operands[i].imm;

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,9 @@ static uint64_t zend_jit_disasm_branch_target(csh cs, const cs_insn *insn)`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`	`#elif defined(__aarch64__)`
`237`		`- if (cs_insn_group(cs, insn, ARM64_GRP_JUMP)) {`
	`237`	`+ if (cs_insn_group(cs, insn, ARM64_GRP_JUMP)`
	`238`	`+ \|\| insn->id == ARM64_INS_BL`
	`239`	`+ \|\| insn->id == ARM64_INS_ADR) {`
`238`	`240`	`for (i = 0; i < insn->detail->arm64.op_count; i++) {`
`239`	`241`	`if (insn->detail->arm64.operands[i].type == ARM64_OP_IMM)`
`240`	`242`	`return insn->detail->arm64.operands[i].imm;`