Changeset 106430 in vbox

Timestamp:

Oct 17, 2024 11:13:31 AM (7 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

165249

Message:

include/iprt/asm-arm.h: Make it build on win.arm64, bugref:10392

File:

• trunk/include/iprt/asm-arm.h (modified) (10 diffs)

trunk/include/iprt/asm-arm.h

@@ -43 +43 @@
 #if !defined(RT_ARCH_ARM64) && !defined(RT_ARCH_ARM32)
 # error "Not on ARM64 or ARM32"
+#endif
+
+#if defined(_MSC_VER) && RT_INLINE_ASM_USES_INTRIN
+/* Emit the intrinsics at all optimization levels. */
+# include <iprt/sanitized/intrin.h>
+# pragma intrinsic(_ReadStatusReg)
+# pragma intrinsic(_WriteStatusReg)
+# pragma intrinsic(_disable)
+# pragma intrinsic(_enable)
+# pragma intrinsic(__hvc)
+
+/*
+ * MSVC insists on having these defined using ARM64_SYSREG or it will
+ * fail to compile with "error C2284: "_ReadStatusReg": invalid argument for internal function, parameter 1"
+ * if we use our own definitions from iprt/armv8.h
+ */
+# define ARM64_SYSREG_DAIF       ARM64_SYSREG(3, 3,  4, 2, 1)
+# define ARM64_SYSREG_CNTFRQ_EL0 ARM64_SYSREG(3, 3, 14, 0, 0)
+# define ARM64_SYSREG_CNTCVT_EL0 ARM64_SYSREG(3, 3, 14, 0, 2)
 #endif
 
@@ -85 +104 @@
     return u64;
 
+#elif RT_INLINE_ASM_USES_INTRIN
+    return (uint64_t)_ReadStatusReg(ARM64_SYSREG_CNTCVT_EL0);
 # else
 #  error "Unsupported compiler"
@@ -118 +139 @@
     return u64;
 
+#elif RT_INLINE_ASM_USES_INTRIN
+    return (uint64_t)_ReadStatusReg(ARM64_SYSREG_CNTFRQ_EL0);
 # else
 #  error "Unsupported compiler"
@@ -145 +168 @@
                          : "=r" (uFlags));
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN
+    _enable();
 # else
 #  error "Unsupported compiler"
@@ -172 +197 @@
                          : "=r" (uFlags));
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN
+    _disable();
 # else
 #  error "Unsupported compiler"
@@ -203 +230 @@
                          , "=r" (uNewFlags));
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN
+    uFlags = _ReadStatusReg(ARM64_SYSREG_DAIF);
+    _disable();
 # else
 #  error "Unsupported compiler"
@@ -208 +238 @@
     return uFlags;
 }
+#endif
 
 
@@ -229 +260 @@
 #   error "Implementation required for arm32"
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN
+    uFlags = _ReadStatusReg(ARM64_SYSREG_DAIF);
 # else
 #  error "Unsupported compiler"
@@ -254 +287 @@
 #   error "Implementation required for arm32"
 #  endif
+# elif RT_INLINE_ASM_USES_INTRIN
+    _WriteStatusReg(ARM64_SYSREG_DAIF, uFlags);
 # else
 #  error "Unsupported compiler"
@@ -271 +306 @@
 }
 
-#endif
+
+#if 0 /* Later */
+/**
+ * Issue HVC call with a single argument.
+ */
+#if RT_INLINE_ASM_EXTERNAL
+DECLASM(void) ASMHvc(uint16_t u16Imm, uint32_t u32Arg0);
+#else
+DECLINLINE(void) ASMHvc(uint16_t u16Imm, uint32_t u32Arg0)
+{
+# if RT_INLINE_ASM_GNU_STYLE
+#  error "Later"
+# elif RT_INLINE_ASM_USES_INTRIN
+    __hvc(u16Imm, u32Val);
+# else
+#  error "Unsupported compiler"
+# endif
+}
+#endif
+#endif
+
 
 /**
  * Halts the CPU until interrupted.
  */
-#if RT_INLINE_ASM_EXTERNAL
+#if RT_INLINE_ASM_EXTERNAL || defined(_MSC_VER)
 DECLASM(void) ASMHalt(void);
 #else