Changeset 98970 in vbox for trunk/src/VBox/VMM

Timestamp:

Mar 15, 2023 8:56:57 AM (2 years ago)

Author:

vboxsync

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

156319

Message:

VMM: More ARMv8 x86/amd64 separation work, bugref:10385

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMR3/CPUM-armv8.cpp (added)
• VMMR3/DBGFR3Bp.cpp (modified) (4 diffs)
• include/CPUMInternal-armv8.h (added)

trunk/src/VBox/VMM/Makefile.kmk

@@ -347 +347 @@
         VBoxVMM.d \
         VMMR3/VMMR3VTable.cpp \
-        VMMR3/APIC.cpp \
         VMMR3/CFGM.cpp \
-        VMMR3/CPUM.cpp \
-        VMMR3/CPUMR3CpuId.cpp \
-        VMMR3/CPUMR3Db.cpp \
-        VMMR3/CPUMDbg.cpp \
+        VMMR3/CPUM-armv8.cpp \
         VMMR3/DBGF.cpp \
         VMMR3/DBGFAddr.cpp \
@@ -358 +354 @@
         VMMR3/DBGFR3Bp.cpp \
         VMMR3/DBGFR3BugCheck.cpp \
-        VMMR3/DBGFCoreWrite.cpp \
         VMMR3/DBGFCpu.cpp \
         VMMR3/DBGFDisas.cpp \

trunk/src/VBox/VMM/VMMR3/DBGFR3Bp.cpp

@@ -162 +162 @@
 #define LOG_GROUP LOG_GROUP_DBGF
 #define VMCPU_INCL_CPUM_GST_CTX
+#include <VBox/vmm/cpum.h>
 #include <VBox/vmm/dbgf.h>
 #include <VBox/vmm/selm.h>
@@ -1775 +1776 @@
     RT_NOREF(pvUser);
 
+#if defined(VBOX_VMM_TARGET_ARMV8)
+    RT_NOREF(pVM, pVCpu);
+    AssertReleaseFailed();
+    return VERR_NOT_IMPLEMENTED;
+#else
     /*
      * CPU 0 updates the enabled hardware breakpoint counts.
@@ -1794 +1800 @@
 
     return CPUMRecalcHyperDRx(pVCpu, UINT8_MAX);
+#endif
 }
 
@@ -1980 +1987 @@
             {
                 uint8_t abInstr[DBGF_BP_INSN_MAX];
-                RTGCPTR const GCPtrInstr = pVCpu->cpum.GstCtx.rip + pVCpu->cpum.GstCtx.cs.u64Base;
+                RTGCPTR const GCPtrInstr = CPUMGetGuestFlatPC(pVCpu);
                 int rc = PGMPhysSimpleReadGCPtr(pVCpu, &abInstr[0], GCPtrInstr, sizeof(abInstr));
                 AssertRC(rc);