VirtualBox

Ignore:
Timestamp:
Nov 16, 2023 10:39:49 PM (17 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
160251
Message:

ValKit/bs3kit: Added Bs3SelLnkCodePtrToCurPtr and Bs3SelRealModeCodeToProtFar16; fixed some wlink segment name typos (harmless); and added a segment between BS3X1TEXT16_END and BS3TEXT32 to better tell linker errors apart. bugref:10371

Location:
trunk/src/VBox/ValidationKit/bootsectors
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r102096 r102127  
    612612TEMPLATE_VBoxBS3KitImg_ASOBJSUFF    = .o16
    613613TEMPLATE_VBoxBS3KitImg_ASTOOL       = VBoxNasm
    614 TEMPLATE_VBoxBS3KitImg_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
     614#TEMPLATE_VBoxBS3KitImg_ASFLAGS      = -f obj -g $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
     615TEMPLATE_VBoxBS3KitImg_ASFLAGS      = -f obj $(BS3KIT_NASM_allow_64_bit) -w+orphan-labels
    615616TEMPLATE_VBoxBS3KitImg_ASDEFS       = ASM_FORMAT_OMF RT_NOINC_SEGMENTS __NASM__ ARCH_BITS=16 RT_ARCH_X86 ASM_MODEL_FAR_CODE \
    616617        BS3CLASS16CODE=$(BS3KIT_CLASS_CODE16) BS3KIT_CLASS_DATA16=$(BS3KIT_CLASS_DATA16) \
    … …  
    715716        segment BS3DATA64_END \
    716717        clname BS3CLASS16RMCODE \
    717         segment BS3RMCODE16_START \
    718         segment BS3RMCODE16 \
    719         segment BS3RMCODE16_END \
     718        segment BS3RMTEXT16_START \
     719        segment BS3RMTEXT16 \
     720        segment BS3RMTEXT16_END \
    720721        clname BS3CLASS16X0CODE \
    721         segment BS3X0CODE16_START \
    722         segment BS3X0CODE16 \
    723         segment BS3X0CODE16_END \
     722        segment BS3X0TEXT16_START \
     723        segment BS3X0TEXT16 \
     724        segment BS3X0TEXT16_END \
    724725        clname BS3CLASS16X1CODE \
    725         segment BS3X1CODE16_START \
    726         segment BS3X1CODE16 \
    727         segment BS3X1CODE16_END \
     726        segment BS3X1TEXT16_START \
     727        segment BS3X1TEXT16 \
     728        segment BS3X1TEXT16_END \
     729        clname BS3CLASSSEPARATE16AND32BITCODE \
     730        segment BS3SEPARATE16AND32BITCODE \
     731        segment BS3SEPARATE16AND32BITCODE_END \
    728732        clname BS3CLASS32CODE \
    729733        segment BS3TEXT32_START \
    … …  
    933937        segment BS3DATA64_END \
    934938        clname BS3CLASS16RMCODE \
    935         segment BS3RMCODE16_START \
    936         segment BS3RMCODE16 \
    937         segment BS3RMCODE16_END \
     939        segment BS3RMTEXT16_START \
     940        segment BS3RMTEXT16 \
     941        segment BS3RMTEXT16_END \
    938942        clname BS3CLASS16X0CODE \
    939         segment BS3X0CODE16_START \
    940         segment BS3X0CODE16 \
    941         segment BS3X0CODE16_END \
     943        segment BS3X0TEXT16_START \
     944        segment BS3X0TEXT16 \
     945        segment BS3X0TEXT16_END \
    942946        clname BS3CLASS16X1CODE \
    943         segment BS3X1CODE16_START \
    944         segment BS3X1CODE16 \
    945         segment BS3X1CODE16_END \
     947        segment BS3X1TEXT16_START \
     948        segment BS3X1TEXT16 \
     949        segment BS3X1TEXT16_END \
     950        clname BS3CLASSSEPARATE16AND32BITCODE \
     951        segment BS3SEPARATE16AND32BITCODE \
     952        segment BS3SEPARATE16AND32BITCODE_END \
    946953        clname BS3CLASS32CODE \
    947954        segment BS3TEXT32 \

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

    r98418 r102127  
    184184        bs3-cmn-SelProtModeCodeToRealMode.asm \
    185185        bs3-cmn-SelRealModeCodeToProtMode.asm \
     186        bs3-cmn-SelRealModeCodeToProtFar16.c \
    186187        bs3-cmn-SelFlatCodeToRealMode.asm \
    187188        bs3-cmn-SelFlatCodeToProtFar16.asm \
    … …  
    192193        bs3-cmn-SelFlatDataToProtFar16.asm \
    193194        bs3-cmn-SelFlatDataToRealMode.asm \
     195        bs3-cmn-SelLnkCodePtrToCurPtr.c \
    194196        bs3-cmn-SelLnkPtrToCurPtr.c \
    195197        bs3-cmn-SelLnkPtrToFlat.c \

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-first-common.mac

    r98103 r102127  
    183183    ;db      10,13,'eye-catcher: BS3X0TEXT16',10,13 - messes up switch in C code. Alt. is fConvertFixupp VBoxBs3ObjConverter.cpp.
    184184BS3_BEGIN_X0TEXT16 4
    185 section BS3X0TEXT16_END   align=16 CLASS=BS3CLASS16X0CODE PUBLIC USE16
     185section BS3X0TEXT16_END   align=1 CLASS=BS3CLASS16X0CODE PUBLIC USE16
    186186BS3_GLOBAL_DATA Bs3X0Text16_EndOfSegment, 0
    187187GROUP BS3GROUPX0TEXT16 BS3X0TEXT16_START BS3X0TEXT16 BS3X0TEXT16_END
    … …  
    195195    ;db      10,13,'eye-catcher: BS3X1TEXT16',10,13 - messes up switch in C code. Alt. is fConvertFixupp VBoxBs3ObjConverter.cpp.
    196196BS3_BEGIN_X1TEXT16 4
    197 section BS3X1TEXT16_END   align=16 CLASS=BS3CLASS16X1CODE PUBLIC USE16
    198197BS3_GLOBAL_DATA Bs3X1Text16_EndOfSegment, 0
     198section BS3X1TEXT16_END   align=1 CLASS=BS3CLASS16X1CODE PUBLIC USE16
    199199GROUP BS3GROUPX1TEXT16 BS3X1TEXT16_START BS3X1TEXT16 BS3X1TEXT16_END
     200
     201;
     202; Separate the BS3X1TEXT16_END from BS3_BEGIN_TEXT32 to better help pinpoint
     203; the rigth segment when getting an E2083 linker error.
     204;
     205section BS3SEPARATE16AND32BITCODE     align=16   CLASS=BS3CLASSSEPARATE16AND32BITCODE PUBLIC USE16
     206BS3_GLOBAL_DATA BS3SEPARATE16AND32BITCODE_StartOfSegment, 0
     207    db      10,13,'eye-catcher: 16-32 wedge',10,13
     208section BS3SEPARATE16AND32BITCODE_END align=16   CLASS=BS3CLASSSEPARATE16AND32BITCODE PUBLIC USE16
     209BS3_GLOBAL_DATA BS3SEPARATE16AND32BITCODE_EndOfSegment, 0
     210GROUP BS3SEPARATE16AND32BITCODEGROUP BS3SEPARATE16AND32BITCODE BS3SEPARATE16AND32BITCODE_END
    200211
    201212

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

    r98103 r102127  
    3535#
    3636
     37$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelLnkCodePtrToCurPtr,4)
     38$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelRealModeCodeToProtFar16,4)
    3739$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelFlatDataToProtFar16,4)
    3840$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelFlatDataToRealMode,4)
    … …  
    4345$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelRealModeDataToFlat,4)
    4446$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelRealModeDataToProtFar16,4)
     47$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelLnkPtrToCurPtr,4)
     48$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3ExtCtxRestore,4)
    4549$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3ExtCtxRestoreEx,4)
    46 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3ExtCtxRestore,4)
     50$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3ExtCtxSave,4)
    4751$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3ExtCtxSaveEx,4)
    48 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3ExtCtxSave,4)
    49 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelLnkPtrToCurPtr,4)
    5052$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3SelFar32ToFlat32NoClobber,6)
    5153$(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3RegCtxSaveEx,8)
    5254$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetAbridgedFtw)
    5355$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetMm)
     56$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetMxCsr)
    5457$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetMxCsrMask)
    55 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetMxCsr)
    5658$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetXmm)
    5759$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetYmm)
    … …  
    6567$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetCpuVendor)
    6668$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3StrCpy)
     69$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetModeName)
    6770$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetModeNameShortLower)
    68 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3GetModeName)
    6971$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingAlias)
    7072$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingInitRootForLM)
    … …  
    7274$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingInitRootForPP)
    7375$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingMapRamAbove4GForLM)
     76$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingProtect)
    7477$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingProtectPtr)
    75 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingProtect)
    7678$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingQueryAddressInfo)
    7779$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingUnalias)
    … …  
    9092$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3StrPrintf)
    9193$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3StrPrintfV)
     94$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetSize)
    9295$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetAbridgedFtw)
    9396$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetFcw)
    9497$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetFsw)
    95 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetSize)
    9698$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PicUpdateMask)
    9799$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabFree)
    98100$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestSubErrorCount)
     101$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetMxCsr)
    99102$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetMxCsrMask)
    100 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetMxCsr)
    101103$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelFar32ToFlat32)
    102104$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelProtFar32ToFlat32)
    … …  
    106108$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestQueryCfgU8)
    107109$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetDpl)
    108 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxFree)
    109 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetFcw)
    110 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetFsw)
    111110$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3MemAlloc)
    112111$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3MemAllocZ)
    … …  
    119118$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3PagingSetupCanonicalTraps)
    120119$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3RegCtxGetRspSsAsCurPtr)
     120$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabAlloc)
    121121$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabAllocEx)
    122 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabAlloc)
     122$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListAlloc)
    123123$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListAllocEx)
    124 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListAlloc)
     124$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxFree)
     125$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetFcw)
     126$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetFsw)
    125127$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3MemFree)
    126128$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3MemGuardedTestPageFree)
    … …  
    144146$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetup16BitData)
    145147$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetup32BitCode)
     148$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetupGate)
    146149$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetupGate64)
    147 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SelSetupGate)
    148150$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabInit)
    149151$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3SlabListAdd)
    … …  
    164166$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestTerm)
    165167$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestValue)
     168$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap16Init)
    166169$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap16InitEx)
    167 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap16Init)
    168170$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap16SetGate)
    169171$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap32Init)
    170172$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap32SetGate)
     173$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64Init)
    171174$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64InitEx)
    172 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64Init)
    173175$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Trap64SetGate)
    174176$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapDefaultHandler)
    175177$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapPrintFrame)
    176178$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapReInit)
     179$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapRmV86Init)
    177180$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapRmV86InitEx)
    178 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapRmV86Init)
    179181$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapRmV86SetGate)
    180182$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetHandlerEx)
     183$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestore)
    181184$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestoreInRm)
    182 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestore)
     185$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestoreWithExtCtx)
    183186$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestoreWithExtCtxAndRm)
    184 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestoreWithExtCtx)
    185187$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetJmpAndRestoreWithRm)
    186188$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapUnsetJmp)

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

    r98103 r102127  
    161161#define Bs3SelFlatDataToProtFar16 BS3_CMN_MANGLER(Bs3SelFlatDataToProtFar16)
    162162#define Bs3SelFlatDataToRealMode BS3_CMN_MANGLER(Bs3SelFlatDataToRealMode)
     163#define Bs3SelLnkCodePtrToCurPtr BS3_CMN_MANGLER(Bs3SelLnkCodePtrToCurPtr)
    163164#define Bs3SelLnkPtrToCurPtr BS3_CMN_MANGLER(Bs3SelLnkPtrToCurPtr)
    164165#define Bs3SelLnkPtrToFlat BS3_CMN_MANGLER(Bs3SelLnkPtrToFlat)
    … …  
    168169#define Bs3SelProtModeCodeToRealMode BS3_CMN_MANGLER(Bs3SelProtModeCodeToRealMode)
    169170#define Bs3SelRealModeCodeToFlat BS3_CMN_MANGLER(Bs3SelRealModeCodeToFlat)
     171#define Bs3SelRealModeCodeToProtFar16 BS3_CMN_MANGLER(Bs3SelRealModeCodeToProtFar16)
    170172#define Bs3SelRealModeCodeToProtMode BS3_CMN_MANGLER(Bs3SelRealModeCodeToProtMode)
    171173#define Bs3SelRealModeDataToFlat BS3_CMN_MANGLER(Bs3SelRealModeDataToFlat)
    … …  
    174176#define Bs3SelSetup16BitData BS3_CMN_MANGLER(Bs3SelSetup16BitData)
    175177#define Bs3SelSetup32BitCode BS3_CMN_MANGLER(Bs3SelSetup32BitCode)
     178#define Bs3SelSetupGate BS3_CMN_MANGLER(Bs3SelSetupGate)
    176179#define Bs3SelSetupGate64 BS3_CMN_MANGLER(Bs3SelSetupGate64)
    177 #define Bs3SelSetupGate BS3_CMN_MANGLER(Bs3SelSetupGate)
    178180#define Bs3Shutdown BS3_CMN_MANGLER(Bs3Shutdown)
    179181#define Bs3SlabAlloc BS3_CMN_MANGLER(Bs3SlabAlloc)
    … …  
    234236#define Bs3TrapSetHandler BS3_CMN_MANGLER(Bs3TrapSetHandler)
    235237#define Bs3TrapSetHandlerEx BS3_CMN_MANGLER(Bs3TrapSetHandlerEx)
     238#define Bs3TrapSetJmp BS3_CMN_MANGLER(Bs3TrapSetJmp)
    236239#define Bs3TrapSetJmpAndRestore BS3_CMN_MANGLER(Bs3TrapSetJmpAndRestore)
    237240#define Bs3TrapSetJmpAndRestoreInRm BS3_CMN_MANGLER(Bs3TrapSetJmpAndRestoreInRm)
     241#define Bs3TrapSetJmpAndRestoreWithExtCtx BS3_CMN_MANGLER(Bs3TrapSetJmpAndRestoreWithExtCtx)
    238242#define Bs3TrapSetJmpAndRestoreWithExtCtxAndRm BS3_CMN_MANGLER(Bs3TrapSetJmpAndRestoreWithExtCtxAndRm)
    239 #define Bs3TrapSetJmpAndRestoreWithExtCtx BS3_CMN_MANGLER(Bs3TrapSetJmpAndRestoreWithExtCtx)
    240243#define Bs3TrapSetJmpAndRestoreWithRm BS3_CMN_MANGLER(Bs3TrapSetJmpAndRestoreWithRm)
    241 #define Bs3TrapSetJmp BS3_CMN_MANGLER(Bs3TrapSetJmp)
    242244#define Bs3TrapUnsetJmp BS3_CMN_MANGLER(Bs3TrapUnsetJmp)
    243245#define Bs3UInt32Div BS3_CMN_MANGLER(Bs3UInt32Div)

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

    r98103 r102127  
    161161#undef Bs3SelFlatDataToProtFar16
    162162#undef Bs3SelFlatDataToRealMode
     163#undef Bs3SelLnkCodePtrToCurPtr
    163164#undef Bs3SelLnkPtrToCurPtr
    164165#undef Bs3SelLnkPtrToFlat
    … …  
    168169#undef Bs3SelProtModeCodeToRealMode
    169170#undef Bs3SelRealModeCodeToFlat
     171#undef Bs3SelRealModeCodeToProtFar16
    170172#undef Bs3SelRealModeCodeToProtMode
    171173#undef Bs3SelRealModeDataToFlat
    … …  
    174176#undef Bs3SelSetup16BitData
    175177#undef Bs3SelSetup32BitCode
     178#undef Bs3SelSetupGate
    176179#undef Bs3SelSetupGate64
    177 #undef Bs3SelSetupGate
    178180#undef Bs3Shutdown
    179181#undef Bs3SlabAlloc
    … …  
    234236#undef Bs3TrapSetHandler
    235237#undef Bs3TrapSetHandlerEx
     238#undef Bs3TrapSetJmp
    236239#undef Bs3TrapSetJmpAndRestore
    237240#undef Bs3TrapSetJmpAndRestoreInRm
     241#undef Bs3TrapSetJmpAndRestoreWithExtCtx
    238242#undef Bs3TrapSetJmpAndRestoreWithExtCtxAndRm
    239 #undef Bs3TrapSetJmpAndRestoreWithExtCtx
    240243#undef Bs3TrapSetJmpAndRestoreWithRm
    241 #undef Bs3TrapSetJmp
    242244#undef Bs3TrapUnsetJmp
    243245#undef Bs3UInt32Div

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

    r100782 r102127  
    19011901
    19021902/**
     1903 * Converts a far 16:16 real mode (code) address to a 16-bit protected mode
     1904 * address.
     1905 *
     1906 * This is mainly for converting X0TEXT16 and X1TEXT16 linker pointers to
     1907 * protected mode ones.
     1908 *
     1909 * @returns Protected mode function pointer.
     1910 * @param   uFar1616        Far real mode address (high 16-bit is segment, low
     1911 *                          is offset).  In 16-bit code, this is also the same
     1912 *                          as a linker address.
     1913 */
     1914BS3_CMN_PROTO_FARSTUB(4, PFNBS3FARADDRCONV, Bs3SelRealModeCodeToProtFar16,(PFNBS3FARADDRCONV uFar1616));
     1915
     1916/**
    19031917 * Converts a flat data address to a real mode segment and offset.
    19041918 *
    … …  
    19661980
    19671981/**
    1968  * Converts a link-time pointer to a current context pointer.
     1982 * Converts a link-time data pointer to a current context pointer.
    19691983 *
    19701984 * @returns Converted pointer.
    … …  
    19741988
    19751989/**
    1976  * Converts a link-time pointer to a flat address.
     1990 * Converts a link-time data pointer to a flat address.
    19771991 *
    19781992 * @returns 32-bit flag address.
    … …  
    19801994 */
    19811995BS3_CMN_PROTO_FARSTUB(4, uint32_t, Bs3SelLnkPtrToFlat,(void BS3_FAR *pvLnkPtr));
     1996
     1997/**
     1998 * Converts a link-time code pointer to a current context pointer.
     1999 *
     2000 * @returns Converted function pointer.
     2001 * @param   pfnLnkPtr   The function pointer the linker produced.
     2002 */
     2003BS3_CMN_PROTO_FARSTUB(4, FPFNBS3FAR, Bs3SelLnkCodePtrToCurPtr,(FPFNBS3FAR pfnLnkPtr));
    19822004
    19832005/**
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette