VirtualBox

Ignore:
Timestamp:
Jan 1, 2016 1:49:33 AM (9 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
104867
Message:

bs3kit: Debugged 16-bit paged protected mode switcher, adding missing A20 enabling.

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

Legend:

Unmodified
Added
Removed

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

    r59237 r59239  
    465465#
    466466VBOX_BS3KIT_COMMON_SOURCES = \
     467        bs3-cmn-A20Disable.asm \
     468        bs3-cmn-A20Enable.asm \
     469        bs3-cmn-KbdRead.asm \
     470        bs3-cmn-KbdWait.asm \
     471        bs3-cmn-KbdWrite.asm \
    467472        bs3-cmn-Shutdown.asm \
    468473        bs3-cmn-Panic.asm \

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

    r59237 r59239  
    4444     * using 4 GB pages.  So, we only really need one page directory,
    4545     * that's all.
     46     *
     47     * ASSUMES page size extension available, i.e. pentium+.
    4648     */
    47     pPgDir = (PX86PD)Bs3MemAlloc(BS3MEMKIND_TILED, _4K);
     49    pPgDir = (X86PD BS3_FAR *)Bs3MemAlloc(BS3MEMKIND_TILED, _4K);
    4850    if (pPgDir)
    4951    {

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

    r59237 r59239  
    6565
    6666        push    eax
     67        push    ecx
    6768        pushfd
    6869
    6970        ;
    70         ; Make sure PAE is really off.
     71        ; Make sure PAE is really off and that PSE is enabled.
     72        ; ASSUMES PSE supported (pentium+).
    7173        ;
    7274        mov     eax, cr4
    73         test    eax, X86_CR4_PAE
    74         jz      .cr4_is_fine
     75        mov     ecx, eax
    7576        and     eax, ~X86_CR4_PAE
     77        or      eax, X86_CR4_PSE
     78        cmp     eax, ecx
     79        je      .cr4_is_fine
    7680        mov     cr4, eax
    7781.cr4_is_fine:
    … …  
    109113
    110114        popfd
     115        pop     ecx
    111116        pop     eax
    112117        ret

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

    r59237 r59239  
    6969
    7070        push    eax
     71        push    ecx
    7172        pushfd
    7273
    … …  
    7576        ;
    7677        mov     eax, cr4
    77         test    eax, X86_CR4_PAE
    78         jz      .cr4_is_fine
     78        mov     ecx, eax
    7979        and     eax, ~X86_CR4_PAE
     80        or      eax, X86_CR4_PSE
     81        cmp     eax, ecx
     82        je      .cr4_is_fine
    8083        mov     cr4, eax
    8184.cr4_is_fine:
    … …  
    114117
    115118        ;
    116         ; Restore eax and flags (IF).
     119        ; Restore ecx, eax and flags (IF).
    117120        ;
    118121 %if TMPL_BITS < 32
    … …  
    122125        mov     [esp + 8], eax          ; Store it in the place right for 32-bit returns.
    123126 %endif
    124         pop     esp
     127        pop     ecx
     128        pop     eax
    125129        popfd
    126130        ret

  • trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-rm-InitMemory.c

    r58789 r59239  
    159159
    160160    /*
     161     * Enable the A20 gate.
     162     */
     163    Bs3A20Enable();
     164
     165    /*
    161166     * Low memory (4K chunks).
    162167     *      - 0x00000 to 0x004ff - Interrupt Vector table, BIOS data area.
    … …  
    287292        Bs3SlabListInit(&g_aBs3UpperTiledSlabLists[i], g_acbBs3SlabLists[i]);
    288293    }
     294
    289295}
    290296

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

    r59237 r59239  
    896896        { \
    897897            (a_Name).XPtr.u.uLow  = BS3_FP_OFF(pTypeCheck); \
    898             (a_Name).XPtr.u.uHigh = (BS3_FP_SEG(pTypeCheck) & UINT16_C(0xfff8)) - BS3_SEL_TILED; \
     898            (a_Name).XPtr.u.uHigh = ((BS3_FP_SEG(pTypeCheck) & UINT16_C(0xfff8)) - BS3_SEL_TILED) >> 3; \
    899899        } \
    900900        else \
    … …  
    14401440
    14411441/**
     1442 * Enables the A20 gate.
     1443 */
     1444BS3_DECL(void) Bs3A20Enable_c16(void);
     1445BS3_DECL(void) Bs3A20Enable_c32(void); /**< @copydoc Bs3A20Enable_c16 */
     1446BS3_DECL(void) Bs3A20Enable_c64(void); /**< @copydoc Bs3A20Enable_c16 */
     1447#define Bs3A20Enable BS3_CMN_NM(Bs3A20Enable) /**< Selects #Bs3A20Enable_c16, #Bs3A20Enable_c32 or #Bs3A20Enable_c64. */
     1448
     1449/**
     1450 * Enables the A20 gate via the keyboard controller
     1451 */
     1452BS3_DECL(void) Bs3A20EnableViaKbd_c16(void);
     1453BS3_DECL(void) Bs3A20EnableViaKbd_c32(void); /**< @copydoc Bs3A20EnableViaKbd_c16 */
     1454BS3_DECL(void) Bs3A20EnableViaKbd_c64(void); /**< @copydoc Bs3A20EnableViaKbd_c16 */
     1455#define Bs3A20EnableViaKbd BS3_CMN_NM(Bs3A20EnableViaKbd) /**< Selects #Bs3A20EnableViaKbd_c16, #Bs3A20EnableViaKbd_c32 or #Bs3A20EnableViaKbd_c64. */
     1456
     1457/**
     1458 * Enables the A20 gate via the PS/2 control port A.
     1459 */
     1460BS3_DECL(void) Bs3A20EnableViaPortA_c16(void);
     1461BS3_DECL(void) Bs3A20EnableViaPortA_c32(void); /**< @copydoc Bs3A20EnableViaPortA_c16 */
     1462BS3_DECL(void) Bs3A20EnableViaPortA_c64(void); /**< @copydoc Bs3A20EnableViaPortA_c16 */
     1463#define Bs3A20EnableViaPortA BS3_CMN_NM(Bs3A20EnableViaPortA) /**< Selects #Bs3A20EnableViaPortA_c16, #Bs3A20EnableViaPortA_c32 or #Bs3A20EnableViaPortA_c64. */
     1464
     1465/**
     1466 * Disables the A20 gate.
     1467 */
     1468BS3_DECL(void) Bs3A20Disable_c16(void);
     1469BS3_DECL(void) Bs3A20Disable_c32(void); /**< @copydoc Bs3A20Disable_c16 */
     1470BS3_DECL(void) Bs3A20Disable_c64(void); /**< @copydoc Bs3A20Disable_c16 */
     1471#define Bs3A20Disable BS3_CMN_NM(Bs3A20Disable) /**< Selects #Bs3A20Disable_c16, #Bs3A20Disable_c32 or #Bs3A20Disable_c64. */
     1472
     1473/**
     1474 * Disables the A20 gate via the keyboard controller
     1475 */
     1476BS3_DECL(void) Bs3A20DisableViaKbd_c16(void);
     1477BS3_DECL(void) Bs3A20DisableViaKbd_c32(void); /**< @copydoc Bs3A20DisableViaKbd_c16 */
     1478BS3_DECL(void) Bs3A20DisableViaKbd_c64(void); /**< @copydoc Bs3A20DisableViaKbd_c16 */
     1479#define Bs3A20DisableViaKbd BS3_CMN_NM(Bs3A20DisableViaKbd) /**< Selects #Bs3A20DisableViaKbd_c16, #Bs3A20DisableViaKbd_c32 or #Bs3A20DisableViaKbd_c64. */
     1480
     1481/**
     1482 * Disables the A20 gate via the PS/2 control port A.
     1483 */
     1484BS3_DECL(void) Bs3A20DisableViaPortA_c16(void);
     1485BS3_DECL(void) Bs3A20DisableViaPortA_c32(void); /**< @copydoc Bs3A20DisableViaPortA_c16 */
     1486BS3_DECL(void) Bs3A20DisableViaPortA_c64(void); /**< @copydoc Bs3A20DisableViaPortA_c16 */
     1487#define Bs3A20DisableViaPortA BS3_CMN_NM(Bs3A20DisableViaPortA) /**< Selects #Bs3A20DisableViaPortA_c16, #Bs3A20DisableViaPortA_c32 or #Bs3A20DisableViaPortA_c64. */
     1488
     1489
     1490/**
    14421491 * Initializes root page tables for page protected mode (PP16, PP32).
    14431492 *
    … …  
    14501499
    14511500
     1501/**
     1502 * Waits for the keyboard controller to become ready.
     1503 */
     1504BS3_DECL(void) Bs3KbdWait_c16(void);
     1505BS3_DECL(void) Bs3KbdWait_c32(void); /**< @copydoc Bs3KbdWait_c16 */
     1506BS3_DECL(void) Bs3KbdWait_c64(void); /**< @copydoc Bs3KbdWait_c16 */
     1507#define Bs3KbdWait BS3_CMN_NM(Bs3KbdWait) /**< Selects #Bs3KbdWait_c16, #Bs3KbdWait_c32 or #Bs3KbdWait_c64. */
     1508
     1509/**
     1510 * Sends a read command to the keyboard controller and gets the result.
     1511 *
     1512 * The caller is responsible for making sure the keyboard controller is ready
     1513 * for a command (call #Bs3KbdWait if unsure).
     1514 *
     1515 * @returns      The value read is returned (in al).
     1516 * @param        bCmd            The read command.
     1517 */
     1518BS3_DECL(uint8_t) Bs3KbdRead_c16(uint8_t bCmd);
     1519BS3_DECL(uint8_t) Bs3KbdRead_c32(uint8_t bCmd); /**< @copydoc Bs3KbdRead_c16 */
     1520BS3_DECL(uint8_t) Bs3KbdRead_c64(uint8_t bCmd); /**< @copydoc Bs3KbdRead_c16 */
     1521#define Bs3KbdRead BS3_CMN_NM(Bs3KbdRead) /**< Selects #Bs3KbdRead_c16, #Bs3KbdRead_c32 or #Bs3KbdRead_c64. */
     1522
     1523/**
     1524 * Sends a write command to the keyboard controller and then sends the data.
     1525 *
     1526 * The caller is responsible for making sure the keyboard controller is ready
     1527 * for a command (call #Bs3KbdWait if unsure).
     1528 *
     1529 * @param        bCmd           The write command.
     1530 * @param        bData          The data to write.
     1531 */
     1532BS3_DECL(void) Bs3KbdWrite_c16(uint8_t bCmd, uint8_t bData);
     1533BS3_DECL(void) Bs3KbdWrite_c32(uint8_t bCmd, uint8_t bData); /**< @copydoc Bs3KbdWrite_c16 */
     1534BS3_DECL(void) Bs3KbdWrite_c64(uint8_t bCmd, uint8_t bData); /**< @copydoc Bs3KbdWrite_c16 */
     1535#define Bs3KbdWrite BS3_CMN_NM(Bs3KbdWrite) /**< Selects #Bs3KbdWrite_c16, #Bs3KbdWrite_c32 or #Bs3KbdWrite_c64. */
     1536
    14521537/** @} */
    14531538
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