Changeset 106558 in vbox

Timestamp:

Oct 21, 2024 11:31:16 AM (6 months ago)

Author:

vboxsync

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

165392

Message:

IPRT: Some nocrt/arm64 build fixes. jiraref:VBP-1171

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/compiler/vcc/stacksup-vcc.cpp (modified) (5 diffs)
• common/sort/nocrt-qsort.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2864 +2864 @@
 RuntimeGuestR3Shared_INST                = $(INST_ADDITIONS_LIB)
 ifdef VBOX_WITH_NOCRT_STATIC
- if1of ($(KBUILD_TARGET), win)
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), win.x86 win.amd64)
   RuntimeGuestR3Shared_SDKS              = $(filter-out VBoxSoftFloatR3Shared,$(RuntimeGuestR3_SDKS)) VBoxSoftFloatGuestR3Shared
   RuntimeGuestR3Shared_SOURCES           = $(RuntimeGuestR3_SOURCES) \

trunk/src/VBox/Runtime/common/compiler/vcc/stacksup-vcc.cpp

@@ -42 +42 @@
 
 #include <iprt/asm.h>
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#elif defined(RT_ARCH_ARM64)
+# include <iprt/asm-arm.h>
+#endif
 #ifndef IPRT_NOCRT_WITHOUT_FATAL_WRITE
 # include <iprt/assert.h>
@@ -62 +66 @@
 #elif defined(RT_ARCH_X86)
 # define MY_GET_PC_FROM_CONTEXT(a_pCtx)  ((a_pCtx)->Eip)
+#elif defined(RT_ARCH_ARM64)
+# define MY_GET_PC_FROM_CONTEXT(a_pCtx)  ((a_pCtx)->Pc)
 #else
 # error "Port Me!"
@@ -169 +175 @@
 # elif defined(RT_ARCH_X86)
             /* .ExceptionAddress = */       (void *)pCpuCtx->Eip,
+# elif defined(RT_ARCH_ARM64)
+            /* .ExceptionAddress = */       (void *)pCpuCtx->Pc,
 # else
 #  error "Port me!"
@@ -339 +347 @@
 # elif defined(RT_ARCH_X86)
                  pCpuCtx->Eip, pCpuCtx->Esp, pCpuCtx->Ebp
+# elif defined(RT_ARCH_ARM64)
+                 pCpuCtx->Pc, pCpuCtx->Sp, pCpuCtx->Bp
 # else
 #  error "unsupported arch"
@@ -350 +360 @@
 # elif defined(RT_ARCH_X86)
     rtNoCrtFatalWritePtr((void *)pCpuCtx->Eip);
+# elif defined(RT_ARCH_ARM64)
+    rtNoCrtFatalWritePtr((void *)pCpuCtx->Pc);
 # else
 #  error "unsupported arch"

trunk/src/VBox/Runtime/common/sort/nocrt-qsort.cpp

@@ -49 +49 @@
 # define NEED_COMPARE_WRAPPER
 /** @callback_method_impl{FNRTSORTCMP} */
-static int DECLCALLBACK(int) CompareWrapper(void const *pvElement1, void const *pvElement2, void *pvUser))
+static DECLCALLBACK(int) CompareWrapper(void const *pvElement1, void const *pvElement2, void *pvUser)
 {
     int (*pfnCompare)(const void *pv1, const void *pv2) = (int (*)(const void *pv1, const void *pv2))(uintptr_t)pvUser;