Changeset 102977 in vbox for trunk/src/VBox/VMM/VMMR3/EM.cpp

Timestamp:

Jan 19, 2024 11:11:30 PM (12 months ago)

Author:

vboxsync

Message:

VMM/IEM: Implemented generic fallback for misaligned x86 locking that is not compatible with the host. Using the existing split-lock solution with VINF_EM_EMULATE_SPLIT_LOCK from bugref:10052. We keep ignoring the 'lock' prefix in the recompiler for single CPU VMs (now also on amd64 hosts). bugref:10547

File:

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

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

@@ -706 +706 @@
 #endif /* LOG_ENABLED || VBOX_STRICT */
 
-
 #if !defined(VBOX_VMM_TARGET_ARMV8)
+
 /**
  * Handle pending ring-3 I/O port write.
@@ -851 +851 @@
     return VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ALL_AT_ONCE, emR3ExecuteSplitLockInstructionRendezvous, pVCpu);
 }
+
 #endif /* VBOX_VMM_TARGET_ARMV8 */
-
 
 /**
@@ -893 +893 @@
                         rc = VINF_EM_DBG_STEPPED;
                 }
+#ifndef VBOX_VMM_TARGET_ARMV8
+                if (rc != VINF_EM_EMULATE_SPLIT_LOCK)
+                { /* likely */ }
+                else
+                {
+                    rc = emR3ExecuteSplitLockInstruction(pVM, pVCpu);
+                    if (rc == VINF_SUCCESS || rc == VINF_EM_RESCHEDULE)
+                        rc = VINF_EM_DBG_STEPPED;
+                }
+#endif
                 break;
 
@@ -1116 +1126 @@
         if (rcStrict != VINF_SUCCESS)
         {
+#ifndef VBOX_VMM_TARGET_ARMV8
+            if (rcStrict == VINF_EM_EMULATE_SPLIT_LOCK)
+                rcStrict = emR3ExecuteSplitLockInstruction(pVM, pVCpu);
+#endif
+            if (rcStrict != VINF_SUCCESS)
+            {
 #if 0
-            if (RT_LIKELY(rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST))
+                if (RT_LIKELY(rcStrict >= VINF_EM_FIRST && rcStrict <= VINF_EM_LAST))
+                    break;
+                /* Fatal error: */
+#endif
                 break;
-            /* Fatal error: */
-#endif
-            break;
+            }
         }
 
@@ -2556 +2573 @@
                     else if (rc == VINF_SUCCESS)
                         rc = VINF_EM_RESCHEDULE; /* Need to check whether we can run in HM or NEM again. */
+#ifndef VBOX_VMM_TARGET_ARMV8
+                    if (rc != VINF_EM_EMULATE_SPLIT_LOCK)
+                    { /* likely */ }
+                    else
+                        rc = VBOXSTRICTRC_TODO(emR3ExecuteSplitLockInstruction(pVM, pVCpu));
+#endif
                     fFFDone = false;
                     break;