Reserve platform-reserved register on Windows AArch64

Author: teshull

sdk/src/org.graalvm.nativeimage/snapshot.sigtest

@@ -226,6 +226,7 @@ innr public final static IOS_AARCH64
 innr public final static IOS_AMD64
 innr public final static LINUX_AARCH64
 innr public final static WINDOWS_AMD64
+innr public final static WINDOWS_AARCH64
 innr public static LINUX_AMD64
 meth public java.lang.String getArchitecture()
 meth public java.lang.String getOS()
@@ -327,6 +328,13 @@ intf org.graalvm.nativeimage.Platform$AMD64
 intf org.graalvm.nativeimage.Platform$WINDOWS
 supr java.lang.Object
 
+CLSS public final static org.graalvm.nativeimage.Platform$WINDOWS_AARCH64
+ outer org.graalvm.nativeimage.Platform
+cons public init()
+intf org.graalvm.nativeimage.Platform$AARCH64
+intf org.graalvm.nativeimage.Platform$WINDOWS
+supr java.lang.Object
+
 CLSS public abstract interface !annotation org.graalvm.nativeimage.Platforms
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, CONSTRUCTOR, FIELD, PACKAGE])

sdk/src/org.graalvm.nativeimage/src/META-INF/services/org.graalvm.nativeimage.Platform

@@ -6,3 +6,4 @@ org.graalvm.nativeimage.Platform$DARWIN_AARCH64
 org.graalvm.nativeimage.Platform$IOS_AMD64
 org.graalvm.nativeimage.Platform$IOS_AARCH64
 org.graalvm.nativeimage.Platform$WINDOWS_AMD64
+org.graalvm.nativeimage.Platform$WINDOWS_AARCH64

sdk/src/org.graalvm.nativeimage/src/org/graalvm/nativeimage/Platform.java

@@ -369,6 +369,23 @@ public WINDOWS_AMD64() {
 
     }
 
+    /**
+     * Supported leaf platform: Windows on AArch 64-bit.
+     *
+     * @since 22.0
+     */
+    final class WINDOWS_AARCH64 implements WINDOWS, AARCH64 {
+
+        /**
+         * Instantiates a marker instance of this platform.
+         *
+         * @since 22.0
+         */
+        public WINDOWS_AARCH64() {
+        }
+
+    }
+
     /**
      * Marker for elements (types, methods, or fields) that are only visible during native image
      * generation and cannot be used at run time, regardless of the actual platform.

substratevm/src/com.oracle.svm.core.graal.aarch64/src/com/oracle/svm/core/graal/aarch64/SubstrateAArch64RegisterConfig.java

@@ -101,7 +101,7 @@ public class SubstrateAArch64RegisterConfig implements SubstrateRegisterConfig {
     private final TargetDescription target;
     private final int nativeParamsStackOffset;
     private final RegisterArray generalParameterRegs;
-    private final RegisterArray simdParameterRegs;
+    private final RegisterArray fpParameterRegs;
     private final RegisterArray allocatableRegs;
     private final RegisterArray calleeSaveRegisters;
     private final RegisterAttributes[] attributesMap;
@@ -114,9 +114,16 @@ public SubstrateAArch64RegisterConfig(ConfigKind config, MetaAccessProvider meta
         this.metaAccess = metaAccess;
         this.preserveFramePointer = preserveFramePointer;
 
-        // This is the Linux 64-bit ABI for parameters.
+        /*
+         * This is the Linux 64-bit ABI for parameters.
+         *
+         * Note the Darwin and Windows ABI are the same with the following exception:
+         *
+         * On Windows, when calling a method with variadic args, all fp parameters must be passed on
+         * the stack. Currently, this is unsupported. Adding support is tracked by GR-34188.
+         */
         generalParameterRegs = new RegisterArray(r0, r1, r2, r3, r4, r5, r6, r7);
-        simdParameterRegs = new RegisterArray(v0, v1, v2, v3, v4, v5, v6, v7);
+        fpParameterRegs = new RegisterArray(v0, v1, v2, v3, v4, v5, v6, v7);
 
         nativeParamsStackOffset = 0;
 
@@ -141,10 +148,13 @@ public SubstrateAArch64RegisterConfig(ConfigKind config, MetaAccessProvider meta
         regs.remove(ReservedRegisters.singleton().getHeapBaseRegister());
         regs.remove(ReservedRegisters.singleton().getThreadRegister());
         /*
-         * Darwin specifies that r18 is a platform-reserved register:
+         * Darwin and Windows specify that r18 is a platform-reserved register:
+         *
          * https://developer.apple.com/documentation/xcode/writing-arm64-code-for-apple-platforms
+         *
+         * https://docs.microsoft.com/en-us/cpp/build/arm64-windows-abi-conventions
          */
-        if (OS.getCurrent() == OS.DARWIN) {
+        if (OS.getCurrent() == OS.DARWIN || OS.getCurrent() == OS.WINDOWS) {
             regs.remove(r18);
         }
         allocatableRegs = new RegisterArray(regs);
@@ -229,7 +239,7 @@ public CallingConvention getCallingConvention(Type t, JavaType returnType, JavaT
         AllocatableValue[] locations = new AllocatableValue[parameterTypes.length];
 
         int currentGeneral = 0;
-        int currentSIMD = 0;
+        int currentFP = 0;
 
         /*
          * We have to reserve a slot between return address and outgoing parameters for the deopt
@@ -261,8 +271,8 @@ public CallingConvention getCallingConvention(Type t, JavaType returnType, JavaT
                         break;
                     case Float:
                     case Double:
-                        if (currentSIMD < simdParameterRegs.size()) {
-                            register = simdParameterRegs.get(currentSIMD++);
+                        if (currentFP < fpParameterRegs.size()) {
+                            register = fpParameterRegs.get(currentFP++);
                         }
                         break;
                     default: