VirtualBox

Changeset 59938 in vbox for trunk


Ignore:
Timestamp:
Mar 7, 2016 8:13:01 AM (9 years ago)
Author:
vboxsync
Message:

bs3kit: updates.

Location:
trunk/src/VBox/ValidationKit/bootsectors
Files:
16 edited

Legend:

Unmodified
Added
Removed

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

    r59937 r59938  
    421421        $(PATH_OBJ)/bs3kit-rm/bs3kit-rm.lib \
    422422        $(PATH_OBJ)/bs3kit-pe16/bs3kit-pe16.lib \
     423        $(PATH_OBJ)/bs3kit-pe16_32/bs3kit-pe16_32.lib \
     424        $(PATH_OBJ)/bs3kit-pe16_v86/bs3kit-pe16_v86.lib \
    423425        $(PATH_OBJ)/bs3kit-pe32/bs3kit-pe32.lib \
     426        $(PATH_OBJ)/bs3kit-pe32_16/bs3kit-pe32_16.lib \
    424427        $(PATH_OBJ)/bs3kit-pev86/bs3kit-pev86.lib \
    425428        $(PATH_OBJ)/bs3kit-pp16/bs3kit-pp16.lib \
     429        $(PATH_OBJ)/bs3kit-pp16_32/bs3kit-pp16_32.lib \
     430        $(PATH_OBJ)/bs3kit-pp16_v86/bs3kit-pp16_v86.lib \
    426431        $(PATH_OBJ)/bs3kit-pp32/bs3kit-pp32.lib \
     432        $(PATH_OBJ)/bs3kit-pp32_16/bs3kit-pp32_16.lib \
    427433        $(PATH_OBJ)/bs3kit-ppv86/bs3kit-ppv86.lib \
    428434        $(PATH_OBJ)/bs3kit-pae16/bs3kit-pae16.lib \
     435        $(PATH_OBJ)/bs3kit-pae16_32/bs3kit-pae16_32.lib \
     436        $(PATH_OBJ)/bs3kit-pae16_v86/bs3kit-pae16_v86.lib \
    429437        $(PATH_OBJ)/bs3kit-pae32/bs3kit-pae32.lib \
     438        $(PATH_OBJ)/bs3kit-pae32_16/bs3kit-pae32_16.lib \
    430439        $(PATH_OBJ)/bs3kit-paev86/bs3kit-paev86.lib \
    431440        $(PATH_OBJ)/bs3kit-lm16/bs3kit-lm16.lib \

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

    r59863 r59938  
    4141#if ARCH_BITS == 16
    4242
    43 uint8_t BS3_DATA_NM(g_bBs3CurrentMode) = BS3_MODE_INVALID;
     43uint8_t BS3_DATA_NM(g_bBs3CurrentMode) = BS3_MODE_RM;
    4444
    4545#endif /* ARCH_BITS == 16 */

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

    r59878 r59938  
    254254        pop     xBP
    255255        ret
    256 BS3_PROC_END_MODE   Bs3EnteredMode
    257 
     256BS3_PROC_END_MODE   Bs3CpuDetect
     257

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

    r59880 r59938  
    2929
    3030BS3_BEGIN_DATA16
    31 BS3_GLOBAL_DATA TMPL_NM(g_szBs3ModeName), %strlen(TMPL_MODE_STR)
     31BS3_GLOBAL_NAME_EX RT_CONCAT3(_g_szBs3ModeName, _, TMPL_MODE_LNAME), , %strlen(TMPL_MODE_STR)
    3232        db TMPL_MODE_STR, 0
    3333

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

    r59287 r59938  
    55
    66;
    7 ; Copyright (C) 2007-2015 Oracle Corporation
     7; Copyright (C) 2007-2016 Oracle Corporation
    88;
    99; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3333%elifdef TMPL_CMN_V86
    3434extern TMPL_NM(Bs3SwitchToRing0)
    35 extern TMPL_NM(Bs3SwitchToV86)
     35extern TMPL_NM(Bs3SwitchTo16BitV86)
    3636%endif
    3737
    … …  
    8181        call    TMPL_NM(Bs3SwitchToRing0)
    8282        call    Bs3PagingInitRootForLM
    83         call    TMPL_NM(Bs3SwitchToV86)
     83        call    TMPL_NM(Bs3SwitchTo16BitV86)
    8484%else
    8585        ;

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

    r59287 r59938  
    3333%elifdef TMPL_CMN_V86
    3434extern TMPL_NM(Bs3SwitchToRing0)
    35 extern TMPL_NM(Bs3SwitchToV86)
     35extern TMPL_NM(Bs3SwitchTo16BitV86)
    3636%endif
    3737
    … …  
    8181        call    TMPL_NM(Bs3SwitchToRing0)
    8282        call    Bs3PagingInitRootForPAE
    83         call    TMPL_NM(Bs3SwitchToV86)
     83        call    TMPL_NM(Bs3SwitchTo16BitV86)
    8484%else
    8585        ;

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

    r59287 r59938  
    3333%elifdef TMPL_CMN_V86
    3434extern TMPL_NM(Bs3SwitchToRing0)
    35 extern TMPL_NM(Bs3SwitchToV86)
     35extern TMPL_NM(Bs3SwitchTo16BitV86)
    3636%endif
    3737
    … …  
    8181        call    TMPL_NM(Bs3SwitchToRing0)
    8282        call    Bs3PagingInitRootForPP
    83         call    TMPL_NM(Bs3SwitchToV86)
     83        call    TMPL_NM(Bs3SwitchTo16BitV86)
    8484%else
    8585        ;

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

    r59934 r59938  
    6767        ; Switch to v8086 mode (return address is already 16-bit).
    6868        ;
    69         extern  _Bs3SwitchToV86_pae16
    70         jmp     _Bs3SwitchToV86_pae16
     69        extern  _Bs3SwitchTo16BitV86_c16
     70        jmp     _Bs3SwitchTo16BitV86_c16
    7171%endif
    7272BS3_PROC_END_MODE   Bs3SwitchToPAE16_V86

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

    r59934 r59938  
    6767        ; Switch to v8086 mode (return address is already 16-bit).
    6868        ;
    69         extern  _Bs3SwitchToV86_pae32
    70         jmp     _Bs3SwitchToV86_pae32
     69        extern  _Bs3SwitchTo16BitV86_c32
     70        jmp     _Bs3SwitchTo16BitV86_c32
    7171%endif
    7272BS3_PROC_END_MODE   Bs3SwitchToPAEV86

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

    r59934 r59938  
    6767        ; Switch to v8086 mode (return address is already 16-bit).
    6868        ;
    69         extern  _Bs3SwitchToV86_pe16
    70         jmp     _Bs3SwitchToV86_pe16
     69        extern  _Bs3SwitchTo16BitV86_c16
     70        jmp     _Bs3SwitchTo16BitV86_c16
    7171%endif
    7272BS3_PROC_END_MODE   Bs3SwitchToPE16_V86

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

    r59934 r59938  
    6767        ; Switch to v8086 mode (return address is already 16-bit).
    6868        ;
    69         extern  _Bs3SwitchToV86_pe32
    70         jmp     _Bs3SwitchToV86_pe32
     69        extern  _Bs3SwitchTo16BitV86_c32
     70        jmp     _Bs3SwitchTo16BitV86_c32
    7171%endif
    7272BS3_PROC_END_MODE   Bs3SwitchToPEV86

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

    r59934 r59938  
    6767        ; Switch to v8086 mode (return address is already 16-bit).
    6868        ;
    69         extern  _Bs3SwitchToV86_pp16
    70         jmp     _Bs3SwitchToV86_pp16
     69        extern  _Bs3SwitchTo16BitV86_c16
     70        jmp     _Bs3SwitchTo16BitV86_c16
    7171%endif
    7272BS3_PROC_END_MODE   Bs3SwitchToPP16_V86

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

    r59934 r59938  
    6767        ; Switch to v8086 mode (return address is already 16-bit).
    6868        ;
    69         extern  _Bs3SwitchToV86_pp32
    70         jmp     _Bs3SwitchToV86_pp32
     69        extern  _Bs3SwitchTo16BitV86_c32
     70        jmp     _Bs3SwitchTo16BitV86_c32
    7171%endif
    7272BS3_PROC_END_MODE   Bs3SwitchToPPV86

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

    r59881 r59938  
    55
    66/*
    7  * Copyright (C) 2007-2015 Oracle Corporation
     7 * Copyright (C) 2007-2016 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    5858BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInRM)(uint16_t offCallback);
    5959BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16)(uint16_t offCallback);
    60 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_32)(uint32_t offCallback);
     60BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_32)(uint32_t uFlatAddrCallback);
    6161BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE16_V86)(uint16_t offCallback);
    62 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32)(uint32_t offCallback);
     62BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32)(uint32_t uFlatAddrCallback);
    6363BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPE32_16)(uint16_t offCallback);
    6464BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPEV86)(uint16_t offCallback);
    6565BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16)(uint16_t offCallback);
    66 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_32)(uint32_t offCallback);
     66BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_32)(uint32_t uFlatAddrCallback);
    6767BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP16_V86)(uint16_t offCallback);
    68 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32)(uint32_t offCallback);
     68BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32)(uint32_t uFlatAddrCallback);
    6969BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPP32_16)(uint16_t offCallback);
    7070BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPPV86)(uint16_t offCallback);
    7171BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16)(uint16_t offCallback);
    72 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_32)(uint32_t offCallback);
     72BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_32)(uint32_t uFlatAddrCallback);
    7373BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE16_V86)(uint16_t offCallback);
    74 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32)(uint32_t offCallback);
     74BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32)(uint32_t uFlatAddrCallback);
    7575BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAE32_16)(uint16_t offCallback);
    7676BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInPAEV86)(uint16_t offCallback);
    7777BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInLM16)(uint16_t offCallback);
    78 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInLM32)(uint32_t offCallback);
    79 BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInLM64)(uint32_t offCallback);
     78BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInLM32)(uint32_t uFlatAddrCallback);
     79BS3_DECL(uint8_t) TMPL_NM(Bs3TestCallDoerInLM64)(uint32_t uFlatAddrCallback);
    8080
    8181
    … …  
    169169}
    170170
    171 
    172 BS3_DECL(void) TMPL_NM(Bs3TestDoModeTests)(PCBS3TESTMODEENTRY paEntries, unsigned cEntries)
     171BS3_DECL(void) TMPL_NM(Bs3TestDoModes)(PCBS3TESTMODEENTRY paEntries, size_t cEntries)
    173172{
    174173    uint8_t const   bCpuType      = BS3_DATA_NM(g_uBs3CpuDetected) & BS3CPU_TYPE_MASK;

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

    r59935 r59938  
    7474extern RT_CONCAT3(_Bs3SwitchTo,TMPL_MODE_UNAME,_lm16)
    7575extern RT_CONCAT3(_Bs3SwitchTo,TMPL_MODE_UNAME,_lm32)
    76 extern RT_CONCAT3(_Bs3SwitchTo,TMPL_MODE_UNAME,_lm64)
     76extern RT_CONCAT3(Bs3SwitchTo,TMPL_MODE_UNAME,_lm64)
    7777
    7878
    … …  
    602602        BS3_SET_BITS 64
    603603        call    rax
    604         call    RT_CONCAT3(_Bs3SwitchTo,TMPL_MODE_UNAME,_lm64)
     604        call    RT_CONCAT3(Bs3SwitchTo,TMPL_MODE_UNAME,_lm64)
    605605        BS3_SET_BITS TMPL_BITS
    606606        jmp     TMPL_NM(bs3TestCallDoerEpilogue)

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

    r59932 r59938  
    778778
    779779/** The current mode (BS3_MODE_XXX) of CPU \#0. */
    780 extern uint8_t BS3_FAR_DATA BS3_DATA_NM(g_bBs3CurrentMode);
     780extern uint8_t BS3_DATA_NM(g_bBs3CurrentMode);
    781781
    782782
    … …  
    22302230 * @param   cEntries        The number of sub-test entries.
    22312231 */
    2232 BS3_MODE_EXPAND_PROTOTYPES(void, Bs3TestDoModes, (BS3TESTMODEENTRY paEntries, unsigned cEntries));
     2232BS3_MODE_EXPAND_PROTOTYPES(void, Bs3TestDoModes, (PCBS3TESTMODEENTRY paEntries, size_t cEntries));
    22332233
    22342234/** @} */
Note: See TracChangeset for help on using the changeset viewer.

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