VirtualBox

Changeset 66175 in vbox


Ignore:
Timestamp:
Mar 21, 2017 11:05:19 AM (8 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
114087
Message:

bs3kit: Preparing for new Bs3TestDoModes style API that uses worker with the highest bit-count for each mode.

Location:
trunk/src/VBox/ValidationKit/bootsectors/bs3kit
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-TestDoModes.c

    r65959 r66175  
    11/* $Id$ */
    22/** @file
    3  * BS3Kit - Bs3TestDoModeTests
     3 * BS3Kit - Bs3TestDoModes
    44 */
    55
    … …  
    3737# include "bs3-cmn-test.h"
    3838#endif
    39 
    40 
    41 /*********************************************************************************************************************************
    42 *   Defined Constants And Macros                                                                                                 *
    43 *********************************************************************************************************************************/
    44 /** @def CONV_TO_FLAT
    45  * Get flat address.  In 16-bit the parameter is a real mode far address, while
    46  * in 32-bit and 64-bit modes it is already flat.
    47  */
    48 /** @def CONV_TO_PROT_FAR16
    49  * Get a 32-bit value that makes a protected mode far 16:16 address.
    50  */
    51 /** @def CONV_TO_RM_FAR16
    52  * Get a 32-bit value that makes a real mode far 16:16 address.  In 16-bit mode
    53  * this is already what we've got, except must be converted to uint32_t.
    54  */
    55 #if ARCH_BITS == 16
    56 # define CONV_TO_FLAT(a_fpfn)           (((uint32_t)BS3_FP_SEG(a_fpfn) << 4) + BS3_FP_OFF(a_fpfn))
    57 # define CONV_TO_PROT_FAR16(a_fpfn)     RT_MAKE_U32(BS3_FP_OFF(a_fpfn), Bs3SelRealModeCodeToProtMode(BS3_FP_SEG(a_fpfn)))
    58 # define CONV_TO_RM_FAR16(a_fpfn)       RT_MAKE_U32(BS3_FP_OFF(a_fpfn), BS3_FP_SEG(a_fpfn))
    59 #else
    60 # define CONV_TO_FLAT(a_fpfn)           ((uint32_t)(uintptr_t)(a_fpfn))
    61 # define CONV_TO_PROT_FAR16(a_fpfn)     Bs3SelFlatCodeToProtFar16((uint32_t)(uintptr_t)(a_fpfn))
    62 # define CONV_TO_RM_FAR16(a_fpfn)       Bs3SelFlatCodeToRealMode( (uint32_t)(uintptr_t)(a_fpfn))
    63 #endif
    64 
    65 
    66 /*********************************************************************************************************************************
    67 *   Assembly Symbols                                                                                                             *
    68 *********************************************************************************************************************************/
    69 /* These are in the same code segment as this code, so no FAR necessary. */
    70 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInRM)(uint32_t uCallbackFarPtr);
    71 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16)(uint32_t uCallbackFarPtr);
    72 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_32)(uint32_t uFlatAddrCallback);
    73 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_V86)(uint32_t uCallbackFarPtr);
    74 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32)(uint32_t uFlatAddrCallback);
    75 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32_16)(uint32_t uCallbackFarPtr);
    76 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPEV86)(uint32_t uCallbackFarPtr);
    77 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16)(uint32_t uCallbackFarPtr);
    78 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_32)(uint32_t uFlatAddrCallback);
    79 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_V86)(uint32_t uCallbackFarPtr);
    80 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32)(uint32_t uFlatAddrCallback);
    81 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32_16)(uint32_t uCallbackFarPtr);
    82 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPPV86)(uint32_t uCallbackFarPtr);
    83 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16)(uint32_t uCallbackFarPtr);
    84 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_32)(uint32_t uFlatAddrCallback);
    85 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_V86)(uint32_t uCallbackFarPtr);
    86 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32)(uint32_t uFlatAddrCallback);
    87 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32_16)(uint32_t uCallbackFarPtr);
    88 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAEV86)(uint32_t uCallbackFarPtr);
    89 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInLM16)(uint32_t uCallbackFarPtr);
    90 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInLM32)(uint32_t uFlatAddrCallback);
    91 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInLM64)(uint32_t uFlatAddrCallback);
     39#include "bs3-mode-TestDoModes.h"
    9240
    9341
    … …  
    255203        {
    256204            PRE_DO_CALL(g_szBs3ModeName_pe16_32);
    257             bErrNo = TMPL_NM(Bs3TestCallDoerInPE16_32)(CONV_TO_FLAT(paEntries[i].pfnDoPE16_32));
     205            bErrNo = TMPL_NM(Bs3TestCallDoerInPE16_32)(CONV_TO_FLAT(paEntries[i].pfnDoPE16_32), BS3_MODE_PE16_32);
    258206            CHECK_RESULT(g_szBs3ModeName_pe16_32);
    259207        }
    … …  
    269217        {
    270218            PRE_DO_CALL(g_szBs3ModeName_pe32);
    271             bErrNo = TMPL_NM(Bs3TestCallDoerInPE32)(CONV_TO_FLAT(paEntries[i].pfnDoPE32));
     219            bErrNo = TMPL_NM(Bs3TestCallDoerInPE32)(CONV_TO_FLAT(paEntries[i].pfnDoPE32), BS3_MODE_PE32);
    272220            CHECK_RESULT(g_szBs3ModeName_pe32);
    273221        }
    … …  
    300248        {
    301249            PRE_DO_CALL(g_szBs3ModeName_pp16_32);
    302             bErrNo = TMPL_NM(Bs3TestCallDoerInPP16_32)(CONV_TO_FLAT(paEntries[i].pfnDoPP16_32));
     250            bErrNo = TMPL_NM(Bs3TestCallDoerInPP16_32)(CONV_TO_FLAT(paEntries[i].pfnDoPP16_32), BS3_MODE_PP16_32);
    303251            CHECK_RESULT(g_szBs3ModeName_pp16_32);
    304252        }
    … …  
    314262        {
    315263            PRE_DO_CALL(g_szBs3ModeName_pp32);
    316             bErrNo = TMPL_NM(Bs3TestCallDoerInPP32)(CONV_TO_FLAT(paEntries[i].pfnDoPP32));
     264            bErrNo = TMPL_NM(Bs3TestCallDoerInPP32)(CONV_TO_FLAT(paEntries[i].pfnDoPP32), BS3_MODE_PP32);
    317265            CHECK_RESULT(g_szBs3ModeName_pp32);
    318266        }
    … …  
    352300        {
    353301            PRE_DO_CALL(g_szBs3ModeName_pae16_32);
    354             bErrNo = TMPL_NM(Bs3TestCallDoerInPAE16_32)(CONV_TO_FLAT(paEntries[i].pfnDoPAE16_32));
     302            bErrNo = TMPL_NM(Bs3TestCallDoerInPAE16_32)(CONV_TO_FLAT(paEntries[i].pfnDoPAE16_32), BS3_MODE_PAE16_32);
    355303            CHECK_RESULT(g_szBs3ModeName_pae16_32);
    356304        }
    … …  
    366314        {
    367315            PRE_DO_CALL(g_szBs3ModeName_pae32);
    368             bErrNo = TMPL_NM(Bs3TestCallDoerInPAE32)(CONV_TO_FLAT(paEntries[i].pfnDoPAE32));
     316            bErrNo = TMPL_NM(Bs3TestCallDoerInPAE32)(CONV_TO_FLAT(paEntries[i].pfnDoPAE32), BS3_MODE_PAE32);
    369317            CHECK_RESULT(g_szBs3ModeName_pae32);
    370318        }
    … …  
    411359        {
    412360            PRE_DO_CALL(g_szBs3ModeName_lm64);
    413             bErrNo = TMPL_NM(Bs3TestCallDoerInLM64)(CONV_TO_FLAT(paEntries[i].pfnDoLM64));
     361            bErrNo = TMPL_NM(Bs3TestCallDoerInLM64)(CONV_TO_FLAT(paEntries[i].pfnDoLM64), BS3_MODE_LM64);
    414362            CHECK_RESULT(g_szBs3ModeName_lm64);
    415363        }

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-TestDoModesByOne.c

    r64703 r66175  
    3737# include "bs3-cmn-test.h"
    3838#endif
    39 
    40 
    41 /*********************************************************************************************************************************
    42 *   Defined Constants And Macros                                                                                                 *
    43 *********************************************************************************************************************************/
    44 /** @def CONV_TO_FLAT
    45  * Get flat address.  In 16-bit the parameter is a real mode far address, while
    46  * in 32-bit and 64-bit modes it is already flat.
    47  */
    48 /** @def CONV_TO_PROT_FAR16
    49  * Get a 32-bit value that makes a protected mode far 16:16 address.
    50  */
    51 /** @def CONV_TO_RM_FAR16
    52  * Get a 32-bit value that makes a real mode far 16:16 address.  In 16-bit mode
    53  * this is already what we've got, except must be converted to uint32_t.
    54  */
    55 #if ARCH_BITS == 16
    56 # define CONV_TO_FLAT(a_fpfn)           (((uint32_t)BS3_FP_SEG(a_fpfn) << 4) + BS3_FP_OFF(a_fpfn))
    57 # define CONV_TO_PROT_FAR16(a_fpfn)     RT_MAKE_U32(BS3_FP_OFF(a_fpfn), Bs3SelRealModeCodeToProtMode(BS3_FP_SEG(a_fpfn)))
    58 # define CONV_TO_RM_FAR16(a_fpfn)       RT_MAKE_U32(BS3_FP_OFF(a_fpfn), BS3_FP_SEG(a_fpfn))
    59 #else
    60 # define CONV_TO_FLAT(a_fpfn)           ((uint32_t)(uintptr_t)(a_fpfn))
    61 # define CONV_TO_PROT_FAR16(a_fpfn)     Bs3SelFlatCodeToProtFar16((uint32_t)(uintptr_t)(a_fpfn))
    62 # define CONV_TO_RM_FAR16(a_fpfn)       Bs3SelFlatCodeToRealMode( (uint32_t)(uintptr_t)(a_fpfn))
    63 #endif
     39#include "bs3-mode-TestDoModes.h"
    6440
    6541
    … …  
    6743*   Assembly Symbols                                                                                                             *
    6844*********************************************************************************************************************************/
    69 /* These are in the same code segment as this code, so no FAR necessary. */
    70 #if ARCH_BITS != 64
    71 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInRM)(uint32_t uCallbackFarPtr);
    72 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16)(uint32_t uCallbackFarPtr);
    73 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_32)(uint32_t uFlatAddrCallback);
    74 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_V86)(uint32_t uCallbackFarPtr);
    75 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32)(uint32_t uFlatAddrCallback);
    76 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32_16)(uint32_t uCallbackFarPtr);
    77 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPEV86)(uint32_t uCallbackFarPtr);
    78 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16)(uint32_t uCallbackFarPtr);
    79 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_32)(uint32_t uFlatAddrCallback);
    80 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_V86)(uint32_t uCallbackFarPtr);
    81 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32)(uint32_t uFlatAddrCallback);
    82 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32_16)(uint32_t uCallbackFarPtr);
    83 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPPV86)(uint32_t uCallbackFarPtr);
    84 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16)(uint32_t uCallbackFarPtr);
    85 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_32)(uint32_t uFlatAddrCallback);
    86 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_V86)(uint32_t uCallbackFarPtr);
    87 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32)(uint32_t uFlatAddrCallback);
    88 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32_16)(uint32_t uCallbackFarPtr);
    89 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInPAEV86)(uint32_t uCallbackFarPtr);
    90 #endif
    91 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInLM16)(uint32_t uCallbackFarPtr);
    92 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInLM32)(uint32_t uFlatAddrCallback);
    93 BS3_DECL_NEAR(uint8_t) TMPL_NM(Bs3TestCallDoerInLM64)(uint32_t uFlatAddrCallback);
    94 
    95 
    9645/* Assembly helpers for switching to the work bitcount and calling it. */
    9746BS3_DECL_FAR(uint8_t) Bs3TestCallDoerTo16_f16(uint8_t bMode);
    … …  
    213162            PRE_DO_CALL(g_szBs3ModeName_pe16_32);
    214163# if ARCH_BITS == 32
    215             bErrNo = TMPL_NM(Bs3TestCallDoerInPE16_32)(CONV_TO_FLAT(paEntries[i].pfnWorker));
    216 # else
    217             bErrNo = TMPL_NM(Bs3TestCallDoerInPE16_32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)));
     164            bErrNo = TMPL_NM(Bs3TestCallDoerInPE16_32)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_PE16_32);
     165# else
     166            bErrNo = TMPL_NM(Bs3TestCallDoerInPE16_32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)), BS3_MODE_PE16_32);
    218167# endif
    219168            CHECK_RESULT(g_szBs3ModeName_pe16_32);
    … …  
    235184            PRE_DO_CALL(g_szBs3ModeName_pe32);
    236185# if ARCH_BITS == 32
    237             bErrNo = TMPL_NM(Bs3TestCallDoerInPE32)(CONV_TO_FLAT(paEntries[i].pfnWorker));
    238 # else
    239             bErrNo = TMPL_NM(Bs3TestCallDoerInPE32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)));
     186            bErrNo = TMPL_NM(Bs3TestCallDoerInPE32)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_PE32);
     187# else
     188            bErrNo = TMPL_NM(Bs3TestCallDoerInPE32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)), BS3_MODE_PE32);
    240189# endif
    241190            CHECK_RESULT(g_szBs3ModeName_pe32);
    … …  
    282231            PRE_DO_CALL(g_szBs3ModeName_pp16_32);
    283232# if ARCH_BITS == 32
    284             bErrNo = TMPL_NM(Bs3TestCallDoerInPP16_32)(CONV_TO_FLAT(paEntries[i].pfnWorker));
    285 # else
    286             bErrNo = TMPL_NM(Bs3TestCallDoerInPP16_32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)));
     233            bErrNo = TMPL_NM(Bs3TestCallDoerInPP16_32)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_PP16_32);
     234# else
     235            bErrNo = TMPL_NM(Bs3TestCallDoerInPP16_32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)), BS3_MODE_PP16_32);
    287236# endif
    288237            CHECK_RESULT(g_szBs3ModeName_pp16_32);
    … …  
    304253            PRE_DO_CALL(g_szBs3ModeName_pp32);
    305254# if ARCH_BITS == 32
    306             bErrNo = TMPL_NM(Bs3TestCallDoerInPP32)(CONV_TO_FLAT(paEntries[i].pfnWorker));
    307 # else
    308             bErrNo = TMPL_NM(Bs3TestCallDoerInPP32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)));
     255            bErrNo = TMPL_NM(Bs3TestCallDoerInPP32)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_PP32);
     256# else
     257            bErrNo = TMPL_NM(Bs3TestCallDoerInPP32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)), BS3_MODE_PP32);
    309258# endif
    310259            CHECK_RESULT(g_szBs3ModeName_pp32);
    … …  
    352301            PRE_DO_CALL(g_szBs3ModeName_pae16_32);
    353302# if ARCH_BITS == 32
    354             bErrNo = TMPL_NM(Bs3TestCallDoerInPAE16_32)(CONV_TO_FLAT(paEntries[i].pfnWorker));
    355 # else
    356             bErrNo = TMPL_NM(Bs3TestCallDoerInPAE16_32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)));
     303            bErrNo = TMPL_NM(Bs3TestCallDoerInPAE16_32)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_PAE16_32);
     304# else
     305            bErrNo = TMPL_NM(Bs3TestCallDoerInPAE16_32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)), BS3_MODE_PAE16_32);
    357306# endif
    358307            CHECK_RESULT(g_szBs3ModeName_pae16_32);
    … …  
    374323            PRE_DO_CALL(g_szBs3ModeName_pae32);
    375324# if ARCH_BITS == 32
    376             bErrNo = TMPL_NM(Bs3TestCallDoerInPAE32)(CONV_TO_FLAT(paEntries[i].pfnWorker));
    377 # else
    378             bErrNo = TMPL_NM(Bs3TestCallDoerInPAE32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)));
     325            bErrNo = TMPL_NM(Bs3TestCallDoerInPAE32)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_PAE32);
     326# else
     327            bErrNo = TMPL_NM(Bs3TestCallDoerInPAE32)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c32)), BS3_MODE_PAE32);
    379328# endif
    380329            CHECK_RESULT(g_szBs3ModeName_pae32);
    … …  
    441390            PRE_DO_CALL(g_szBs3ModeName_lm64);
    442391#if ARCH_BITS == 64
    443             bErrNo = TMPL_NM(Bs3TestCallDoerInLM64)(CONV_TO_FLAT(paEntries[i].pfnWorker));
     392            bErrNo = TMPL_NM(Bs3TestCallDoerInLM64)(CONV_TO_FLAT(paEntries[i].pfnWorker), BS3_MODE_LM64);
    444393#else
    445             bErrNo = TMPL_NM(Bs3TestCallDoerInLM64)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c64)));
     394            bErrNo = TMPL_NM(Bs3TestCallDoerInLM64)(CONV_TO_FLAT(RT_CONCAT3(Bs3TestCallDoerTo,ARCH_BITS,_c64)), BS3_MODE_LM64);
    446395#endif
    447396            CHECK_RESULT(g_szBs3ModeName_lm64);

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-mode-TestDoModesHlp.asm

    r64694 r66175  
    366366
    367367;;
    368 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPE16_32(uint16_t offBs3Text16);
     368; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPE16_32(uint32_t FlatWorkerAddr, uint8_t bMode);
    369369; @uses     rax
    370370BS3_PROC_BEGIN_MODE Bs3TestCallDoerInPE16_32, BS3_PBC_NEAR
    … …  
    373373.doit:
    374374        mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     375        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    375376
    376377        ; Mode switch, make the call, switch back.
    … …  
    384385        STRICT_CHECK_REGS
    385386
    386         push    BS3_MODE_PE16_32
     387        push    edx                     ; bMode
    387388        call    eax
    388389
    … …  
    437438
    438439;;
    439 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPE32(uint16_t offBs3Text16);
     440; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPE32(uint32_t FlatWorkerAddr, uint8_t bMode);
    440441; @uses     rax
    441442BS3_PROC_BEGIN_MODE Bs3TestCallDoerInPE32, BS3_PBC_NEAR
    … …  
    444445.doit:
    445446        mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     447        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    446448
    447449        ; Mode switch, make the call, switch back.
    … …  
    455457        STRICT_CHECK_REGS
    456458
    457         push    BS3_MODE_PE32
     459        push    edx                     ; bMode
    458460        call    eax
    459461
    … …  
    598600
    599601;;
    600 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPP16_32(uint16_t offBs3Text16);
     602; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPP16_32(uint32_t uFlatWorkerAddr, uint8_t bMode);
    601603; @uses     rax
    602604BS3_PROC_BEGIN_MODE Bs3TestCallDoerInPP16_32, BS3_PBC_NEAR
    … …  
    605607.doit:
    606608        mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     609        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    607610
    608611        ; Mode switch, make the call, switch back.
    … …  
    616619        STRICT_CHECK_REGS
    617620
    618         push    BS3_MODE_PP16_32
     621        push    edx
    619622        call    eax
    620623
    … …  
    669672
    670673;;
    671 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPP32(uint16_t offBs3Text16);
     674; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPP32(uint32_t uFlatWorkerAddr, uint8_t bMode);
    672675; @uses     rax
    673676BS3_PROC_BEGIN_MODE Bs3TestCallDoerInPP32, BS3_PBC_NEAR
    … …  
    676679.doit:
    677680        mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     681        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    678682
    679683        ; Mode switch, make the call, switch back.
    … …  
    687691        STRICT_CHECK_REGS
    688692
    689         push    BS3_MODE_PP32
     693        push    edx                     ; bMode
    690694        call    eax
    691695
    … …  
    829833
    830834;;
    831 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPAE16_32(uint16_t offBs3Text16);
     835; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPAE16_32(uint32_t uFlatWorkerAddr, uint8_t bMode);
    832836; @uses     rax
    833837BS3_PROC_BEGIN_MODE Bs3TestCallDoerInPAE16_32, BS3_PBC_NEAR
    … …  
    836840.doit:
    837841        mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     842        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    838843
    839844        ; Mode switch, make the call, switch back.
    … …  
    847852        STRICT_CHECK_REGS
    848853
    849         push    BS3_MODE_PAE16_32
     854        push    edx                     ; bMode
    850855        call    eax
    851856
    … …  
    900905
    901906;;
    902 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPAE32(uint16_t offBs3Text16);
     907; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInPAE32(uint32_t uFlatWorkerAddr, uint8_t bMode);
    903908; @uses     rax
    904909BS3_PROC_BEGIN_MODE Bs3TestCallDoerInPAE32, BS3_PBC_NEAR
    … …  
    907912.doit:
    908913        mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     914        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    909915
    910916        ; Mode switch, make the call, switch back.
    … …  
    918924        STRICT_CHECK_REGS
    919925
    920         push    BS3_MODE_PAE32
     926        push    edx                     ; bMode
    921927        call    eax
    922928
    … …  
    10911097
    10921098;;
    1093 ; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInLM64(uint16_t offBs3Text16);
     1099; @cproto   BS3_DECL(uint8_t) Bs3TestCallDoerInLM64(uint32_t uFlatWorkerAddr, uint8_t bMode);
    10941100; @uses     rax
    10951101BS3_PROC_BEGIN_MODE Bs3TestCallDoerInLM64, BS3_PBC_NEAR
    … …  
    10971103        jmp     TMPL_NM(bs3TestCallDoerPrologue)
    10981104.doit:
    1099         mov     eax, [xBP + xCB + cbCurRetAddr]      ; Load function pointer.
     1105        mov     eax, [xBP + xCB + cbCurRetAddr]     ; Load function pointer.
     1106        movzx   edx, byte [xBP + xCB + cbCurRetAddr + sCB] ; bMode
    11001107
    11011108        ; Mode switch, make the call, switch back.
    … …  
    11111118        and     rsp, ~0fh
    11121119        sub     rsp, 18h
    1113         push    BS3_MODE_LM64
     1120        push    rdx                     ; bMode
    11141121        BS3_CALL rax, 1
    11151122
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