Changeset 60231 in vbox for trunk/src/VBox/ValidationKit/bootsectors

Timestamp:

Mar 28, 2016 10:50:57 PM (9 years ago)

Author:

vboxsync

Message:

bs3kit: updates

Location:

trunk/src/VBox/ValidationKit/bootsectors

Files:

• Config.kmk (modified) (1 diff)
• bs3kit/Makefile.kmk (modified) (2 diffs)
• bs3kit/bs3-cmn-PagingProtect.c (added)
• bs3kit/bs3-cmn-paging.h (modified) (1 diff)
• bs3kit/bs3kit.h (modified) (3 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -600 +600 @@
 TEMPLATE_VBoxBS3KitImg64_ASOBJSUFF    = .o64
 TEMPLATE_VBoxBS3KitImg64_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
-TEMPLATE_VBoxBS3KitImg64_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__
+TEMPLATE_VBoxBS3KitImg64_ASDEFS       = ASM_FORMAT_OMF ASM_CALL64_MSC RT_NOINC_SEGMENTS __NASM__
 TEMPLATE_VBoxBS3KitImg64_DEFS         = IN_BS3KIT ARCH_BITS=64
 TEMPLATE_VBoxBS3KitImg64_DEFS.debug   = BS3_STRICT

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -82 +82 @@
        bs3-cmn-PagingInitRootForPAE.c \
        bs3-cmn-PagingInitRootForLM.c \
+       bs3-cmn-PagingProtect.c \
        bs3-cmn-RegCtxRestore.asm \
        bs3-cmn-RegCtxConvertToRingX.c \
@@ -193 +194 @@
 bs3kit-common-64_ASDEFS   = RT_ASMDEFS_INC_FIRST_FILE
 bs3kit-common-64_SOURCES  = $(VBOX_BS3KIT_COMMON_SOURCES) \
-       bs3-c64-Trap64Generic.asm
+       bs3-c64-Trap64Generic.asm \
+       ../../../Runtime/common/asm/ASMGetIdtr.asm \
+       ../../../Runtime/common/asm/ASMSetIdtr.asm \
 
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-paging.h

@@ -46 +46 @@
 
 
+#define bs3PagingGetLegacyPte BS3_CMN_NM(bs3PagingGetLegacyPte)
+BS3_DECL(X86PTE BS3_FAR *) bs3PagingGetLegacyPte(RTCCUINTXREG cr3, uint32_t uFlat, bool fUseInvlPg, int *prc);
+
+#define bs3PagingGetPte BS3_CMN_NM(bs3PagingGetPte)
+BS3_DECL(X86PTEPAE BS3_FAR *) bs3PagingGetPte(RTCCUINTXREG cr3, uint64_t uFlat, bool fUseInvlPg, int *prc);
+
+
 #endif
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -1078 +1078 @@
 
 /**
- * Gets a working pointer from a 32-bit flat address.
+ * Gets a working pointer from a flat address.
  *
  * @returns Current context pointer.
- * @param   uFlatPtr    The flat address to convert.
- */
-DECLINLINE(void BS3_FAR *) Bs3XptrFlatToCurrent(uint32_t uFlatPtr)
+ * @param   uFlatPtr    The flat address to convert (32-bit or 64-bit).
+ */
+DECLINLINE(void BS3_FAR *) Bs3XptrFlatToCurrent(RTCCUINTXREG uFlatPtr)
 {
     BS3_XPTR_AUTO(void, pTmp);
@@ -1395 +1395 @@
 
 /**
- * Gets a 32-bit flat address from a working poitner.
- *
- * @returns 32-bit flat address.
+ * Gets a flat address from a working poitner.
+ *
+ * @returns flat address (32-bit or 64-bit).
  * @param   pv          Current context pointer.
  */
-DECLINLINE(uint32_t) Bs3SelPtrToFlat(void BS3_FAR *pv)
+DECLINLINE(RTCCUINTXREG) Bs3SelPtrToFlat(void BS3_FAR *pv)
 {
 #if ARCH_BITS == 16
     return Bs3SelFar32ToFlat32(BS3_FP_OFF(pv), BS3_FP_SEG(pv));
 #else
-    return (uint32_t)(uintptr_t)pv;
+    return (uintptr_t)pv;
 #endif
 }
@@ -1722 +1722 @@
 #define Bs3PagingInitRootForLM BS3_CMN_NM(Bs3PagingInitRootForLM) /**< Selects #Bs3PagingInitRootForLM_c16, #Bs3PagingInitRootForLM_c32 or #Bs3PagingInitRootForLM_c64. */
 
+/**
+ * Modifies the page table protection of an address range.
+ *
+ * This only works on the lowest level of the page tables in the current mode.
+ *
+ * Since we generally use the largest pages available when setting up the
+ * initial page tables, this function will usually have to allocate and create
+ * more tables.  This may fail if we're low on memory.
+ *
+ * @returns IPRT status code.
+ * @param   uFlat       The flat address of the first page in the range (rounded
+ *                      down nearest page boundrary).
+ * @param   cb          The range size from @a pv (rounded up to nearest page boundrary).
+ * @param   fSet        Mask of zero or more X86_PTE_XXX values to set for the range.
+ * @param   fClear      Mask of zero or more X86_PTE_XXX values to clear for the range.
+ */
+BS3_DECL(int) Bs3PagingProtect_c16(uint64_t uFlat, uint64_t cb, uint64_t fSet, uint64_t fClear);
+BS3_DECL(int) Bs3PagingProtect_c32(uint64_t uFlat, uint64_t cb, uint64_t fSet, uint64_t fClear); /**< @copydoc Bs3PagingProtect_c16 */
+BS3_DECL(int) Bs3PagingProtect_c64(uint64_t uFlat, uint64_t cb, uint64_t fSet, uint64_t fClear); /**< @copydoc Bs3PagingProtect_c16 */
+#define Bs3PagingProtect BS3_CMN_NM(Bs3PagingProtect) /**< Selects #Bs3PagingProtect_c16, #Bs3PagingProtect_c32 or #Bs3PagingProtect_c64. */
+
+/**
+ * Modifies the page table protection of an address range.
+ *
+ * This only works on the lowest level of the page tables in the current mode.
+ *
+ * Since we generally use the largest pages available when setting up the
+ * initial page tables, this function will usually have to allocate and create
+ * more tables.  This may fail if we're low on memory.
+ *
+ * @returns IPRT status code.
+ * @param   pv          The address of the first page in the range (rounded
+ *                      down nearest page boundrary).
+ * @param   cb          The range size from @a pv (rounded up to nearest page boundrary).
+ * @param   fSet        Mask of zero or more X86_PTE_XXX values to set for the range.
+ * @param   fClear      Mask of zero or more X86_PTE_XXX values to clear for the range.
+ */
+BS3_DECL(int) Bs3PagingProtectPtr_c16(void BS3_FAR *pv, size_t cb, uint64_t fSet, uint64_t fClear);
+BS3_DECL(int) Bs3PagingProtectPtr_c32(void BS3_FAR *pv, size_t cb, uint64_t fSet, uint64_t fClear); /**< @copydoc Bs3PagingProtectPtr_c16 */
+BS3_DECL(int) Bs3PagingProtectPtr_c64(void BS3_FAR *pv, size_t cb, uint64_t fSet, uint64_t fClear); /**< @copydoc Bs3PagingProtectPtr_c16 */
+#define Bs3PagingProtectPtr BS3_CMN_NM(Bs3PagingProtectPtr) /**< Selects #Bs3PagingProtectPtr_c16, #Bs3PagingProtectPtr_c32 or #Bs3PagingProtectPtr_c64. */
 
 /**