Changeset 100193 in vbox for trunk/include

Timestamp:

Jun 16, 2023 8:13:55 AM (18 months ago)

Author:

vboxsync

Message:

include/iprt/asm-arm.h: Some ASM*() helpers for arm64, bugref:10457

File:

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

trunk/include/iprt/asm-arm.h

@@ -49 +49 @@
  * @{
  */
-
-
-#if 0 /* figure out arm64 */
-
-/**
- * Get the CPSR (Current Program Status) register.
- * @returns CPSR.
- */
-#if RT_INLINE_ASM_EXTERNAL
-DECLASM(RTCCUINTREG) ASMGetFlags(void);
-#else
-DECLINLINE(RTCCUINTREG) ASMGetFlags(void)
-{
-    RTCCUINTREG uFlags;
-# if RT_INLINE_ASM_GNU_STYLE
-#  ifdef RT_ARCH_ARM64
-    __asm__ __volatile__("mrs %0, nzcv\n\t"  : "=r" (uFlags));
-#  else
-    __asm__ __volatile__("mrs %0, cpsr\n\t"  : "=r" (uFlags));
-#  endif
-# else
-#  error "Unsupported compiler"
-# endif
-    return uFlags;
-}
-#endif
-
-
-/**
- * Set the CPSR register.
- * @param   uFlags      The new CPSR value.
- */
-#if RT_INLINE_ASM_EXTERNAL
-DECLASM(void) ASMSetFlags(RTCCUINTREG uFlags);
-#else
-DECLINLINE(void) ASMSetFlags(RTCCUINTREG uFlags)
-{
-# if RT_INLINE_ASM_GNU_STYLE
-    __asm__ __volatile__("msr cpsr_c, %0\n\t"
-                         : : "r" (uFlags));
-# else
-#  error "Unsupported compiler"
-# endif
-}
-#endif
-
-#endif
-
 
 /**
@@ -169 +121 @@
 
 
-#if 0 /* port to arm64, armv7 and check */
-
 /**
  * Enables interrupts (IRQ and FIQ).
@@ -179 +129 @@
 DECLINLINE(void) ASMIntEnable(void)
 {
+# if RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_ARM64
+    __asm__ __volatile__("msr daifclr, #0xf\n\t");
+#  else
     RTCCUINTREG uFlags;
-# if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__("mrs %0, cpsr\n\t"
                          "bic %0, %0, #0xc0\n\t"
                          "msr cpsr_c, %0\n\t"
                          : "=r" (uFlags));
+#  endif
 # else
 #  error "Unsupported compiler"
@@ -200 +154 @@
 DECLINLINE(void) ASMIntDisable(void)
 {
+# if RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_ARM64
+    __asm__ __volatile__("msr daifset, #0xf\n\t");
+#  else
     RTCCUINTREG uFlags;
-# if RT_INLINE_ASM_GNU_STYLE
     __asm__ __volatile__("mrs %0, cpsr\n\t"
                          "orr %0, %0, #0xc0\n\t"
                          "msr cpsr_c, %0\n\t"
                          : "=r" (uFlags));
+#  endif
 # else
 #  error "Unsupported compiler"
@@ -223 +181 @@
     RTCCUINTREG uFlags;
 # if RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_ARM64
+    __asm__ __volatile__("mrs %[uRet], daif\n\t"
+                         "msr daifset, #0xf\n\t"
+                         : [uRet] "=r" (uFlags));
+#  else
     RTCCUINTREG uNewFlags;
     __asm__ __volatile__("mrs %0, cpsr\n\t"
@@ -229 +192 @@
                          : "=r" (uFlags)
                          , "=r" (uNewFlags));
+#  endif
 # else
 #  error "Unsupported compiler"
@@ -234 +198 @@
     return uFlags;
 }
+
+
+/**
+ * Get the CPSR/PSTATE register.
+ * @returns CPSR/PSTATE.
+ */
+#if RT_INLINE_ASM_EXTERNAL
+DECLASM(RTCCUINTREG) ASMGetFlags(void);
+#else
+DECLINLINE(RTCCUINTREG) ASMGetFlags(void)
+{
+    RTCCUINTREG uFlags;
+# if RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_ARM64
+    __asm__ __volatile__("isb\n\t"
+                         "mrs %0, daif\n\t"
+                         : "=r" (uFlags));
+#  else
+#   error "Implementation required for arm32"
+#  endif
+# else
+#  error "Unsupported compiler"
+# endif
+    return uFlags;
+}
+#endif
+
+
+/**
+ * Get the CPSR/PSTATE register.
+ * @returns CPSR/PSTATE.
+ */
+#if RT_INLINE_ASM_EXTERNAL
+DECLASM(void) ASMSetFlags(RTCCUINTREG uFlags);
+#else
+DECLINLINE(void) ASMSetFlags(RTCCUINTREG uFlags)
+{
+# if RT_INLINE_ASM_GNU_STYLE
+#  ifdef RT_ARCH_ARM64
+    __asm__ __volatile__("isb\n\t"
+                         "msr daif, %[uFlags]\n\t"
+                         : : [uFlags] "r" (uFlags));
+#  else
+#   error "Implementation required for arm32"
+#  endif
+# else
+#  error "Unsupported compiler"
+# endif
+}
 #endif
 
@@ -244 +257 @@
 DECLINLINE(bool) ASMIntAreEnabled(void)
 {
-/** @todo r=bird: reversed, but does both need to be enabled? */
     return ASMGetFlags() & 0xc0 /* IRQ and FIQ bits */ ? true : false;
 }