Changeset 97320 in vbox

Timestamp:

Oct 27, 2022 12:45:25 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154311

Message:

ValKit/bs3kit: Added a Bs3SelSetup32BitCode function for quickly setting up a 32-bit code segment.

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-SelSetup32BitCode.c (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-SelSetup16BitCode.c ) (2 diffs)
• bs3kit-autostubs.kmk (modified) (1 diff)
• bs3kit-mangling-code-define.h (modified) (1 diff)
• bs3kit-mangling-code-undef.h (modified) (1 diff)
• bs3kit.h (modified) (1 diff)

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

@@ -194 +194 @@
        bs3-cmn-SelSetup16BitData.c \
        bs3-cmn-SelSetup16BitCode.c \
+       bs3-cmn-SelSetup32BitCode.c \
        bs3-cmn-SlabInit.c \
        bs3-cmn-SlabAlloc.c \

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-SelSetup32BitCode.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - Bs3SelSetup16BitCode
+ * BS3Kit - Bs3SelSetup32BitCode
  */
 
@@ -42 +42 @@
 
 
-#undef Bs3SelSetup16BitCode
-BS3_CMN_DEF(void, Bs3SelSetup16BitCode,(X86DESC BS3_FAR *pDesc, uint32_t uBaseAddr, uint8_t bDpl))
+#undef Bs3SelSetup32BitCode
+BS3_CMN_DEF(void, Bs3SelSetup32BitCode,(X86DESC BS3_FAR *pDesc, uint32_t uBaseAddr, uint32_t uLimit, uint8_t bDpl))
 {
-    pDesc->Gen.u16LimitLow = UINT16_C(0xffff);
-    pDesc->Gen.u16BaseLow  = (uint16_t)uBaseAddr;
-    pDesc->Gen.u8BaseHigh1 = (uint8_t)(uBaseAddr >> 16);
-    pDesc->Gen.u4Type      = X86_SEL_TYPE_ER_ACC;
-    pDesc->Gen.u1DescType  = 1; /* data/code */
-    pDesc->Gen.u2Dpl       = bDpl & 3;
-    pDesc->Gen.u1Present   = 1;
-    pDesc->Gen.u4LimitHigh = 0;
-    pDesc->Gen.u1Available = 0;
-    pDesc->Gen.u1Long      = 0;
-    pDesc->Gen.u1DefBig    = 0;
-    pDesc->Gen.u1Granularity = 0;
-    pDesc->Gen.u8BaseHigh2 = (uint8_t)(uBaseAddr >> 24);
+    uint8_t const cLimitShift = uLimit <= UINT32_C(0xfffff) ? 0 : 12;
+    pDesc->Gen.u16LimitLow    = (uint16_t)(uLimit >> cLimitShift);
+    pDesc->Gen.u16BaseLow     = (uint16_t)uBaseAddr;
+    pDesc->Gen.u8BaseHigh1    = (uint8_t)(uBaseAddr >> 16);
+    pDesc->Gen.u4Type         = X86_SEL_TYPE_ER_ACC;
+    pDesc->Gen.u1DescType     = 1; /* data/code */
+    pDesc->Gen.u2Dpl          = bDpl & 3;
+    pDesc->Gen.u1Present      = 1;
+    pDesc->Gen.u4LimitHigh    = (unsigned)(uLimit >> (16 + cLimitShift));
+    pDesc->Gen.u1Available    = 0;
+    pDesc->Gen.u1Long         = 0;
+    pDesc->Gen.u1DefBig       = 1;
+    pDesc->Gen.u1Granularity  = cLimitShift != 0;
+    pDesc->Gen.u8BaseHigh2    = (uint8_t)(uBaseAddr >> 24);
 }
 

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-autostubs.kmk

@@ -141 +141 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetup16BitCode)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetup16BitData)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetup32BitCode)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabInit)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListAdd)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-define.h

@@ -171 +171 @@
 #define Bs3SelSetup16BitCode BS3_CMN_MANGLER(Bs3SelSetup16BitCode)
 #define Bs3SelSetup16BitData BS3_CMN_MANGLER(Bs3SelSetup16BitData)
+#define Bs3SelSetup32BitCode BS3_CMN_MANGLER(Bs3SelSetup32BitCode)
 #define Bs3Shutdown BS3_CMN_MANGLER(Bs3Shutdown)
 #define Bs3SlabAlloc BS3_CMN_MANGLER(Bs3SlabAlloc)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-undef.h

@@ -171 +171 @@
 #undef Bs3SelSetup16BitCode
 #undef Bs3SelSetup16BitData
+#undef Bs3SelSetup32BitCode
 #undef Bs3Shutdown
 #undef Bs3SlabAlloc

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

@@ -1975 +1975 @@
 BS3_CMN_PROTO_STUB(void, Bs3SelSetup16BitCode,(X86DESC BS3_FAR *pDesc, uint32_t uBaseAddr, uint8_t bDpl));
 
+/**
+ * Sets up a 32-bit execute-read selector with a user specified limit.
+ *
+ * @param   pDesc       Pointer to the descriptor table entry.
+ * @param   uBaseAddr   The base address of the descriptor.
+ * @param   uLimit      The limit. (This is included here and not in the 16-bit
+ *                      functions because we're more likely to want to set it
+ *                      than for 16-bit selectors.)
+ * @param   bDpl        The descriptor privilege level.
+ */
+BS3_CMN_PROTO_STUB(void, Bs3SelSetup32BitCode,(X86DESC BS3_FAR *pDesc, uint32_t uBaseAddr, uint32_t uLimit, uint8_t bDpl));
+
 
 /**