Changeset 107227 in vbox for trunk/src/VBox/VMM/VMMR3/EMR3Nem.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/EMR3Nem.cpp (modified) (10 diffs)

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

@@ -97 +97 @@
         return VINF_EM_RESCHEDULE;
 
-#if defined(VBOX_VMM_TARGET_ARMV8)
-    uint64_t const uOldPc = pVCpu->cpum.GstCtx.Pc.u64;
+#ifdef VBOX_VMM_TARGET_ARMV8
+    uint64_t const uOldPc  = pVCpu->cpum.GstCtx.Pc.u64;
+#elif defined(VBOX_VMM_TARGET_X86)
+    uint64_t const uOldRip = pVCpu->cpum.GstCtx.rip;
 #else
-    uint64_t const uOldRip = pVCpu->cpum.GstCtx.rip;
+# error "port me"
 #endif
     for (;;)
@@ -147 +149 @@
          * Done?
          */
-#if defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef VBOX_VMM_TARGET_ARMV8
         CPUM_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_PC);
         if (   (rcStrict != VINF_SUCCESS && rcStrict != VINF_EM_DBG_STEPPED)
@@ -160 +162 @@
             return rcStrict;
         }
-#else
+
+#elif defined(VBOX_VMM_TARGET_X86)
         CPUM_ASSERT_NOT_EXTRN(pVCpu, CPUMCTX_EXTRN_RIP);
         if (   (rcStrict != VINF_SUCCESS && rcStrict != VINF_EM_DBG_STEPPED)
@@ -173 +176 @@
             return rcStrict;
         }
+
+#else
+# error "port me"
 #endif
     }
@@ -201 +207 @@
      * Log it.
      */
-#ifdef VBOX_VMM_TARGET_ARMV8
+# ifdef VBOX_VMM_TARGET_ARMV8
     Log(("EMINS: %RGv SP_EL0=%RGv SP_EL1=%RGv\n", (RTGCPTR)pVCpu->cpum.GstCtx.Pc.u64,
-                                                  (RTGCPTR)pVCpu->cpum.GstCtx.aSpReg[0].u64,
-                                                  (RTGCPTR)pVCpu->cpum.GstCtx.aSpReg[1].u64));
+         (RTGCPTR)pVCpu->cpum.GstCtx.aSpReg[0].u64, (RTGCPTR)pVCpu->cpum.GstCtx.aSpReg[1].u64));
     if (pszPrefix)
     {
@@ -210 +215 @@
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, pszPrefix);
     }
-# else
+# elif defined(VBOX_VMM_TARGET_X86)
     Log(("EMINS: %04x:%RGv RSP=%RGv\n", pVCpu->cpum.GstCtx.cs.Sel, (RTGCPTR)pVCpu->cpum.GstCtx.rip, (RTGCPTR)pVCpu->cpum.GstCtx.rsp));
     if (pszPrefix)
@@ -217 +222 @@
         DBGFR3_DISAS_INSTR_CUR_LOG(pVCpu, pszPrefix);
     }
+# else
+#  error "port me"
 # endif
 #endif
@@ -375 +382 @@
 #ifdef VBOX_VMM_TARGET_ARMV8
     LogFlow(("emR3NemExecute%d: (pc=%RGv)\n", pVCpu->idCpu, (RTGCPTR)pVCpu->cpum.GstCtx.Pc.u64));
+#elif defined(VBOX_VMM_TARGET_X86)
+    LogFlow(("emR3NemExecute%d: (cs:eip=%04x:%RGv)\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, (RTGCPTR)pVCpu->cpum.GstCtx.rip));
 #else
-    LogFlow(("emR3NemExecute%d: (cs:eip=%04x:%RGv)\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.cs.Sel, (RTGCPTR)pVCpu->cpum.GstCtx.rip));
+# error "port me"
 #endif
     *pfFFDone = false;
@@ -411 +420 @@
         }
 
-#if defined(LOG_ENABLED) && !defined(VBOX_VMM_TARGET_ARMV8)
+#ifdef LOG_ENABLED
         /*
          * Log important stuff before entering GC.
          */
+# ifdef VBOX_VMM_TARGET_X86
         if (TRPMHasTrap(pVCpu))
             Log(("CPU%d: Pending hardware interrupt=0x%x cs:rip=%04X:%RGv\n", pVCpu->idCpu, TRPMGetTrapNo(pVCpu), pVCpu->cpum.GstCtx.cs.Sel, (RTGCPTR)pVCpu->cpum.GstCtx.rip));
@@ -441 +451 @@
             }
         }
+# elif defined(VBOX_VMM_TARGET_ARMV8)
+        if (!(pVCpu->cpum.GstCtx.fExtrn & CPUMCTX_EXTRN_PC))
+        {
+            /** @todo better logging */
+            if (pVM->cCpus == 1)
+                Log(("NEM: %RX64\n", pVCpu->cpum.GstCtx.Pc.u64));
+            else
+                Log(("NEM-CPU%d: %RX64\n", pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64));
+        }
+# else
+#  error "port me"
+# endif
         else if (pVM->cCpus == 1)
             Log(("NEMRx: -> NEMR3RunGC\n"));
         else
-            Log(("NEMRx-CPU%u: -> NEMR3RunGC\n",  pVCpu->idCpu));
+            Log(("NEMRx-CPU%u: -> NEMR3RunGC\n", pVCpu->idCpu));
 #endif /* LOG_ENABLED */