ZEND_VM_ENTER_BIT

Author: arnaud-lb

Zend/zend_portability.h

@@ -870,4 +870,8 @@ static zend_always_inline uint64_t ZEND_BYTES_SWAP64(uint64_t u)
 # define ZEND_OPCACHE_SHM_REATTACHMENT 1
 #endif
 
+#ifndef UINTPTR_WIDTH
+# define UINTPTR_WIDTH (CHAR_BITS * sizeof(uintptr_t))
+#endif
+
 #endif /* ZEND_PORTABILITY_H */

Zend/zend_vm_gen.php

@@ -1944,9 +1944,10 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
                             out($f,"# define ZEND_VM_ENTER()           opline = EG(current_execute_data)->opline; ZEND_VM_ENTER_EX()\n");
                             out($f,"# define ZEND_VM_LEAVE()           return  2\n");
                             out($f,"#else\n");
-                            out($f,"# define ZEND_VM_ENTER_EX()        return (zend_op*)((uintptr_t)opline | (1ULL<<63))\n");
+                            out($f,"# define ZEND_VM_ENTER_BIT         (1ULL<<(UINTPTR_WIDTH-1))\n");
+                            out($f,"# define ZEND_VM_ENTER_EX()        return (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT)\n");
                             out($f,"# define ZEND_VM_ENTER()           execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_ENTER_EX()\n");
-                            out($f,"# define ZEND_VM_LEAVE()           return (zend_op*)((uintptr_t)opline | (1ULL<<63))\n");
+                            out($f,"# define ZEND_VM_LEAVE()           return (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT)\n");
                             out($f,"#endif\n");
                             out($f,"#define ZEND_VM_INTERRUPT()      ZEND_VM_TAIL_CALL(zend_interrupt_helper".($spec?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));\n");
                             out($f,"#define ZEND_VM_LOOP_INTERRUPT() zend_interrupt_helper".($spec?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
@@ -2175,8 +2176,8 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
                                 "# endif\n" .
                                 $m[1]."return;\n" .
                                 "#else\n" .
-                                $m[1]."if (EXPECTED(opline != NULL && (uintptr_t)opline != (1ULL<<63))) {\n" .
-                                $m[1]."\topline = (zend_op*)((uintptr_t)opline & ~(1ULL<<63));\n".
+                                $m[1]."if (EXPECTED(opline != NULL && (uintptr_t)opline != ZEND_VM_ENTER_BIT)) {\n" .
+                                $m[1]."\topline = (zend_op*)((uintptr_t)opline & ~ZEND_VM_ENTER_BIT);\n".
                                 $m[1]."\texecute_data = EG(current_execute_data);\n".
                                 $m[1]."\tZEND_VM_LOOP_INTERRUPT_CHECK();\n".
                                 $m[1]."} else {\n" .

ext/opcache/jit/zend_jit_internal.h

@@ -200,6 +200,7 @@ extern const zend_op *zend_jit_halt_op;
 		handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC arg); \
 		return; \
 	} while(0)
+# define ZEND_VM_ENTER_BIT 0
 #else
 # define EXECUTE_DATA_D                       zend_execute_data* execute_data
 # define EXECUTE_DATA_C                       execute_data
@@ -221,6 +222,7 @@ extern const zend_op *zend_jit_halt_op;
 # define ZEND_OPCODE_TAIL_CALL_EX(handler, arg) do { \
 		return handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC arg); \
 	} while(0)
+# define ZEND_VM_ENTER_BIT (1ULL<<(UINTPTR_WIDTH-1))
 #endif
 
 /* VM handlers */

ext/opcache/jit/zend_jit_ir.c

@@ -1887,13 +1887,13 @@ static void zend_jit_check_timeout(zend_jit_ctx *jit, const zend_op *opline, con
 static void zend_jit_vm_enter(zend_jit_ctx *jit, ir_ref to_opline)
 {
 	// ZEND_VM_ENTER()
-	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR((uintptr_t)1ULL<<63)));
+	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR(ZEND_VM_ENTER_BIT)));
 }
 
 static void zend_jit_vm_leave(zend_jit_ctx *jit, ir_ref to_opline)
 {
 	// ZEND_VM_LEAVE()
-	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR((uintptr_t)1ULL<<63)));
+	ir_RETURN(ir_OR_A(to_opline, ir_CONST_ADDR(ZEND_VM_ENTER_BIT)));
 }
 
 /* stubs */
@@ -17043,7 +17043,7 @@ static int zend_jit_trace_handler(zend_jit_ctx *jit, const zend_op_array *op_arr
 		    opline->opcode == ZEND_RETURN_BY_REF ||
 		    opline->opcode == ZEND_GENERATOR_CREATE) {
 			// TODO: what other ops need this?
-			ref = ir_AND_A(ref, ir_CONST_ADDR(~(1ULL<<63)));
+			ref = ir_AND_A(ref, ir_CONST_ADDR(~ZEND_VM_ENTER_BIT));
 		}
 		jit_LOAD_IP(jit, ref);
 	}

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -75,14 +75,14 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_leave_nested_func_helper(ZEND_OPC
 			zval_ptr_dtor(EX_VAR(old_opline->result.var));
 		}
 #ifndef HAVE_GCC_GLOBAL_REGS
-		return (zend_op*)((uintptr_t)EG(current_execute_data)->opline | (1ULL<<63));
+		return (zend_op*)((uintptr_t)EG(current_execute_data)->opline | ZEND_VM_ENTER_BIT);
 #endif
 	} else {
 		EX(opline)++;
 #ifdef HAVE_GCC_GLOBAL_REGS
 		opline = EX(opline);
 #else
-		return (zend_op*)((uintptr_t)EX(opline) | (1ULL<<63));
+		return (zend_op*)((uintptr_t)EX(opline) | ZEND_VM_ENTER_BIT);
 #endif
 	}
 }
@@ -372,7 +372,7 @@ static zend_always_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_trace_c
 #ifdef HAVE_GCC_GLOBAL_REGS
 		return;
 #else
-		return opline ? (zend_op*)((uintptr_t)opline | (1ULL<<63)) : NULL; // ZEND_VM_ENTER() : ZEND_VM_RETURN()
+		return opline ? (zend_op*)((uintptr_t)opline | ZEND_VM_ENTER_BIT) : NULL; // ZEND_VM_ENTER() : ZEND_VM_RETURN()
 #endif
 	} else {
 		zend_vm_opcode_handler_t handler = (zend_vm_opcode_handler_t)ZEND_OP_TRACE_INFO(opline, offset)->orig_handler;
@@ -952,7 +952,7 @@ zend_jit_trace_stop ZEND_FASTCALL zend_jit_trace_execute(zend_execute_data  *ex,
 				/* return after interrupt handler */
 				ZEND_ASSERT(0 && "TODO");
 			}
-			opline = (zend_op*)((uintptr_t)opline & ~(1ULL<<63));
+			opline = (zend_op*)((uintptr_t)opline & ~ZEND_VM_ENTER_BIT);
 			execute_data = EG(current_execute_data);
 #endif