Changeset 106921 in vbox for trunk/src/VBox/ExtPacks

Timestamp:

Nov 11, 2024 9:51:28 AM (3 months ago)

Author:

vboxsync

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

165847

Message:

VBoxDTrace,VMM,IPRT: Made the ring-0 component of the DTrace extension pack compile on win.arm64. jiraref:VBP-1447

Location:

trunk/src/VBox/ExtPacks/VBoxDTrace

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxDTraceR0.cpp (modified) (1 diff)
• VBoxDTraceR0A-arm64.S (copied) (copied from trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A.asm ) (1 diff)
• include/VBoxDTraceTypes.h (modified) (1 diff)
• onnv/uts/common/dtrace/dtrace.c (modified) (2 diffs)

trunk/src/VBox/ExtPacks/VBoxDTrace/Makefile.kmk

@@ -266 +266 @@
  VBoxDTraceR0_SOURCES = \
         VBoxDTraceR0.cpp \
-        VBoxDTraceR0A.asm \
         $(VBOXDT_PATH_UTS)/common/dtrace/dtrace.c
+ VBoxDTraceR0_SOURCES.amd64 = \
+        VBoxDTraceR0A.asm
+ VBoxDTraceR0_SOURCES.x86 = \
+        VBoxDTraceR0A.asm
+ VBoxDTraceR0_SOURCES.arm64 = \
+        VBoxDTraceR0A-arm64.S
  VBoxDTraceR0_LIBS = \
         $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0.cpp

@@ -26 +26 @@
 #include <VBox/log.h>
 
-#include <iprt/asm-amd64-x86.h>
+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
+# include <iprt/asm-amd64-x86.h>
+#endif
 #include <iprt/assert.h>
 #include <iprt/ctype.h>

trunk/src/VBox/ExtPacks/VBoxDTrace/VBoxDTraceR0A-arm64.S

@@ -1 @@
-; $Id$
-;; @file
-; VBoxDTraceR0 - Assembly Hacks.
-;
-; Contributed by: bird
-;
+/* $Id$ */
+/** @file
+ * VBoxDTraceR0.
+ *
+ * Contributed by: bird
+ */
 
-;
-; Copyright (C) 2012-2024 Oracle and/or its affiliates.
-;
-; This file is part of VirtualBox base platform packages, as
-; available from http://www.virtualbox.org.
-;
-; The contents of this file are subject to the terms of the Common
-; Development and Distribution License Version 1.0 (CDDL) only, as it
-; comes in the "COPYING.CDDL" file of the VirtualBox distribution.
-;
-; SPDX-License-Identifier: CDDL-1.0
-;
+/*
+ * Copyright (C) 2012-2024 Oracle and/or its affiliates.
+ *
+ * This file is part of VirtualBox base platform packages, as
+ * available from http://www.virtualbox.org.
+ *
+ * The contents of this file are subject to the terms of the Common
+ * Development and Distribution License Version 1.0 (CDDL) only, as it
+ * comes in the "COPYING.CDDL" file of the VirtualBox distribution.
+ *
+ * SPDX-License-Identifier: CDDL-1.0
+ */
 
-
-
-%include "iprt/asmdefs.mac"
+#include "iprt/asmdefs-arm.h"
 
 BEGINCODE
 
+BEGINPROC dtrace_probe6
+        b       NAME(dtrace_probe)
+ENDPROC   dtrace_probe6
 
-extern NAME(dtrace_probe)
 
-GLOBALNAME dtrace_probe6
-    jmp     NAME(dtrace_probe)
-

trunk/src/VBox/ExtPacks/VBoxDTrace/include/VBoxDTraceTypes.h

@@ -130 +130 @@
 # endif
 # if !defined(_LITTLE_ENDIAN) || (!defined(RT_OS_SOLARIS) && !defined(RT_OS_FREEBSD))
+#  define _LITTLE_ENDIAN            1
+# endif
+
+#elif defined(RT_ARCH_ARM64)
+# ifndef _LP64
+#  define _LP64                     1
+# endif
+# if !defined(_LITTLE_ENDIAN)
 #  define _LITTLE_ENDIAN            1
 # endif

trunk/src/VBox/ExtPacks/VBoxDTrace/onnv/uts/common/dtrace/dtrace.c

@@ -114 +114 @@
  */
 # 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
 # define dtrace_casptr(a_ppvDst, a_pvOld, a_pvNew) \
         VBoxDtCompareAndSwapPtr((void * volatile *)a_ppvDst, a_pvOld, a_pvNew)
@@ -133 +137 @@
 }
 
-#define dtrace_membar_consumer()                ASMReadFence()
-#define dtrace_membar_producer()                ASMWriteFence()
-#define dtrace_interrupt_disable()              ASMIntDisableFlags()
-#define dtrace_interrupt_enable(a_EFL)  ASMSetFlags(a_EFL)
+# define dtrace_membar_consumer()               ASMReadFence()
+# define dtrace_membar_producer()               ASMWriteFence()
+# define dtrace_interrupt_disable()             ASMIntDisableFlags()
+# define dtrace_interrupt_enable(a_EFL)         ASMSetFlags(a_EFL)
 
 /*