Changeset 104212 in vbox

Timestamp:

Apr 7, 2024 4:27:42 PM (8 months ago)

Author:

vboxsync

Message:

include/iprt,VMM/IEMAllN8veHlpA-arm64.S: Introduce a new asmdefs-arm.mac which contains macros for assembly code hiding differences between gcc and llvm, make use of it in IEMAllN8veHlpA-arm64.S to make it build with gcc on linux.arm64. Also, gcc doesn't like ; style comments, bugref:10391

Location:

trunk

Files:

• include/.scm-settings (modified) (1 diff)
• include/iprt/asmdefs-arm.mac (added)
• src/VBox/VMM/VMMAll/IEMAllN8veHlpA-arm64.S (modified) (4 diffs)

trunk/include/.scm-settings

@@ -112 +112 @@
 /iprt/sanitized/*: --guard-relative-to-dir iprt --guard-prefix IPRT_INCLUDED_ --treat-as h
 
+# /iprt/asmdefs-arm.mac needs to be treated as an C/C++ header file
+/iprt/asmdefs-arm.mac: --guard-relative-to-dir iprt --guard-prefix IPRT_INCLUDED_ --treat-as h

trunk/src/VBox/VMM/VMMAll/IEMAllN8veHlpA-arm64.S

@@ -30 +30 @@
 *       Header Files                                                                                                             *
 *********************************************************************************************************************************/
-#include <iprt/asmdefs-arm.h>
-#include <iprt/x86.h>
+#include <iprt/asmdefs-arm.mac>
 
 
@@ -54 +53 @@
  *       it ourselves, I think.
  */
-        .p2align        2
-        .private_extern NAME(iemNativeTbLongJmp)
-        .globl          NAME(iemNativeTbLongJmp)
-NAME(iemNativeTbLongJmp):
-
-        ;
-        ; This must exactly match what iemNativeEmitEpilog does.
-        ;
+BEGINPROC_HIDDEN iemNativeTbLongJmp
+        /*
+         * This must exactly match what iemNativeEmitEpilog does.
+         */
         sub     sp, x0, #0x50
         ldp     x19, x20, [sp, #0x00]
@@ -82 +77 @@
 #define IEMNATIVE_HLP_FRAME_SIZE (11 * 16)
 
-;;
-; This is wrapper function that saves and restores all volatile registers
-; so the impact of inserting LogCpuState is minimal to the other TB code.
-;
-        .p2align        2
-        .private_extern NAME(iemNativeHlpAsmSafeWrapLogCpuState)
-        .globl          NAME(iemNativeHlpAsmSafeWrapLogCpuState)
-NAME(iemNativeHlpAsmSafeWrapLogCpuState):
+/**
+ * This is wrapper function that saves and restores all volatile registers
+ * so the impact of inserting LogCpuState is minimal to the other TB code.
+ */
+BEGINPROC_HIDDEN iemNativeHlpAsmSafeWrapLogCpuState
 #ifdef RT_OS_DARWIN
         pacibsp
 #endif
 
-        ;
-        ; Save all volatile registers.
-        ;
+        /*
+         * Save all volatile registers.
+         */
         stp     x29, x30, [sp, #-IEMNATIVE_HLP_FRAME_SIZE]!
         stp      x0,  x1, [sp, #( 1 * 16)]
@@ -109 +101 @@
         stp     x17, x18, [sp, #(10 * 16)]
 
-        ;
-        ; Move the pVCpu pointer from the fixed register to the first argument.
-        ; @todo This needs syncing with what we use in IEMN8veRecompiler.h
-        ;       but we can't include that header right now, would need some #ifndef IN_ASM_CODE...
-        ;       in the header or splitting up the header into a asm safe one and a one included from C/C++.
-        ;
+        /*
+         * Move the pVCpu pointer from the fixed register to the first argument.
+         * @todo This needs syncing with what we use in IEMN8veRecompiler.h
+         *       but we can't include that header right now, would need some #ifndef IN_ASM_CODE...
+         *       in the header or splitting up the header into a asm safe one and a one included from C/C++.
+         */
         mov      x0, x28
 
-        ;
-        ; Call C function to do the actual work.
-        ;
+        /*
+         * Call C function to do the actual work.
+         */
         bl      NAME(iemThreadedFunc_BltIn_LogCpuStateWorker)
 
-        ;
-        ; Restore volatile registers and return to the TB code.
-        ;
+        /*
+         * Restore volatile registers and return to the TB code.
+         */
         ldp    x29, x30, [sp, #( 0 * 16)]
         ldp     x0,  x1, [sp, #( 1 * 16)]