update this to only happen on windows

Author: henderkes

Zend/zend_vm_gen.php

@@ -2499,7 +2499,7 @@ function gen_vm_opcodes_header(
         $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_HYBRID\n";
     }
     if ($GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_HYBRID" || $GLOBALS["vm_kind_name"][ZEND_VM_GEN_KIND] === "ZEND_VM_KIND_CALL") {
-        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(__aarch64__))\n";
+        $str .= "#elif defined(HAVE_MUSTTAIL) && defined(HAVE_PRESERVE_NONE) && (defined(__x86_64__) || defined(_M_X64) || defined(__aarch64__) || defined(_M_ARM64))\n";
         $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_TAILCALL\n";
         $str .= "#else\n";
         $str .= "# define ZEND_VM_KIND\t\tZEND_VM_KIND_CALL\n";
@@ -2515,15 +2515,22 @@ function gen_vm_opcodes_header(
     $str .= "# endif\n";
     $str .= "#endif\n";
     $str .= "\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_FUNC_CCONV    ZEND_FASTCALL\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_FUNC_CCONV_EX ZEND_FASTCALL\n";
     $str .= "#if ZEND_VM_KIND == ZEND_VM_KIND_TAILCALL\n";
-    $str .= "# define ZEND_OPCODE_HANDLER_CCONV    ZEND_PRESERVE_NONE\n";
-    $str .= "# define ZEND_OPCODE_HANDLER_CCONV_EX ZEND_FASTCALL\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_CCONV         ZEND_PRESERVE_NONE\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_CCONV_EX      ZEND_FASTCALL\n";
+    $str .= "#elif ZEND_VM_KIND == ZEND_VM_KIND_CALL && defined(HAVE_PRESERVE_NONE) && defined(_WIN32)\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_CCONV         ZEND_PRESERVE_NONE\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_CCONV_EX      ZEND_FASTCALL\n";
+    $str .= "# undef ZEND_OPCODE_HANDLER_FUNC_CCONV\n";
+    $str .= "# undef ZEND_OPCODE_HANDLER_FUNC_CCONV_EX\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_FUNC_CCONV    ZEND_PRESERVE_NONE\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_FUNC_CCONV_EX ZEND_FASTCALL\n";
     $str .= "#elif ZEND_VM_KIND == ZEND_VM_KIND_CALL\n";
-    $str .= "# define ZEND_OPCODE_HANDLER_CCONV    ZEND_FASTCALL\n";
-    $str .= "# define ZEND_OPCODE_HANDLER_CCONV_EX ZEND_FASTCALL\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_CCONV         ZEND_FASTCALL\n";
+    $str .= "# define ZEND_OPCODE_HANDLER_CCONV_EX      ZEND_FASTCALL\n";
     $str .= "#endif\n";
-    $str .= "#define ZEND_OPCODE_HANDLER_FUNC_CCONV    ZEND_FASTCALL\n";
-    $str .= "#define ZEND_OPCODE_HANDLER_FUNC_CCONV_EX ZEND_FASTCALL\n";
     $str .= "\n";
     $str .= "#if ZEND_VM_KIND == ZEND_VM_KIND_HYBRID\n";
     $str .= "typedef const void* zend_vm_opcode_handler_t;\n";