Allow to print JIT assemble without binary addresses (opcache.jit_debug=0x001) and with (opcache.jit_debug=0x401) for both ARM and x86.

Author: dstogov

ext/opcache/jit/zend_jit.h

@@ -53,6 +53,7 @@
 
 #define ZEND_JIT_DEBUG_GDB       (1<<8)
 #define ZEND_JIT_DEBUG_SIZE      (1<<9)
+#define ZEND_JIT_DEBUG_ASM_ADDR  (1<<10)
 
 #define ZEND_JIT_DEBUG_TRACE_START     (1<<12)
 #define ZEND_JIT_DEBUG_TRACE_STOP      (1<<13)

ext/opcache/jit/zend_jit_disasm.c

@@ -445,13 +445,15 @@ static int zend_jit_disasm(const char    *name,
 		}
 
 # ifdef HAVE_CAPSTONE_ITER
-#  if defined(__aarch64__)
-		fprintf(stderr, "    "ZEND_XLONG_FMT":\t%s ", insn->address, insn->mnemonic);
-#  else
+		if (JIT_G(debug) & ZEND_JIT_DEBUG_ASM_ADDR) {
+			fprintf(stderr, "    "ZEND_XLONG_FMT":", insn->address);
+		}
 		fprintf(stderr, "\t%s ", insn->mnemonic);
-#  endif
 		p = insn->op_str;
 # else
+		if (JIT_G(debug) & ZEND_JIT_DEBUG_ASM_ADDR) {
+			fprintf(stderr, "    "ZEND_XLONG_FMT":", insn[i].address);
+		}
 		fprintf(stderr, "\t%s ", insn[i].mnemonic);
 		p = insn[i].op_str;
 # endif
@@ -551,6 +553,9 @@ static int zend_jit_disasm(const char    *name,
 				}
 			}
 		}
+		if (JIT_G(debug) & ZEND_JIT_DEBUG_ASM_ADDR) {
+			fprintf(stderr, "    "ZEND_XLONG_FMT":", ud_insn_off(&ud));
+		}
 		fprintf(stderr, "\t%s\n", ud_insn_asm(&ud));
 	}
 #endif