Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp

Timestamp:

Dec 4, 2024 3:20:14 PM (6 weeks ago)

Author:

vboxsync

Message:

VMM: Cleaning up ARMv8 / x86 split. jiraref:VBP-1470

File:

• trunk/src/VBox/VMM/VMMR3/PGMDbg.cpp (modified) (5 diffs)

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

@@ -1084 +1084 @@
         else
         {
-#ifndef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
             Assert(WalkGst.enmType != PGMPTWALKGSTTYPE_INVALID);
 #endif
@@ -1095 +1095 @@
              */
             uint64_t cPagesCanSkip;
-#ifndef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
             switch (Walk.uLevel)
             {
@@ -1144 +1144 @@
                 continue;
             }
-#else
+
+#elif defined(VBOX_VMM_TARGET_ARMV8)
+
             /** @todo Sketch, needs creating proper defines for constants in armv8.h and using these
              * instead of hardcoding these here. */
@@ -1178 +1180 @@
                 continue;
             }
+#else
+# error "port me"
 #endif
         }
@@ -1185 +1189 @@
             break;
         cPages -= cIncPages;
-#ifndef VBOX_VMM_TARGET_ARMV8
+#ifdef VBOX_VMM_TARGET_X86
         GCPtr += (RTGCPTR)cIncPages << X86_PT_PAE_SHIFT;
+#elif defined(VBOX_VMM_TARGET_ARMV8)
+        GCPtr += (RTGCPTR)cIncPages << 12;
 #else
-        GCPtr += (RTGCPTR)cIncPages << 12;
+# error "port me"
 #endif