Changeset 99051 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Mar 19, 2023 4:40:06 PM (22 months ago)

Author:

vboxsync

Message:

VMM: More ARMv8 x86/amd64 separation work, VBoxVMMArm compiles and links now, bugref:10385

Location:

trunk/src/VBox/VMM/include

Files:

• EMHandleRCTmpl.h (modified) (3 diffs)
• IOMInternal.h (modified) (1 diff)
• NEMInternal.h (modified) (7 diffs)
• PGMInline.h (modified) (2 diffs)
• PGMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/include/EMHandleRCTmpl.h

@@ -113 +113 @@
             break;
 
+#if !defined(VBOX_VMM_TARGET_ARMV8)
         /*
          * Execute pending I/O Port access.
@@ -122 +123 @@
             rc = VBOXSTRICTRC_TODO(emR3ExecutePendingIoPortRead(pVM, pVCpu));
             break;
+#endif
 
         /*
@@ -167 +169 @@
             break;
 
+#if !defined(VBOX_VMM_TARGET_ARMV8)
         case VINF_EM_EMULATE_SPLIT_LOCK:
             rc = VBOXSTRICTRC_TODO(emR3ExecuteSplitLockInstruction(pVM, pVCpu));
             break;
+#endif
 
 

trunk/src/VBox/VMM/include/IOMInternal.h

@@ -574 +574 @@
 
 #ifdef IN_RING3
+# if !defined(VBOX_VMM_TARGET_ARMV8)
 DECLCALLBACK(void)  iomR3IoPortInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 void                iomR3IoPortRegStats(PVM pVM, PIOMIOPORTENTRYR3 pRegEntry);
+# endif
 DECLCALLBACK(void)  iomR3MmioInfo(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
 void                iomR3MmioRegStats(PVM pVM, PIOMMMIOENTRYR3 pRegEntry);

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -42 +42 @@
 #include <iprt/critsect.h>
 #elif defined(RT_OS_DARWIN)
-# include "VMXInternal.h"
+# if defined(VBOX_VMM_TARGET_ARMV8)
+#  include <Hypervisor/Hypervisor.h>
+# else
+#  include "VMXInternal.h"
+# endif
 #endif
 
@@ -108 +112 @@
 
 #ifdef RT_OS_DARWIN
+# if !defined(VBOX_VMM_TARGET_ARMV8)
 /** vCPU ID declaration to avoid dragging in HV headers here. */
 typedef unsigned hv_vcpuid_t;
 /** The HV VM memory space ID (ASID). */
 typedef unsigned hv_vm_space_t;
+# endif
 
 
@@ -122 +128 @@
 /** @} */
 
+# if defined(VBOX_VMM_TARGET_ARMV8)
 /** The CPUMCTX_EXTRN_XXX mask for IEM. */
-# define NEM_DARWIN_CPUMCTX_EXTRN_MASK_FOR_IEM      (  IEM_CPUMCTX_EXTRN_MUST_MASK | CPUMCTX_EXTRN_INHIBIT_INT \
-                                                     | CPUMCTX_EXTRN_INHIBIT_NMI )
+#  define NEM_DARWIN_CPUMCTX_EXTRN_MASK_FOR_IEM      (  IEM_CPUMCTX_EXTRN_MUST_MASK )
+# else
+/** The CPUMCTX_EXTRN_XXX mask for IEM. */
+#  define NEM_DARWIN_CPUMCTX_EXTRN_MASK_FOR_IEM      (  IEM_CPUMCTX_EXTRN_MUST_MASK | CPUMCTX_EXTRN_INHIBIT_INT \
+                                                      | CPUMCTX_EXTRN_INHIBIT_NMI )
+#endif
+
 /** The CPUMCTX_EXTRN_XXX mask for IEM when raising exceptions. */
 # define NEM_DARWIN_CPUMCTX_EXTRN_MASK_FOR_IEM_XCPT (IEM_CPUMCTX_EXTRN_XCPT_MASK | NEM_DARWIN_CPUMCTX_EXTRN_MASK_FOR_IEM)
@@ -274 +286 @@
     /** Set if hv_vm_create() was called successfully. */
     bool                        fCreatedVm   : 1;
+# if defined(VBOX_VMM_TARGET_ARMV8)
+    /** @todo */
+# else
     /** Set if hv_vm_space_create() was called successfully. */
     bool                        fCreatedAsid : 1;
@@ -310 +325 @@
     /** The last valid host LBR info stack range. */
     uint32_t                    idLbrInfoMsrLast;
+# endif
 
     STAMCOUNTER                 StatMapPage;
@@ -460 +476 @@
 
 #elif defined(RT_OS_DARWIN)
+# if defined(VBOX_VMM_TARGET_ARMV8)
+    /** The vCPU handle associated with the EMT executing this vCPU. */
+    hv_vcpu_t                   hVCpu;
+    /** Pointer to the exit information structure. */
+    hv_vcpu_exit_t              *pHvExit;
+    /** Flag whether an event is pending. */
+    bool                        fEventPending;
+# else
     /** The vCPU handle associated with the EMT executing this vCPU. */
     hv_vcpuid_t                 hVCpuId;
@@ -530 +554 @@
     /** Pointer to the VMX statistics. */
     PVMXSTATISTICS              pVmxStats;
+# endif
 
     /** @name Statistics

trunk/src/VBox/VMM/include/PGMInline.h

@@ -374 +374 @@
 
 
+#ifndef VBOX_VMM_TARGET_ARMV8
 /**
  * Checks if the no-execute (NX) feature is active (EFER.NXE=1).
@@ -978 +979 @@
     return NULL;
 }
+#endif /* !VBOX_VMM_TARGET_ARMV8 */
 
 

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -374 +374 @@
  * @param   GCVirt      The virtual address of the page to invalidate.
  */
-#ifdef IN_RING0
-# define PGM_INVL_PG_ALL_VCPU(pVM, GCVirt)      HMInvalidatePageOnAllVCpus(pVM, (RTGCPTR)(GCVirt))
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# define PGM_INVL_PG_ALL_VCPU(pVM, GCVirt)      do { } while(0)
 #else
 # define PGM_INVL_PG_ALL_VCPU(pVM, GCVirt)      HMInvalidatePageOnAllVCpus(pVM, (RTGCPTR)(GCVirt))
@@ -386 +386 @@
  * @param   GCVirt      The virtual address within the page directory to invalidate.
  */
-#ifdef IN_RING0
-# define PGM_INVL_BIG_PG(pVCpu, GCVirt)         HMFlushTlb(pVCpu)
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# define PGM_INVL_BIG_PG(pVCpu, GCVirt)         do { } while(0)
 #else
 # define PGM_INVL_BIG_PG(pVCpu, GCVirt)         HMFlushTlb(pVCpu)
@@ -397 +397 @@
  * @param   pVCpu       The cross context virtual CPU structure.
  */
-#ifdef IN_RING0
-# define PGM_INVL_VCPU_TLBS(pVCpu)             HMFlushTlb(pVCpu)
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# define PGM_INVL_VCPU_TLBS(pVCpu)             do { } while(0)
 #else
 # define PGM_INVL_VCPU_TLBS(pVCpu)             HMFlushTlb(pVCpu)
@@ -408 +408 @@
  * @param   pVM         The cross context VM structure.
  */
-#ifdef IN_RING0
-# define PGM_INVL_ALL_VCPU_TLBS(pVM)            HMFlushTlbOnAllVCpus(pVM)
+#if defined(VBOX_VMM_TARGET_ARMV8)
+# define PGM_INVL_ALL_VCPU_TLBS(pVM)            do { } while(0)
 #else
 # define PGM_INVL_ALL_VCPU_TLBS(pVM)            HMFlushTlbOnAllVCpus(pVM)