Changeset 95410 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Jun 28, 2022 6:33:26 PM (3 years ago)

Author:

vboxsync

Message:

VMM/IEM: Alignment checks (#AC(0)/#GP(0)). bugref:9898

Location:

trunk/src/VBox/VMM/include

Files:

• IEMInline.h (modified) (1 diff)
• IEMInternal.h (modified) (3 diffs)
• IEMMc.h (modified) (2 diffs)

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

@@ -2198 +2198 @@
  */
 
+
+/**
+ * Checks whether alignment checks are enabled or not.
+ *
+ * @returns true if enabled, false if not.
+ * @param   pVCpu               The cross context virtual CPU structure of the calling thread.
+ */
+DECLINLINE(bool) iemMemAreAlignmentChecksEnabled(PVMCPUCC pVCpu)
+{
+    AssertCompile(X86_CR0_AM == X86_EFL_AC);
+    return pVCpu->iem.s.uCpl == 3
+        && (((uint32_t)pVCpu->cpum.GstCtx.cr0 & pVCpu->cpum.GstCtx.eflags.u) & X86_CR0_AM);
+}
+
 /**
  * Checks if the given segment can be written to, raise the appropriate

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

@@ -2811 +2811 @@
 /** @name   Memory access.
  * @{ */
-VBOXSTRICTRC    iemMemMap(PVMCPUCC pVCpu, void **ppvMem, size_t cbMem, uint8_t iSegReg, RTGCPTR GCPtrMem, uint32_t fAccess) RT_NOEXCEPT;
+
+/** Report a \#GP instead of \#AC and do not restrict to ring-3 */
+#define IEM_MEMMAP_F_ALIGN_GP       RT_BIT_32(16)
+/** SSE access that should report a \#GP instead of \#AC, unless MXCSR.MM=1
+ *  when it works like normal \#AC. Always used with IEM_MEMMAP_F_ALIGN_GP. */
+#define IEM_MEMMAP_F_ALIGN_SSE      RT_BIT_32(17)
+/** If \#AC is applicable, raise it. Always used with IEM_MEMMAP_F_ALIGN_GP.
+ * Users include FXSAVE & FXRSTOR. */
+#define IEM_MEMMAP_F_ALIGN_GP_OR_AC RT_BIT_32(18)
+
+VBOXSTRICTRC    iemMemMap(PVMCPUCC pVCpu, void **ppvMem, size_t cbMem, uint8_t iSegReg, RTGCPTR GCPtrMem,
+                          uint32_t fAccess, uint32_t uAlignCtl) RT_NOEXCEPT;
 VBOXSTRICTRC    iemMemCommitAndUnmap(PVMCPUCC pVCpu, void *pvMem, uint32_t fAccess) RT_NOEXCEPT;
 #ifndef IN_RING3
@@ -2899 +2910 @@
 #endif
 
-VBOXSTRICTRC    iemMemStackPushBeginSpecial(PVMCPUCC pVCpu, size_t cbMem, void **ppvMem, uint64_t *puNewRsp) RT_NOEXCEPT;
+VBOXSTRICTRC    iemMemStackPushBeginSpecial(PVMCPUCC pVCpu, size_t cbMem, uint32_t cbAlign,
+                                            void **ppvMem, uint64_t *puNewRsp) RT_NOEXCEPT;
 VBOXSTRICTRC    iemMemStackPushCommitSpecial(PVMCPUCC pVCpu, void *pvMem, uint64_t uNewRsp) RT_NOEXCEPT;
 VBOXSTRICTRC    iemMemStackPushU16(PVMCPUCC pVCpu, uint16_t u16Value) RT_NOEXCEPT;
@@ -2908 +2920 @@
 VBOXSTRICTRC    iemMemStackPushU64Ex(PVMCPUCC pVCpu, uint64_t u64Value, PRTUINT64U pTmpRsp) RT_NOEXCEPT;
 VBOXSTRICTRC    iemMemStackPushU32SReg(PVMCPUCC pVCpu, uint32_t u32Value) RT_NOEXCEPT;
-VBOXSTRICTRC    iemMemStackPopBeginSpecial(PVMCPUCC pVCpu, size_t cbMem, void const **ppvMem, uint64_t *puNewRsp) RT_NOEXCEPT;
+VBOXSTRICTRC    iemMemStackPopBeginSpecial(PVMCPUCC pVCpu, size_t cbMem, uint32_t cbAlign,
+                                           void const **ppvMem, uint64_t *puNewRsp) RT_NOEXCEPT;
 VBOXSTRICTRC    iemMemStackPopContinueSpecial(PVMCPUCC pVCpu, size_t cbMem, void const **ppvMem, uint64_t *puNewRsp) RT_NOEXCEPT;
 VBOXSTRICTRC    iemMemStackPopDoneSpecial(PVMCPUCC pVCpu, void const *pvMem) RT_NOEXCEPT;

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

@@ -883 +883 @@
  */
 #define IEM_MC_MEM_MAP(a_pMem, a_fAccess, a_iSeg, a_GCPtrMem, a_iArg) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemMap(pVCpu, (void **)&(a_pMem), sizeof(*(a_pMem)), (a_iSeg), (a_GCPtrMem), (a_fAccess)))
+    IEM_MC_RETURN_ON_FAILURE(iemMemMap(pVCpu, (void **)&(a_pMem), sizeof(*(a_pMem)), (a_iSeg), \
+                                       (a_GCPtrMem), (a_fAccess), sizeof(*(a_pMem)) - 1))
 
 /** Maps guest memory for direct or bounce buffered access.
@@ -890 +891 @@
  */
 #define IEM_MC_MEM_MAP_EX(a_pvMem, a_fAccess, a_cbMem, a_iSeg, a_GCPtrMem, a_iArg) \
-    IEM_MC_RETURN_ON_FAILURE(iemMemMap(pVCpu, (void **)&(a_pvMem), (a_cbMem), (a_iSeg), (a_GCPtrMem), (a_fAccess)))
+    IEM_MC_RETURN_ON_FAILURE(iemMemMap(pVCpu, (void **)&(a_pvMem), (a_cbMem), (a_iSeg), \
+                                       (a_GCPtrMem), (a_fAccess), (a_cbMem) - 1))
 
 /** Commits the memory and unmaps the guest memory.