Changeset 95421 in vbox for trunk/src/VBox

Timestamp:

Jun 29, 2022 2:41:48 AM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: fld, fbld and fstp are 8 byte aligned as far as #AC is concerned on an 10980xe. bugref:9898

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (4 diffs)
• VMMAll/IEMAllInstructionsOneByte.cpp.h (modified) (2 diffs)
• include/IEMMc.h (modified) (1 diff)
• testcase/tstIEMCheckMc.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -6884 +6884 @@
     /* The lazy approach for now... */
     PCRTFLOAT80U pr80Src;
-    VBOXSTRICTRC rc = iemMemMap(pVCpu, (void **)&pr80Src, sizeof(*pr80Src), iSegReg, GCPtrMem,
-                                IEM_ACCESS_DATA_R, 7 /** @todo FLD alignment check */ );
+    VBOXSTRICTRC rc = iemMemMap(pVCpu, (void **)&pr80Src, sizeof(*pr80Src), iSegReg, GCPtrMem, IEM_ACCESS_DATA_R, 7);
     if (rc == VINF_SUCCESS)
     {
@@ -6908 +6907 @@
 {
     /* The lazy approach for now... */
-    PCRTFLOAT80U pr80Src = (PCRTFLOAT80U)iemMemMapJmp(pVCpu, sizeof(*pr80Src), iSegReg, GCPtrMem,
-                                                      IEM_ACCESS_DATA_R, 7 /** @todo FLD alignment check */);
+    PCRTFLOAT80U pr80Src = (PCRTFLOAT80U)iemMemMapJmp(pVCpu, sizeof(*pr80Src), iSegReg, GCPtrMem, IEM_ACCESS_DATA_R, 7);
     *pr80Dst = *pr80Src;
     iemMemCommitAndUnmapJmp(pVCpu, (void *)pr80Src, IEM_ACCESS_DATA_R);
@@ -6917 +6915 @@
 
 /**
- * Fetches a data tword.
+ * Fetches a data decimal tword.
  *
  * @returns Strict VBox status code.
@@ -6943 +6941 @@
 #ifdef IEM_WITH_SETJMP
 /**
- * Fetches a data tword, longjmp on error.
+ * Fetches a data decimal tword, longjmp on error.
  *
  * @param   pVCpu               The cross context virtual CPU structure of the calling thread.

trunk/src/VBox/VMM/VMMAll/IEMAllInstructionsOneByte.cpp.h

@@ -8781 +8781 @@
     IEM_MC_MAYBE_RAISE_FPU_XCPT();
 
-    IEM_MC_MEM_MAP(pr80Dst, IEM_ACCESS_DATA_W, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 1 /*arg*/);
+    IEM_MC_MEM_MAP_EX(pr80Dst, IEM_ACCESS_DATA_W, sizeof(*pr80Dst), pVCpu->iem.s.iEffSeg, GCPtrEffDst, 7 /*cbAlign*/, 1 /*arg*/);
     IEM_MC_PREPARE_FPU_USAGE();
     IEM_MC_IF_FPUREG_NOT_EMPTY_REF_R80(pr80Value, 0)
@@ -10182 +10182 @@
     IEM_MC_MAYBE_RAISE_FPU_XCPT();
 
-    IEM_MC_MEM_MAP(pd80Dst, IEM_ACCESS_DATA_W, pVCpu->iem.s.iEffSeg, GCPtrEffDst, 1 /*arg*/);
+    IEM_MC_MEM_MAP_EX(pd80Dst, IEM_ACCESS_DATA_W, sizeof(*pd80Dst), pVCpu->iem.s.iEffSeg, GCPtrEffDst, 7 /*cbAlign*/, 1 /*arg*/);
     IEM_MC_PREPARE_FPU_USAGE();
     IEM_MC_IF_FPUREG_NOT_EMPTY_REF_R80(pr80Value, 0)

trunk/src/VBox/VMM/include/IEMMc.h

@@ -890 +890 @@
  * @remarks     May return.
  */
-#define IEM_MC_MEM_MAP_EX(a_pvMem, a_fAccess, a_cbMem, a_iSeg, a_GCPtrMem, a_iArg) \
+#define IEM_MC_MEM_MAP_EX(a_pvMem, a_fAccess, a_cbMem, a_iSeg, a_GCPtrMem, a_cbAlign, a_iArg) \
     IEM_MC_RETURN_ON_FAILURE(iemMemMap(pVCpu, (void **)&(a_pvMem), (a_cbMem), (a_iSeg), \
-                                       (a_GCPtrMem), (a_fAccess), (a_cbMem) - 1))
+                                       (a_GCPtrMem), (a_fAccess), (a_cbAlign)))
 
 /** Commits the memory and unmaps the guest memory.

trunk/src/VBox/VMM/testcase/tstIEMCheckMc.cpp

@@ -631 +631 @@
 #define IEM_MC_POP_U64(a_pu64Value)                                     do { (void)fMcBegin; } while (0)
 #define IEM_MC_MEM_MAP(a_pMem, a_fAccess, a_iSeg, a_GCPtrMem, a_iArg)   do { (void)fMcBegin; } while (0)
-#define IEM_MC_MEM_MAP_EX(a_pvMem, a_fAccess, a_cbMem, a_iSeg, a_GCPtrMem, a_iArg)  do { (void)fMcBegin; } while (0)
+#define IEM_MC_MEM_MAP_EX(a_pvMem, a_fAccess, a_cbMem, a_iSeg, a_GCPtrMem, a_cbAlign, a_iArg)  do { (void)fMcBegin; AssertCompile((a_cbAlign) <= (a_cbMem)); } while (0)
 #define IEM_MC_MEM_COMMIT_AND_UNMAP(a_pvMem, a_fAccess)                             do { (void)fMcBegin; } while (0)
 #define IEM_MC_MEM_COMMIT_AND_UNMAP_FOR_FPU_STORE(a_pvMem, a_fAccess, a_u16FSW)     do { (void)fMcBegin; } while (0)