Changeset 97430 in vbox

Timestamp:

Nov 7, 2022 1:51:44 PM (2 years ago)

Author:

vboxsync

Message:

ValKit/bs3kit: Added Bs3SelLnkPtrToFlat. bugref:9898

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-SelLnkPtrToFlat.c (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-SelLnkPtrToCurPtr.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) (2 diffs)

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

@@ -192 +192 @@
        bs3-cmn-SelFlatDataToRealMode.asm \
        bs3-cmn-SelLnkPtrToCurPtr.c \
+       bs3-cmn-SelLnkPtrToFlat.c \
        bs3-cmn-SelSetup16BitData.c \
        bs3-cmn-SelSetup16BitCode.c \

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - Bs3SelLnkPtrToCurPtr
+ * BS3Kit - Bs3SelLnkPtrToFlat
  */
 
@@ -38 +38 @@
 
 
-#undef Bs3SelLnkPtrToCurPtr
-BS3_CMN_DEF(void BS3_FAR *, Bs3SelLnkPtrToCurPtr,(void BS3_FAR *pvLnkPtr))
+#undef Bs3SelLnkPtrToFlat
+BS3_CMN_DEF(uint32_t, Bs3SelLnkPtrToFlat,(void BS3_FAR *pvLnkPtr))
 {
 #if ARCH_BITS == 16
-    if (BS3_MODE_IS_RM_OR_V86(g_bBs3CurrentMode))
-        return pvLnkPtr;
-    return (void BS3_FAR *)Bs3SelRealModeDataToProtFar16((uint32_t)pvLnkPtr);
+    return Bs3SelRealModeDataToFlat(pvLnkPtr);
 #else
-    return pvLnkPtr;
+    return (uint32_t)(uintptr_t)pvLnkPtr;
 #endif
 }

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

@@ -37 +37 @@
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelFlatDataToProtFar16,4)
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelFlatDataToRealMode,4)
+$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelLnkPtrToFlat,4)
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelProtFar16DataToFlat,4)
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelProtFar16DataToRealMode,4)

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

@@ -161 +161 @@
 #define Bs3SelFlatDataToRealMode BS3_CMN_MANGLER(Bs3SelFlatDataToRealMode)
 #define Bs3SelLnkPtrToCurPtr BS3_CMN_MANGLER(Bs3SelLnkPtrToCurPtr)
+#define Bs3SelLnkPtrToFlat BS3_CMN_MANGLER(Bs3SelLnkPtrToFlat)
 #define Bs3SelProtFar16DataToFlat BS3_CMN_MANGLER(Bs3SelProtFar16DataToFlat)
 #define Bs3SelProtFar16DataToRealMode BS3_CMN_MANGLER(Bs3SelProtFar16DataToRealMode)

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

@@ -161 +161 @@
 #undef Bs3SelFlatDataToRealMode
 #undef Bs3SelLnkPtrToCurPtr
+#undef Bs3SelLnkPtrToFlat
 #undef Bs3SelProtFar16DataToFlat
 #undef Bs3SelProtFar16DataToRealMode

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

@@ -1944 +1944 @@
 
 /**
+ * Converts a link-time pointer to a flat address.
+ *
+ * @returns 32-bit flag address.
+ * @param   pvLnkPtr    The pointer the linker produced.
+ */
+BS3_CMN_PROTO_FARSTUB(4, uint32_t, Bs3SelLnkPtrToFlat,(void BS3_FAR *pvLnkPtr));
+
+/**
  * Gets a flat address from a working poitner.
  *
@@ -4119 +4127 @@
 
 /**
- * Initialized the X0TEXT16 and X1TEXT16 GDT entries.
+ * Initializes the X0TEXT16 and X1TEXT16 GDT entries.
  */
 BS3_DECL_FAR(void) Bs3InitGdt_rm_far(void);