opcache/jit support: Mac M1 build fic

TSRM/TSRM.c

@@ -741,6 +741,14 @@ TSRM_API size_t tsrm_get_ls_cache_tcb_offset(void)
 	asm ("leal _tsrm_ls_cache@ntpoff,%0"
           : "=r" (ret));
 	return ret;
+#elif defined(__aarch64__)
+	size_t ret;
+
+	asm("mov %0, xzr\n\t"
+	    "add %0, %0, #:tprel_hi12:_tsrm_ls_cache, lsl #12\n\t"
+	    "add %0, %0, #:tprel_lo12_nc:_tsrm_ls_cache"
+	     : "=r" (ret));
+	return ret;
 #else
 	return 0;
 #endif

Zend/zend_vm_opcodes.h

@@ -35,7 +35,8 @@
 #endif
 
 #if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) && !defined(__SANITIZE_ADDRESS__)
-# if ((defined(i386) && !defined(__PIC__)) || defined(__x86_64__) || defined(_M_X64))
+# if ((defined(i386) && !defined(__PIC__)) || defined(__x86_64__) || \
+       defined(_M_X64) || defined(__aarch64__))
 #  define ZEND_VM_HYBRID_JIT_RED_ZONE_SIZE 16
 # endif
 #endif

build/Makefile.global

@@ -117,6 +117,7 @@ clean:
 	find . -name .libs -a -type d|xargs rm -rf
 	rm -f libphp.la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 	rm -f ext/opcache/jit/zend_jit_x86.c
+	rm -f ext/opcache/jit/zend_jit_arm64.c
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
@@ -125,6 +126,8 @@ distclean: clean
 	rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
 	rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
 	rm -f ext/phar/phar.phar ext/phar/phar.php
+	rm -f ext/opcache/jit/zend_jit_x86.c
+	rm -f ext/opcache/jit/zend_jit_arm64.c
 	if test "$(srcdir)" != "$(builddir)"; then \
 	  rm -f ext/phar/phar/phar.inc; \
 	fi

ext/opcache/config.m4

@@ -29,7 +29,7 @@ if test "$PHP_OPCACHE" != "no"; then
 
   if test "$PHP_OPCACHE_JIT" = "yes"; then
     case $host_cpu in
-      i[[34567]]86*|x86*)
+      i[[34567]]86*|x86*|aarch64)
         ;;
       *)
         AC_MSG_WARN([JIT not supported by host architecture])
@@ -58,6 +58,10 @@ if test "$PHP_OPCACHE" != "no"; then
       x86*)
         DASM_ARCH="x86"
         ;;
+      arm*-*-darwin*)
+        DASM_FLAGS="-D ARM64APPLE=1 -D ARM64=1"
+        DASM_ARCH="arm64"
+        ;;
       aarch64*)
         DASM_FLAGS="-D ARM64=1"
         DASM_ARCH="arm64"
@@ -77,6 +81,7 @@ if test "$PHP_OPCACHE" != "no"; then
     fi
 
     PHP_SUBST(DASM_FLAGS)
+    PHP_SUBST(DASM_ARCH)
 
     AC_MSG_CHECKING(for opagent in default path)
     for i in /usr/local /usr; do

ext/opcache/config.w32

@@ -25,6 +25,7 @@ if (PHP_OPCACHE != "no") {
 				dasm_flags += " -D ZTS=1";
 			}
 			DEFINE("DASM_FLAGS", dasm_flags);
+			DEFINE("DASM_ARCH", "x86");
 
 			AC_DEFINE('HAVE_JIT', 1, 'Define to enable JIT');
 			/* XXX read this dynamically */

ext/opcache/jit/Makefile.frag

@@ -2,11 +2,11 @@
 $(builddir)/minilua: $(srcdir)/jit/dynasm/minilua.c
 	$(BUILD_CC) $(srcdir)/jit/dynasm/minilua.c -lm -o $@
 
-$(builddir)/jit/zend_jit_x86.c: $(srcdir)/jit/zend_jit_x86.dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
-	$(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua  $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_x86.dasc
+$(builddir)/jit/zend_jit_$(DASM_ARCH).c: $(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc $(srcdir)/jit/dynasm/*.lua $(builddir)/minilua
+	$(builddir)/minilua $(srcdir)/jit/dynasm/dynasm.lua  $(DASM_FLAGS) -o $@ $(srcdir)/jit/zend_jit_$(DASM_ARCH).dasc
 
 $(builddir)/jit/zend_jit.lo: \
-	$(builddir)/jit/zend_jit_x86.c \
+	$(builddir)/jit/zend_jit_$(DASM_ARCH).c \
 	$(srcdir)/jit/zend_jit_helpers.c \
 	$(srcdir)/jit/zend_jit_disasm.c \
 	$(srcdir)/jit/zend_jit_gdb.c \

ext/opcache/jit/dynasm/dasm_arm64.h

@@ -19,10 +19,10 @@
 enum {
   DASM_STOP, DASM_SECTION, DASM_ESC, DASM_REL_EXT,
   /* The following actions need a buffer position. */
-  DASM_ALIGN, DASM_REL_LG, DASM_LABEL_LG,
+  DASM_ALIGN, DASM_REL_LG, DASM_LABEL_LG, DASM_ADDR_LG,
   /* The following actions also have an argument. */
-  DASM_REL_PC, DASM_LABEL_PC,
-  DASM_IMM, DASM_IMM6, DASM_IMM12, DASM_IMM13W, DASM_IMM13X, DASM_IMML,
+  DASM_REL_PC, DASM_LABEL_PC, DASM_ADDR_PC, DASM_REL_A,
+  DASM_IMM, DASM_IMM6, DASM_IMM12, DASM_IMM13W, DASM_IMM13X, DASM_IMML, DASM_IMM_PC,
   DASM_VREG,
   DASM__MAX
 };
@@ -251,14 +251,14 @@ void dasm_put(Dst_DECL, int start, ...)
       case DASM_ESC: p++; ofs += 4; break;
       case DASM_REL_EXT: break;
       case DASM_ALIGN: ofs += (ins & 255); b[pos++] = ofs; break;
-      case DASM_REL_LG:
+      case DASM_REL_LG: case DASM_ADDR_LG:
 	n = (ins & 2047) - 10; pl = D->lglabels + n;
 	/* Bkwd rel or global. */
 	if (n >= 0) { CK(n>=10||*pl<0, RANGE_LG); CKPL(lg, LG); goto putrel; }
 	pl += 10; n = *pl;
 	if (n < 0) n = 0;  /* Start new chain for fwd rel if label exists. */
 	goto linkrel;
-      case DASM_REL_PC:
+      case DASM_REL_PC: case DASM_ADDR_PC:
 	pl = D->pclabels + n; CKPL(pc, PC);
       putrel:
 	n = *pl;
@@ -312,6 +312,13 @@ void dasm_put(Dst_DECL, int start, ...)
 	b[pos++] = m;
 	break;
 	}
+      case DASM_REL_A:
+      case DASM_IMM_PC: {
+	int m = va_arg(ap, int);
+	b[pos++] = n;
+	b[pos++] = m;
+	break;
+	}
       case DASM_IMML: {
 #ifdef DASM_CHECKS
 	int scale = (ins & 3);
@@ -378,11 +385,11 @@ int dasm_link(Dst_DECL, size_t *szp)
 	case DASM_ESC: p++; break;
 	case DASM_REL_EXT: break;
 	case DASM_ALIGN: ofs -= (b[pos++] + ofs) & (ins & 255); break;
-	case DASM_REL_LG: case DASM_REL_PC: pos++; break;
+	case DASM_REL_LG: case DASM_ADDR_LG: case DASM_REL_PC: case DASM_ADDR_PC: pos++; break;
 	case DASM_LABEL_LG: case DASM_LABEL_PC: b[pos++] += ofs; break;
 	case DASM_IMM: case DASM_IMM6: case DASM_IMM12: case DASM_IMM13W:
 	case DASM_IMML: case DASM_VREG: pos++; break;
-	case DASM_IMM13X: pos += 2; break;
+	case DASM_IMM13X: case DASM_REL_A: case DASM_IMM_PC: pos += 2; break;
 	}
       }
       stop: (void)0;
@@ -421,6 +428,7 @@ int dasm_encode(Dst_DECL, void *buffer)
       while (1) {
 	unsigned int ins = *p++;
 	unsigned int action = (ins >> 16);
+	unsigned long long addr = 0;
 	int n = (action >= DASM_ALIGN && action < DASM__MAX) ? *b++ : 0;
 	switch (action) {
 	case DASM_STOP: case DASM_SECTION: goto stop;
@@ -431,6 +439,11 @@ int dasm_encode(Dst_DECL, void *buffer)
 	case DASM_ALIGN:
 	  ins &= 255; while ((((char *)cp - base) & ins)) *cp++ = 0xe1a00000;
 	  break;
+	case DASM_REL_A:
+      addr = (((unsigned long long)(*b++)) << 32) | (unsigned int)n;
+      CK((((addr - (ptrdiff_t)(cp+4)) + 0x08000000) >> 28) == 0, RANGE_REL);
+      n = (unsigned int)(addr - (ptrdiff_t)cp + 4);
+      goto patchrel;
 	case DASM_REL_LG:
 	  if (n < 0) {
 	    n = (int)((ptrdiff_t)D->globals[-n] - (ptrdiff_t)cp + 4);
@@ -461,6 +474,17 @@ int dasm_encode(Dst_DECL, void *buffer)
 	  ins &= 2047; if (ins >= 20) D->globals[ins-10] = (void *)(base + n);
 	  break;
 	case DASM_LABEL_PC: break;
+	case DASM_ADDR_LG:
+	  if (n < 0) {
+	    addr = (unsigned long long)D->globals[-n];
+	    goto patchaddr;
+	  }
+	case DASM_ADDR_PC:
+	  addr = (unsigned long long)(*DASM_POS2PTR(D, n) + base);
+	patchaddr:
+	  cp[-2] = (unsigned int)(addr);
+	  cp[-1] = (unsigned int)(addr >> 32);
+	  break;
 	case DASM_IMM:
 	  cp[-1] |= (n & ((1<<((ins>>5)&31))-1)) << (ins&31);
 	  break;
@@ -473,6 +497,10 @@ int dasm_encode(Dst_DECL, void *buffer)
 	case DASM_IMM13W:
 	  cp[-1] |= (dasm_imm13(n, n) << 10);
 	  break;
+	case DASM_IMM_PC:
+	  cp[-2] = (unsigned int)(n);
+	  cp[-1] = (unsigned int)(*b++);
+	  break;
 	case DASM_IMM13X:
 	  cp[-1] |= (dasm_imm13(n, *b++) << 10);
 	  break;

ext/opcache/jit/dynasm/dasm_arm64.lua

@@ -38,8 +38,8 @@ local wline, werror, wfatal, wwarn
 -- CHECK: Keep this in sync with the C code!
 local action_names = {
   "STOP", "SECTION", "ESC", "REL_EXT",
-  "ALIGN", "REL_LG", "LABEL_LG",
-  "REL_PC", "LABEL_PC", "IMM", "IMM6", "IMM12", "IMM13W", "IMM13X", "IMML",
+  "ALIGN", "REL_LG", "LABEL_LG", "ADDR_LG",
+  "REL_PC", "LABEL_PC", "ADDR_PC", "REL_A", "IMM", "IMM6", "IMM12", "IMM13W", "IMM13X", "IMML", "IMM_PC",
   "VREG",
 }
 
@@ -943,10 +943,17 @@ local function parse_template(params, template, nparams, pos)
       op = parse_load_pair(params, nparams, n, op)
 
     elseif p == "B" then
-      local mode, v, s = parse_label(q, false); n = n + 1
-      local m = branch_type(op)
-      waction("REL_"..mode, v+m, s, 1)
-
+      -- &expr (pointer)
+      if sub(q, 1, 1) == "&" then
+        local a = sub(q,2); n = n + 1
+        local m = branch_type(op)
+        waction("REL_A", m, format("(unsigned int)(unsigned long long)(%s)", a))
+        actargs[#actargs+1] = format("(unsigned int)((unsigned long long)(%s)>>32)", a)
+      else
+        local mode, v, s = parse_label(q, false); n = n + 1
+        local m = branch_type(op)
+        waction("REL_"..mode, v+m, s, 1)
+      end
     elseif p == "I" then
       op = op + parse_imm12(q); n = n + 1
     elseif p == "i" then
@@ -1068,6 +1075,26 @@ map_op[".long_*"] = function(params)
   end
 end
 
+-- Pseudo-opcodes for jump table entry.
+map_op[".addr_1"] = function(params)
+  if not params then return "&addr | >label | <label | ->label | =>label" end
+  if secpos+1 > maxsecpos then wflush() end
+  local prefix = sub(params[1], 1, 1)
+  if prefix == "&" then
+    wputw(0)
+    wputw(0)
+    local imm = match(params[1], "^&(.*)$")
+    waction("IMM_PC", 0, format("(unsigned int)(unsigned long long)(%s)", imm))
+    actargs[#actargs+1] = format("(unsigned int)((unsigned long long)(%s)>>32)", imm)
+  else
+    local mode, n, s = parse_label(params[1], false)
+    if mode == "EXT" then werror("not support extern label reference") end
+    wputw(0)
+    wputw(0)
+    waction("ADDR_"..mode, n, s, 1)
+  end
+end
+
 -- Alignment pseudo-opcode.
 map_op[".align_1"] = function(params)
   if not params then return "numpow2" end

ext/opcache/jit/zend_jit.c

@@ -39,7 +39,14 @@
 #include "Optimizer/zend_call_graph.h"
 #include "Optimizer/zend_dump.h"
 
+#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
 #include "jit/zend_jit_x86.h"
+#elif defined (__aarch64__)
+#include "jit/zend_jit_arm64.h"
+#else
+#error "JIT not supported on this platform"
+#endif
+
 #include "jit/zend_jit_internal.h"
 
 #ifdef ZTS
@@ -188,11 +195,6 @@ static bool zend_is_commutative(zend_uchar opcode)
 		opcode == ZEND_BW_XOR;
 }
 
-static bool zend_long_is_power_of_two(zend_long x)
-{
-	return (x > 0) && !(x & (x - 1));
-}
-
 #define OP_RANGE(ssa_op, opN) \
 	(((opline->opN##_type & (IS_TMP_VAR|IS_VAR|IS_CV)) && \
 	  ssa->var_info && \
@@ -204,19 +206,30 @@ static bool zend_long_is_power_of_two(zend_long x)
 #define OP2_RANGE()      OP_RANGE(ssa_op, op2)
 #define OP1_DATA_RANGE() OP_RANGE(ssa_op + 1, op1)
 
+#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
 #include "dynasm/dasm_x86.h"
+#elif defined(__aarch64__)
+#include "dynasm/dasm_arm64.h"
+#endif
+
 #include "jit/zend_jit_helpers.c"
 #include "jit/zend_jit_disasm.c"
 #ifndef _WIN32
-#include "jit/zend_jit_gdb.c"
+#if defined(__x86_64__) || defined(i386)
+# include "jit/zend_jit_gdb.c"
+#endif
 #include "jit/zend_jit_perf_dump.c"
 #endif
 #ifdef HAVE_OPROFILE
 # include "jit/zend_jit_oprofile.c"
 #endif
-#include "jit/zend_jit_vtune.c"
 
+#if defined(__x86_64__) || defined(i386) || defined(ZEND_WIN32)
+#include "jit/zend_jit_vtune.c"
 #include "jit/zend_jit_x86.c"
+#elif defined(__aarch64__)
+#include "jit/zend_jit_arm64.c"
+#endif
 
 #if _WIN32
 # include <Windows.h>
@@ -298,15 +311,32 @@ static void handle_dasm_error(int ret) {
 		case DASM_S_RANGE_PC:
 			fprintf(stderr, "DASM_S_RANGE_PC %d\n", ret & 0xffffffu);
 			break;
+#ifdef DASM_S_RANGE_VREG
 		case DASM_S_RANGE_VREG:
 			fprintf(stderr, "DASM_S_RANGE_VREG\n");
 			break;
+#endif
+#ifdef DASM_S_UNDEF_L
 		case DASM_S_UNDEF_L:
 			fprintf(stderr, "DASM_S_UNDEF_L\n");
 			break;
+#endif
+#ifdef DASM_S_UNDEF_LG
+		case DASM_S_UNDEF_LG:
+			fprintf(stderr, "DASM_S_UNDEF_LG\n");
+			break;
+#endif
+#ifdef DASM_S_RANGE_REL
+		case DASM_S_RANGE_REL:
+			fprintf(stderr, "DASM_S_RANGE_REL\n");
+			break;
+#endif
 		case DASM_S_UNDEF_PC:
 			fprintf(stderr, "DASM_S_UNDEF_PC\n");
 			break;
+		default:
+			fprintf(stderr, "DASM_S_%0x\n", ret & 0xff000000u);
+			break;
 	}
 	ZEND_UNREACHABLE();
 }
@@ -391,6 +421,9 @@ static void *dasm_link_and_encode(dasm_State             **dasm_state,
 	entry = *dasm_ptr;
 	*dasm_ptr = (void*)((char*)*dasm_ptr + ZEND_MM_ALIGNED_SIZE_EX(size, DASM_ALIGNMENT));
 
+	/* flush the hardware I-cache */
+	JIT_CACHE_FLUSH(entry, entry + size);
+
 	if (trace_num) {
 		zend_jit_trace_add_code(entry, size);
 	}