Changeset 107033 in vbox for trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp

Timestamp:

Nov 18, 2024 3:28:18 PM (2 months ago)

Author:

vboxsync

Message:

VMM/NEM/ARM: Loading a 32-bit value into a register clears the upper half on real hardware, workaround for ldp instruction accessing the TPM MMIO area caused by tpm.sys in a Windows 11/ARM guest, bugref:10777 [windows build fix]

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win-armv8.cpp

@@ -2275 +2275 @@
                     uint32_t u32Val1 = 0;
                     uint32_t u32Val2 = 0;
-                    rcStrict = PGMPhysRead(pVM, GCPhysDataAbrt, &u32Val1, sizeof(u32Val1), PGMACCESSORIGIN_HM);
+                    rcStrict = PGMPhysRead(pVM, GCPhys, &u32Val1, sizeof(u32Val1), PGMACCESSORIGIN_HM);
                     if (rcStrict == VINF_SUCCESS)
-                        rcStrict = PGMPhysRead(pVM, GCPhysDataAbrt + sizeof(uint32_t), &u32Val2, sizeof(u32Val2), PGMACCESSORIGIN_HM);
+                        rcStrict = PGMPhysRead(pVM, GCPhys + sizeof(uint32_t), &u32Val2, sizeof(u32Val2), PGMACCESSORIGIN_HM);
                     Log4(("MmioExit/%u: %08RX64: READ %#RGp LB %u -> %.*Rhxs %.*Rhxs rcStrict=%Rrc\n",
-                          pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64, GCPhysDataAbrt, 2 * sizeof(uint32_t), sizeof(u32Val1),
+                          pVCpu->idCpu, pVCpu->cpum.GstCtx.Pc.u64, GCPhys, 2 * sizeof(uint32_t), sizeof(u32Val1),
                           &u32Val1, sizeof(u32Val2), &u32Val2, VBOXSTRICTRC_VAL(rcStrict) ));
                     if (rcStrict == VINF_SUCCESS)