Merge pull request #4835 from rainers/rainer_winonarm

run on and build for Windows on ARM64

Author: kinke

CHANGELOG.md

@@ -9,6 +9,7 @@
 #### Platform support
 - Supports LLVM 15 - 19.
 - Initial compiler and runtime support for ppc64 and ppc64le systems that use IEEE 754R 128-bit floating-point as the default 128-bit floating-point format. (#4833)
+- Added support for building for Windows on ARM64. Use option '-march=arm64' to compile, 'ldc-build-runtime.exe --dFlags -march=arm64' to build the runtime libraries. (#4835)
 
 #### Bug fixes
 - Building multi-file D applications with control-flow protection will no longer cause LDC to throw an internal compiler error. (#4828)

dmd/root/longdouble.d

@@ -338,9 +338,20 @@ void ld_setll(longdouble_soft* pthis, long d)
 
 void ld_setull(longdouble_soft* pthis, ulong d)
 {
-    d ^= (1L << 63);
     version(AsmX86)
     {
+        // emulator accuracy not good enough when running on Windows on ARM,
+        // so avoid chopping off small numbers
+        if (!(d & (1L << 63)))
+        {
+            asm nothrow @nogc pure @trusted
+            {
+                fild qword ptr d;
+            }
+            mixin(fstp_parg!("pthis"));
+            return;
+        }
+        d ^= (1L << 63);
         auto pTwoPow63 = &twoPow63;
         mixin(fld_parg!("pTwoPow63"));
         asm nothrow @nogc pure @trusted

gen/abi/aarch64.cpp

@@ -32,8 +32,13 @@ struct AArch64TargetABI : TargetABI {
   IndirectByvalRewrite indirectByvalRewrite;
   ArgTypesRewrite argTypesRewrite;
 
+  bool hasAAPCS64VaList() {
+    return !isDarwin() &&
+           !global.params.targetTriple->isWindowsMSVCEnvironment();
+  }
+
   bool isAAPCS64VaList(Type *t) {
-    if (isDarwin())
+    if (!hasAAPCS64VaList())
       return false;
 
     // look for a __va_list struct in a `std` C++ namespace
@@ -152,7 +157,7 @@ struct AArch64TargetABI : TargetABI {
   }
 
   Type *vaListType() override {
-    if (isDarwin())
+    if (!hasAAPCS64VaList())
       return TargetABI::vaListType(); // char*
 
     // We need to pass the actual va_list type for correct mangling. Simply

gen/target.cpp

@@ -77,9 +77,9 @@ llvm::Type *getRealType(const llvm::Triple &triple) {
 
   case Triple::aarch64:
   case Triple::aarch64_be:
-    // AArch64 has 128-bit quad precision; Apple uses double
-    return triple.isOSDarwin() ? LLType::getDoubleTy(ctx)
-                               : LLType::getFP128Ty(ctx);
+    // AArch64 has 128-bit quad precision; Apple and MSVC use double
+    return triple.isOSDarwin() || triple.isWindowsMSVCEnvironment()
+               ? LLType::getDoubleTy(ctx) : LLType::getFP128Ty(ctx);
 
   case Triple::riscv32:
   case Triple::riscv64:

runtime/druntime/src/__importc_builtins.di

@@ -39,11 +39,12 @@ version (LDC)
     }
     else version (ARM_Any)
     {
-        // Darwin does not use __va_list
+        // Darwin and Windows do not use __va_list
         version (OSX) {}
         else version (iOS) {}
         else version (TVOS) {}
         else version (WatchOS) {}
+        else version (CRuntime_Microsoft) {}
         else:
 
         version (ARM)

runtime/druntime/src/core/internal/vararg/aarch64.d

@@ -14,11 +14,12 @@ module core.internal.vararg.aarch64;
 
 version (AArch64):
 
-// Darwin uses a simpler varargs implementation
+// Darwin and Windows use a simpler varargs implementation
 version (OSX) {}
 else version (iOS) {}
 else version (TVOS) {}
 else version (WatchOS) {}
+else version (CRuntime_Microsoft) {}
 else:
 
 import core.stdc.stdarg : alignUp;

runtime/druntime/src/core/stdc/math.d

@@ -482,7 +482,7 @@ version (CRuntime_Microsoft) // fully supported since MSVCRT 12 (VS 2013) only
         else // for backward compatibility with older runtimes
         {
             ///
-            pure int isnan(float x)      { version (Win64) return _isnanf(x); else return _isnan(cast(double) x); }
+            pure int isnan(float x)      { version (X86_64) return _isnanf(x); else return _isnan(cast(double) x); }
             ///
             extern(C) pragma(mangle, "_isnan") pure int isnan(double x);
             ///

runtime/druntime/src/core/stdc/stdarg.d

@@ -55,11 +55,12 @@ version (GNU)
 }
 else version (ARM_Any)
 {
-    // Darwin uses a simpler varargs implementation
+    // Darwin and Windows use a simpler varargs implementation
     version (OSX) {}
     else version (iOS) {}
     else version (TVOS) {}
     else version (WatchOS) {}
+    else version (CRuntime_Microsoft) {}
     else:
 
     version (ARM)

runtime/druntime/src/core/sys/windows/dll.d

@@ -402,7 +402,7 @@ private bool isWindows8OrLater() nothrow @nogc
 int dll_getRefCount( HINSTANCE hInstance ) nothrow @nogc
 {
     void** peb;
-    version (Win64)
+    version (X86_64)
     {
         asm pure nothrow @nogc
         {
@@ -411,14 +411,18 @@ int dll_getRefCount( HINSTANCE hInstance ) nothrow @nogc
             mov peb, RAX;
         }
     }
-    else version (Win32)
+    else version (X86)
     {
         asm pure nothrow @nogc
         {
             mov EAX,FS:[0x30];
             mov peb, EAX;
         }
     }
+    else version (AArch64)
+    {
+        asm nothrow @nogc { "ldr %0, [x18,%1]" : "=r" (peb) : "r" (0x30); }
+    }
     dll_aux.LDR_MODULE *ldrMod = dll_aux.findLdrModule( hInstance, peb );
     if ( !ldrMod )
         return -2; // not in module list, bail out

runtime/druntime/src/core/sys/windows/stacktrace.d

@@ -230,6 +230,7 @@ private:
 
         version (X86)         enum imageType = IMAGE_FILE_MACHINE_I386;
         else version (X86_64) enum imageType = IMAGE_FILE_MACHINE_AMD64;
+        else version (AArch64) enum imageType = IMAGE_FILE_MACHINE_ARM64;
         else                  static assert(0, "unimplemented");
 
         size_t frameNum = 0;