VirtualBox

Changeset 59311 in vbox for trunk/src/VBox/ValidationKit


Ignore:
Timestamp:
Jan 12, 2016 1:16:28 AM (9 years ago)
Author:
vboxsync
Message:

bs3kit: Started on first bs3kit testcase, added Bs3CpuDetect (untested).

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

Legend:

Unmodified
Added
Removed

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

    r59303 r59311  
    4242if defined(VBOX_WITH_OPEN_WATCOM)
    4343 if1of ($(KBUILD_TARGET), win) # requires patched NASM.
     44  VBOX_WITH_BS3KIT = 1
    4445  include $(PATH_SUB_CURRENT)/bs3kit/Makefile.kmk
    4546 endif
    … …  
    205206
    206207
     208ifdef VBOX_WITH_BS3KIT
     209#
     210# Bs3kit
     211#
     212
     213# shutdown example.
     214MISCBINS += bs3-cpu-basic-2
     215bs3-cpu-basic-2_TEMPLATE = VBoxBS3KitImg
     216bs3-cpu-basic-2_SOURCES = \
     217        bs3-cpu-basic-2.asm
     218endif
     219
     220
    207221include $(FILE_KBUILD_SUB_FOOTER)
    208222

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

    r59300 r59311  
    189189bs3kit-rm_DEFS     = TMPL_RM
    190190bs3kit-rm_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES) \
    191         bs3-first-rm.asm
     191        bs3-first-rm.asm \
     192        bs3-mode-CpuDetect.asm
    192193
    193194
    … …  
    197198bs3kit-pe16_DEFS     = TMPL_PE16
    198199bs3kit-pe16_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES) \
    199         bs3-first-pe16.asm
     200        bs3-first-pe16.asm \
     201#       bs3-mode-CpuDetect.asm
    200202
    201203# The virtual 8086 under protected mode BS3Kit library.
    … …  
    217219bs3kit-pp16_DEFS     = TMPL_PP16
    218220bs3kit-pp16_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES) \
     221        bs3-mode-CpuDetect.asm
    219222
    220223# The 32-bit paged protected mode BS3Kit library.
    … …  
    235238bs3kit-pae16_TEMPLATE = VBoxBS3KitImg
    236239bs3kit-pae16_DEFS     = TMPL_PAE16
    237 bs3kit-pae16_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES)
     240bs3kit-pae16_SOURCES  = $(VBOX_BS3KIT_MODE_SOURCES) \
     241        bs3-mode-CpuDetect.asm
    238242
    239243# The 32-bit paged protected mode BS3Kit library.

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-footer.h

    r58628 r59311  
    4949#undef TMPL_CMN_LM
    5050#undef TMPL_CMN_V86
     51#undef TMPL_CMN_PAGING
    5152
    5253#undef TMPL_CMN_P16

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-footer.mac

    r59259 r59311  
    5959%undef TMPL_CMN_LM
    6060%undef TMPL_CMN_V86
     61%undef TMPL_CMN_PAGING
    6162
    6263%undef TMPL_CMN_P16

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-header.h

    r58666 r59311  
    7777# define TMPL_CMN_V86   /**< TMPL_PEV86 | TMPL_PPV86 | TMPL_PAEV86 */
    7878# define TMPL_CMN_R86   /**< TMPL_CMN_V86 | TMPL_RM                */
     79# define TMPL_CMN_PAGING /**< TMPL_CMN_PP | TMPL_CMN_PAE | TMPL_CMN_LM */
    7980/** @} */
    8081
    … …  
    356357# endif
    357358# define TMPL_CMN_PP
     359# define TMPL_CMN_PAGING
    358360# define TMPL_CMN_P16
    359361# define TMPL_16BIT
    … …  
    405407# endif
    406408# define TMPL_CMN_PP
     409# define TMPL_CMN_PAGING
    407410# define TMPL_CMN_P32
    408411# define TMPL_32BIT
    … …  
    454457# endif
    455458# define TMPL_CMN_PP
     459# define TMPL_CMN_PAGING
    456460# define TMPL_CMN_V86
    457461# define TMPL_CMN_R86
    … …  
    504508# endif
    505509# define TMPL_CMN_PAE
     510# define TMPL_CMN_PAGING
    506511# define TMPL_16BIT
    507512# define TMPL_CMN_P16
    … …  
    553558# endif
    554559# define TMPL_CMN_PAE
     560# define TMPL_CMN_PAGING
    555561# define TMPL_CMN_P32
    556562# define TMPL_32BIT
    … …  
    602608# endif
    603609# define TMPL_CMN_PAE
     610# define TMPL_CMN_PAGING
    604611# define TMPL_CMN_V86
    605612# define TMPL_CMN_R86
    … …  
    652659# endif
    653660# define TMPL_CMN_LM
     661# define TMPL_CMN_PAGING
    654662# define TMPL_CMN_P16
    655663# define TMPL_16BIT
    … …  
    701709# endif
    702710# define TMPL_CMN_LM
     711# define TMPL_CMN_PAGING
    703712# define TMPL_CMN_P32
    704713# define TMPL_32BIT
    … …  
    750759# endif
    751760# define TMPL_CMN_LM
     761# define TMPL_CMN_PAGING
    752762# define TMPL_CMN_P64
    753763# define TMPL_64BIT

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-template-header.mac

    r59287 r59311  
    5151;       - TMPL_CMN_V86 = TMPL_PEV86 | TMPL_PPV86 | TMPL_PAEV86
    5252;       - TMPL_CMN_R86 = TMPL_CMN_V86 | TMPL_RM
     53;       - TMPL_CMN_PAGING = TMPL_CMN_PP | TMPL_CMN_PAE | TMPL_CMN_LM
    5354;
    5455%ifdef TMPL_RM
    … …  
    291292 %endif
    292293 %define TMPL_CMN_PP
     294 %define TMPL_CMN_PAGING
    293295 %define TMPL_CMN_P16
    294296 %define TMPL_16BIT
    … …  
    341343 %endif
    342344 %define TMPL_CMN_PP
     345 %define TMPL_CMN_PAGING
    343346 %define TMPL_CMN_P32
    344347 %define TMPL_32BIT
    … …  
    391394 %endif
    392395 %define TMPL_CMN_PP
     396 %define TMPL_CMN_PAGING
    393397 %define TMPL_CMN_V86
    394398 %define TMPL_CMN_R86
    … …  
    442446 %endif
    443447 %define TMPL_CMN_PAE
     448 %define TMPL_CMN_PAGING
    444449 %define TMPL_16BIT
    445450 %define TMPL_CMN_P16
    … …  
    492497 %endif
    493498 %define TMPL_CMN_PAE
     499 %define TMPL_CMN_PAGING
    494500 %define TMPL_CMN_P32
    495501 %define TMPL_32BIT
    … …  
    542548 %endif
    543549 %define TMPL_CMN_PAE
     550 %define TMPL_CMN_PAGING
    544551 %define TMPL_CMN_V86
    545552 %define TMPL_CMN_R86
    … …  
    593600 %endif
    594601 %define TMPL_CMN_LM
     602 %define TMPL_CMN_PAGING
    595603 %define TMPL_CMN_P16
    596604 %define TMPL_16BIT
    … …  
    643651 %endif
    644652 %define TMPL_CMN_LM
     653 %define TMPL_CMN_PAGING
    645654 %define TMPL_CMN_P32
    646655 %define TMPL_32BIT
    … …  
    693702 %endif
    694703 %define TMPL_CMN_LM
     704 %define TMPL_CMN_PAGING
    695705 %define TMPL_CMN_P64
    696706 %define TMPL_64BIT
    … …  
    857867%endif
    858868
     869;; @def BS3_EXTERN_TMPL
     870; Mangles the given name into a template specific one.  For ease of use, the
     871; name is redefined to the mangled one, just like BS3_EXTERN_CMN does.
     872; @note Segment does not change.
     873%macro BS3_EXTERN_TMPL 1
     874 extern TMPL_NM(%1)
     875 %undef  %1
     876 %define %1 TMPL_NM(%1)
     877%endmacro
     878
    859879;
    860880; Default code segment (changes BITS too).
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