Changeset 94908 in vbox

Timestamp:

May 7, 2022 7:25:46 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,IPRT: Some arm64 adjustments. bugref:10224

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Runtime/common/misc/zero-alt.S (modified) (8 diffs)
• src/VBox/Runtime/r3/linux/fileaio-linux.cpp (modified) (3 diffs)

trunk/Config.kmk

@@ -1899 +1899 @@
 DEFS.x86         = RT_ARCH_X86 __X86__
 DEFS.amd64       = RT_ARCH_AMD64 __AMD64__
+DEFS.arm64       = RT_ARCH_ARM64
 DEFS.sparc32     = RT_ARCH_SPARC
 DEFS.sparc64     = RT_ARCH_SPARC64

trunk/src/VBox/Runtime/common/misc/zero-alt.S

@@ -31 +31 @@
         .section    __TEXT,__const
 # define NAME(a) _##a
-#elif defined(ASM_FORMAT_ELF) && (defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64))
-! Putting it in the rodata segment/section for now.
+#elif defined(ASM_FORMAT_ELF) && (defined(RT_ARCH_ARM64) || defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64))
+/* Putting it in the rodata segment/section for now. */
         .file       "zero-alt.S"
         .section    ".rodata"
 # define NAME(a) a
+# define NEED_HIDDEN
 #else
 # error "PORT ME!"
@@ -43 +44 @@
         .globl      NAME(g_abRTZeroPage)
 #ifdef ASM_FORMAT_ELF
-# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+# ifdef NEED_HIDDEN
         .hidden     NAME(g_abRTZeroPage)
 # endif
@@ -56 +57 @@
         .globl      NAME(g_abRTZero4K)
 #ifdef ASM_FORMAT_ELF
-# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+# ifdef NEED_HIDDEN
         .hidden     NAME(g_abRTZero4K)
 # endif
@@ -65 +66 @@
         .globl      NAME(g_abRTZero8K)
 #ifdef ASM_FORMAT_ELF
-# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+# ifdef NEED_HIDDEN
         .hidden     NAME(g_abRTZero8K)
 # endif
@@ -74 +75 @@
         .globl      NAME(g_abRTZero16K)
 #ifdef ASM_FORMAT_ELF
-# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+# ifdef NEED_HIDDEN
         .hidden     NAME(g_abRTZero16K)
 # endif
@@ -83 +84 @@
         .globl      NAME(g_abRTZero32K)
 #ifdef ASM_FORMAT_ELF
-# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+# ifdef NEED_HIDDEN
         .hidden     NAME(g_abRTZero32K)
 # endif
@@ -92 +93 @@
         .globl      NAME(g_abRTZero64K)
 #ifdef ASM_FORMAT_ELF
-# if defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64)
+# ifdef NEED_HIDDEN
         .hidden     NAME(g_abRTZero64K)
 # endif
@@ -102 +103 @@
 #ifdef ASM_FORMAT_MACHO
         .space      65536
-#elif defined(ASM_FORMAT_ELF) && (defined(RT_ARCH_SPARC) || defined(RT_ARCH_SPARC64))
+#elif defined(ASM_FORMAT_ELF)
         .skip       65536
 #endif

trunk/src/VBox/Runtime/r3/linux/fileaio-linux.cpp

@@ -113 +113 @@
 #endif
     /** How many bytes to transfer. */
-#ifdef RT_ARCH_X86
+#if ARCH_BITS == 32
     uint32_t  cbTransfer;
     uint32_t  u32Padding2;
-#elif defined(RT_ARCH_AMD64)
+#elif ARCH_BITS == 64
     uint64_t  cbTransfer;
 #else
@@ -139 +139 @@
     /** The pvUser field from the iocb. */
     void         *pvUser;
-#ifdef RT_ARCH_X86
+#if ARCH_BITS == 32
     uint32_t      u32Padding0;
 #endif
     /** The LNXKAIOIOCB object this event is for. */
     PLNXKAIOIOCB *pIoCB;
-#ifdef RT_ARCH_X86
+#if ARCH_BITS == 32
     uint32_t      u32Padding1;
 #endif
     /** The result code of the operation .*/
-#ifdef RT_ARCH_X86
+#if ARCH_BITS == 32
     int32_t       rc;
     uint32_t      u32Padding2;
-#elif defined(RT_ARCH_AMD64)
+#elif ARCH_BITS == 64
     int64_t       rc;
 #else
@@ -157 +157 @@
 #endif
     /** Secondary result code. */
-#ifdef RT_ARCH_X86
+#if ARCH_BITS == 32
     int32_t       rc2;
     uint32_t      u32Padding3;
-#elif defined(RT_ARCH_AMD64)
+#elif ARCH_BITS == 64
     int64_t       rc2;
 #else