Changeset 106375 in vbox for trunk/src/VBox

Timestamp:

Oct 16, 2024 1:41:24 PM (5 months ago)

Author:

vboxsync

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

165188

Message:

VMM/NEMR3Native-darwin-armv8.cpp: Implement support for breakpoints and single stepping in the VM debugger, bugref:10393 [missing file]

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (4 diffs)

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

@@ -884 +884 @@
                 else if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_HM)
                     rc = EMR3HmSingleInstruction(pVM, pVCpu, 0 /*fFlags*/);
-#endif
                 else if (pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_NEM)
                     rc = VBOXSTRICTRC_TODO(emR3NemSingleInstruction(pVM, pVCpu, 0 /*fFlags*/));
@@ -893 +892 @@
                         rc = VINF_EM_DBG_STEPPED;
                 }
-#ifndef VBOX_VMM_TARGET_ARMV8
+
                 if (rc != VINF_EM_EMULATE_SPLIT_LOCK)
                 { /* likely */ }
@@ -902 +901 @@
                         rc = VINF_EM_DBG_STEPPED;
                 }
+#else
+                AssertMsg(pVCpu->em.s.enmState == EMSTATE_DEBUG_GUEST_NEM,
+                          ("%u\n", pVCpu->em.s.enmState));
+                rc = VBOXSTRICTRC_TODO(emR3NemSingleInstruction(pVM, pVCpu, 0 /*fFlags*/));
 #endif
                 break;
@@ -2399 +2402 @@
                     else
                     {
+#ifdef VBOX_VMM_TARGET_ARMV8
+                        Log2(("EMR3ExecuteVM: %Rrc: %d -> %d\n", rc, enmOldState, EMSTATE_DEBUG_GUEST_NEM));
+                        pVCpu->em.s.enmState = EMSTATE_DEBUG_GUEST_NEM; /** @todo No IEM yet and this gets selected if enmOldState == EMSTATE_HALTED. */
+#else
                         Log2(("EMR3ExecuteVM: %Rrc: %d -> %d\n", rc, enmOldState, EMSTATE_DEBUG_GUEST_IEM));
                         pVCpu->em.s.enmState = EMSTATE_DEBUG_GUEST_IEM;
+#endif
                     }
                     break;