Add support for WHPX accelerator on Windows and introduce OVMF Pure EFI firmware

2025-10-05 21:23:42 +02:00
235 changed files with 2158 additions and 16716 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,18 +55,17 @@ add_definitions(-D__XTOS__)
 add_definitions(-DXTOS_SOURCE_DIR="${EXECTOS_SOURCE_DIR}")
 add_definitions(-DXTOS_BINARY_DIR="${EXECTOS_BINARY_DIR}")

-# Add assembler flags
-add_compiler_asmflags(-D__XTOS_ASSEMBLER__)
-
 # Compute __FILE__ definition
 file(RELATIVE_PATH _PATH_PREFIX ${EXECTOS_BINARY_DIR} ${EXECTOS_SOURCE_DIR})
 add_compiler_flags(-D__RELFILE__="&__FILE__[__FILE__[0] == '.' ? sizeof \\\"${_PATH_PREFIX}\\\" - 1 : sizeof XTOS_SOURCE_DIR]")

 # Set the virtual disk image size (in MiB)
-set_disk_image_size(48)
+set_disk_image_size(32)

 # Build all subprojects
 add_subdirectory(boot)
+add_subdirectory(bootdata)
 add_subdirectory(drivers)
 add_subdirectory(sdk)
+add_subdirectory(xtldr)
 add_subdirectory(xtoskrnl)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,7 +9,8 @@ porting drivers, fixing bugs, writing tests, creating documentation, or helping
 love the help.

 ## Wish List
-If you are looking for a way to contribute, but you are not sure where to start, check our list of
+If you are looking for a way to contribute, but you are not sure where to start, check our [IDEAS](IDEAS.md) and
+[KNOWN ISSUES](KNOWN_ISSUES.md) pages for suggestions. We try to keep them up to date. You can also check a list of
 [open issues](https://git.codingworkshop.eu.org/xt-sys/exectos/issues). If you find interesting task and you are serious
 about tackling one, feel free to contact us. We will be able to provide a more detailed information and suggestions
 towards getting started.
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -0,0 +1,9 @@
+## ExectOS Ideas
+This is a list of ideas that migh but not must be realized.
+
+### XTOSKRNL
+ - [ ] Implement mechanism for detecting CPU features and checking hardware requirements. If CPU does not meet
+       requirements, it should cause a kernel panic before any non-supported instruction is being used.
+ - [ ] Finish framebuffer and terminal implementation. Initialization code is already prepared as well as routines for
+       clearing the screen and drawing single points. Terminal should be instantiable (should be able to create many
+       terminals and switch between them) and work on top of FB. It should define ANSI colors and scrollback buffer.
--- a/KNOWN_ISSUES.md
+++ b/KNOWN_ISSUES.md
@@ -0,0 +1,6 @@
+## ExectOS Known Issues
+This is a list of well known bugs that exists in all master branch builds.
+
+### XTLDR
+ - [ ] EFI Runtime Services are not mapped properly into higher half. They are mapped itself, but all pointers inside
+       that structure point to some physical address that is unavailable after paging is enabled.
--- a/README.md
+++ b/README.md
@@ -53,23 +53,20 @@ implement any environment subsystem to support applications that are strictly wr
 * NT drivers compatibility layer

 # Requirements
-ExectOS is currently in a very early stage of development, so its specific requirements are not fully defined yet.
-However, based on the current design, it requires modern EFI hardware. You cannot boot ExectOS on a legacy BIOS
-right now, but there are plans to add BIOS support in the future.
+ExectOS is in very early development stage, thus its requirements have been not specified yet. However according to its
+design, it requires a modern EFI enabled hardware. It is not possible currently to boot ExectOS on a legacy BIOS.

 # Source structure
-| Directory        | Description                                                  |
-|------------------|--------------------------------------------------------------|
-| boot/bootdata    | default configuration and data needed to boot XTOS           |
-| boot/bootsect    | boot sector code (MBR & VBR) initializing the boot process   |
-| boot/xtldr       | XTOS boot loader source code                                 |
-| drivers          | XT native drivers source code                                |
-| sdk/cmake        | host toolchain configuration and build-related functions     |
-| sdk/firmware     | firmware enabling XTOS to boot on virtual machines           |
-| sdk/xtdk         | XT Software Development Kit headers                          |
-| services         | integral subsystems services source code                     |
-| subsystems       | environment subsystems source code                           |
-| xtoskrnl         | XTOS kernel source code                                      |
+| Directory   | Description                                              |
+|-------------|----------------------------------------------------------|
+| bootdata    | default configuration and data needed to boot XTOS       |
+| drivers     | XT native drivers source code                            |
+| sdk/cmake   | Host toolchain configuration and build-related functions |
+| sdk/xtdk    | XT Software Development Kit headers                      |
+| services    | integral subsystems services source code                 |
+| subsystems  | environment subsystems source code                       |
+| xtoskrnl    | XTOS kernel source code                                  |
+| xtldr       | XTOS boot loader source code                             |

 # Build
 XTOS can only be built using [XTchain](https://git.codingworkshop.eu.org/xt-sys/xtchain), a dedicated toolchain designed
--- a/boot/CMakeLists.txt
+++ b/boot/CMakeLists.txt
@@ -1,3 +1 @@
-add_subdirectory(bootdata)
 add_subdirectory(bootsect)
-add_subdirectory(xtldr)
--- a/boot/bootsect/CMakeLists.txt
+++ b/boot/bootsect/CMakeLists.txt
@@ -1,8 +1,6 @@
 # XT Boot Sector
 PROJECT(BOOTSECT)

-add_definitions("-DARCH_ESP_SOURCE=\\\"${ARCH}/cpu.S\\\"")
-
 # Compile boot sectors
 compile_bootsector(mbrboot ${BOOTSECT_SOURCE_DIR}/mbrboot.S 0x7C00 Start)
 compile_bootsector(espboot ${BOOTSECT_SOURCE_DIR}/espboot.S 0x7C00 Start)
--- a/boot/bootsect/amd64/cpu.S
+++ b/boot/bootsect/amd64/cpu.S
@@ -1,144 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            boot/bootsect/amd64/cpu.S
- * DESCRIPTION:     Low-level support for CPU initialization
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-
-BuildPageMap:
-    /* Generate page map for first 1GB of memory */
-    pushaw
-    pushw %es
-    cld
-    movw $(0x1000 / 16), %ax
-    movw %ax, %es
-    xorw %di, %di
-    movl $(0x2000 | 0x07), %eax
-    stosl
-    xorl %eax, %eax
-    movw $1021, %cx
-    rep stosl
-    movw $(0x2000 / 16), %ax
-    movw %ax, %es
-    xorw %di, %di
-    movl $(0x3000 | 0x07), %eax
-    stosl
-    xorl %eax, %eax
-    movw $1021, %cx
-    rep stosl
-    movw $(0x3000 / 16), %ax
-    movw %ax, %es
-    xorw %di, %di
-    movw $512, %cx
-    movl $0x00000083, %eax
-.BuildPageMapLoop:
-    /* Identity map 512 pages of 2MB */
-    movl %eax, %es:(%di)
-    addl $2097152, %eax
-    addw $0x08, %di
-    loop .BuildPageMapLoop
-    popw %es
-    popaw
-    ret
-
-InitializeCpu:
-    /* Check if CPU supports CPUID, long mode and PAE */
-    pushal
-    pushfl
-    popl %eax
-    movl %eax, %ebx
-    xorl $0x00200000, %eax
-    pushl %eax
-    popfl
-    pushfl
-    popl %eax
-    cmpl %ebx, %eax
-    je CpuUnsupported
-    movl $0x01, %eax
-    cpuid
-    testl $0x40, %edx
-    jz CpuUnsupported
-    movl $0x80000000, %eax
-    cpuid
-    cmpl $0x80000000, %eax
-    jbe CpuUnsupported
-    movl $0x80000001, %eax
-    cpuid
-    testl $0x20000000, %edx
-    jz CpuUnsupported
-    popal
-    call LoadGdt
-    ret
-
-LoadGdt:
-    /* Load Global Descriptor Table */
-    lgdt .GdtPointer
-    ret
-
-RunStage2:
-    /* Switch to long mode and pass control to Stage 2 */
-    call BuildPageMap
-    call ParseExecutableHeader
-    xorl %edx, %edx
-    pushl %edx
-    pushl %eax
-    cli
-    xorw %ax, %ax
-    movw %ax, %ds
-    movw %ax, %es
-    movw %ax, %fs
-    movw %ax, %gs
-    movw %ax, %ss
-    movl %cr4, %eax
-    orl $0x00A0, %eax
-    movl %eax, %cr4
-    movl $0x00001000, %eax
-    movl %eax, %cr3
-    movl $0xC0000080, %ecx
-    rdmsr
-    orl $0x00000100, %eax
-    wrmsr
-    movl %cr0, %eax
-    orl $0x80000001, %eax
-    movl %eax, %cr0
-    ljmp $0x10, $.Stage2LongMode
-.code64
-.Stage2LongMode:
-    /* Set segments and stack, then jump to Stage 2 */
-    movw $0x18, %ax
-    movw %ax, %ds
-    movw %ax, %es
-    movw %ax, %ss
-    xorw %ax, %ax
-    movw %ax, %fs
-    movw %ax, %gs
-    popq %rax
-    xorq %rbx, %rbx
-    xorq %rcx, %rcx
-    xorq %rdx, %rdx
-    xorq %rsi, %rsi
-    xorq %rdi, %rdi
-    xorq %rbp, %rbp
-    jmp *%rax
-
-.code16
-.GdtDescriptor:
-    /* Global Descriptor Table */
-    .quad 0x0000000000000000
-    .quad 0x0000000000000000
-    .quad 0x00AF9A000000FFFF
-    .quad 0x00CF92000000FFFF
-    .quad 0x00009E000000FFFF
-    .quad 0x000092000000FFFF
-    .quad 0x00CF9B000000FFFF
-
-.GdtPointer:
-    /* Pointer to Global Descriptor Table */
-    .word .GdtPointer - .GdtDescriptor - 1
-    .long .GdtDescriptor
-
-.Stage2FileName:
-    /* Name of Stage 2 executable file */
-    .ascii "BOOTX64 EFI"
--- a/boot/bootsect/espboot.S
+++ b/boot/bootsect/espboot.S
@@ -84,446 +84,30 @@ RealStart:
    leaw -16(%bp), %sp
    sti

-    /* Get drive number */
-    cmpb $0xFF, DriveNumber - Start(%bp)
-    jne GetDriveParameters
-    movb %dl, DriveNumber - Start(%bp)
-
-GetDriveParameters:
-    /* Get drive parameters from the BIOS */
-    movb DriveNumber - Start(%bp), %dl
-    movb $0x08, %ah
-    movb $0x00, %al
-    int $0x13
-    jnc GetDriveSize
-    movw $0xFFFF, %cx
-    movb %cl, %dh
-
-GetDriveSize:
-    /* Get drive size from the BIOS */
-    movzbl %dh, %eax
-    incw %ax
-    movzbl %cl, %edx
-    andb $0x3F, %dl
-    mulw %dx
-    xchgb %cl, %ch
-    shrb $0x06, %ch
-    incw %cx
-    movzwl %cx, %ecx
-    mull %ecx
-    movl %eax, %edi
-
-VerifyBiosParameterBlock:
-    /* Verify the FAT32 BPB */
-    cmpw $0x00, SectorsPerFat - Start(%bp)
-    jne FsError
-    cmpw $0x00, FsVersion - Start(%bp)
-    ja FsError
-
-ReadExtraCode:
-    /* Read second VBR sector with extra boot code (3 sectors starting from sector 2) */
-    movl HiddenSectors - Start(%bp), %eax
-    addl $0x02, %eax
-    movw $0x03, %cx
-    xorw %bx, %bx
-    movw %bx, %es
-    movw $0x7E00, %bx
-    call ReadSectors
-    jmp StartExtraCode
-
-ReadSectors:
-    /* Check for extended BIOS functions and use it only if available */
-    pushw %es
-    pushal
-    movb $0x41, %ah
-    movw $0x55AA, %bx
-    movb DriveNumber - Start(%bp), %dl
-    int $0x13
-    jc .ReadCHS
-    cmpw $0xAA55, %bx
-    jne .ReadCHS
-    testb $0x01, %cl
-    jz .ReadCHS
-
-    /* Verify drive size and determine whether to use CHS or LBA */
-    cmpl %edi, %eax
-    jnb .ReadLBA
-
-.ReadCHS:
-    /* Read sectors using CHS */
-    popal
-
-.CHSLoop:
-    /* Read sector by sector using CHS */
-    pushw %cx
-    pushal
-    xorl %edx, %edx
-    movzwl SectorsPerTrack - Start(%bp), %ecx
-    divl %ecx
-    incb %dl
-    movb %dl, %cl
-    movl %eax, %edx
-    shrl $0x10, %edx
-    divw NumberOfHeads - Start(%bp)
-    movb %dl, %dh
-    movb DriveNumber - Start(%bp), %dl
-    movb %al, %ch
-    rorb $0x01, %ah
-    rorb $0x01, %ah
-    orb %ah, %cl
-    movw $0x0201, %ax
-    int $0x13
-    popal
-    popw %cx
-    jc DiskError
-    incl %eax
-    movw %es, %dx
-    addw $0x20, %dx
-    movw %dx, %es
-    loop .CHSLoop
-    popw %es
-    ret
-
-.ReadLBA:
-    /* Prepare DAP packet and read sectors using LBA */
-    popal
-    pushw %cx
-    pushal
-    pushw $0x00
-    pushw $0x00
-    pushl %eax
-    pushw %es
-    pushw %bx
-    pushw %cx
-    pushw $0x10
-    movw %sp, %si
-    movb DriveNumber - Start(%bp), %dl
-    movb $0x42, %ah
-    int $0x13
-    jc DiskError
-    addw $0x10, %sp
-    popal
-    popw %si
-    pushw %bx
-    movzwl %si, %ebx
-    addl %ebx, %eax
-    shll $0x05, %ebx
-    movw %es, %dx
-    addw %bx, %dx
-    movw %dx, %es
-    popw %bx
-    subw %si, %cx
-    jnz .ReadLBA
-    popw %es
-    ret
-
-DiskError:
-    /* Display disk error message and reboot */
-    movw $.MsgDiskError, %si
+    /* Print message */
+    movw $msgUnavailable, %si
    call Print
-    jmp Reboot

-FsError:
-    /* Display FS error message and reboot */
-    movw $.MsgFsError, %si
-    call Print
-    jmp Reboot
+    /* Wait for key press and reboot */
+    xorw %ax, %ax
+    int $0x16
+    int $0x19

 Print:
    /* Simple routine to print messages */
    lodsb
    orb     %al, %al
-    jz      .DonePrint
+    jz      DonePrint
    movb    $0x0E, %ah
    movw    $0x07, %bx
    int     $0x10
    jmp     Print
-.DonePrint:
+DonePrint:
    retw

-Reboot:
-    /* Display a message, wait for a key press and reboot */
-    movw $.MsgAnyKey, %si
-    call Print
-    xorw %ax, %ax
-    int $0x16
-    int $0x19
-
-.MsgAnyKey:
-    .ascii "Press any key to restart...\r\n\0"
-
-.MsgDiskError:
-    .ascii "Disk error!\r\n\0"
-
-.MsgFsError:
-    .ascii "File system error!\r\n\0"
+msgUnavailable:
+    .ascii "XTLDR requires EFI-based system!\r\nPress any key to restart\r\n"

 /* Fill the rest of the VBR with zeros and add VBR signature at the end */
 .fill (510 - (. - Start)), 1, 0
 .word 0xAA55
-
-
-StartExtraCode:
-    /* Load XTLDR file from disk */
-    call LoadStage2
-
-    /* Enable A20 gate */
-    call EnableA20
-
-    /* Call architecture specific initialization code */
-    call InitializeCpu
-
-    /* Jump to Stage2 */
-    call RunStage2
-
-Clear8042:
-    /* Clear 8042 PS/2 buffer */
-    nop
-    nop
-    nop
-    nop
-    inb $0x64, %al
-    cmpb $0xff, %al
-    je .Clear8042_Done
-    testb $0x02, %al
-    jnz Clear8042
-.Clear8042_Done:
-    ret
-
-EnableA20:
-    /* Enable A20 gate */
-    pushaw
-    call Clear8042
-    movb $0xD1, %al
-    outb %al, $0x64
-    call Clear8042
-    movb $0xDF, %al
-    outb %al, $0x60
-    call Clear8042
-    movb $0xFF, %al
-    outb %al, $0x64
-    call Clear8042
-    popaw
-    ret
-
-FindFatEntry:
-    /* Find a file or directory in the FAT table */
-    pushw %bx
-    pushw %cx
-    pushw %dx
-    pushw %si
-    pushw %di
-.FindFatCluster:
-    /* Find FAT32 cluster holding the entry */
-    cmp $0x0FFFFFF8, %eax
-    jae .FindEntryFail
-    pushl %eax
-    movw $0x0200, %bx
-    movw %bx, %es
-    call ReadCluster
-    popl %eax
-    movb SectorsPerCluster - Start(%bp), %cl
-    shlw $0x04, %cx
-    xorw %di, %di
-.FindEntryLoop:
-    /* Find the entry */
-    movb %es:(%di), %al
-    cmpb $0x00, %al
-    je .FindEntryFail
-    cmpb $0xE5, %al
-    je .FindSkipEntry
-    movb %es:0x0B(%di), %ah
-    cmpb $0x0F, %ah
-    je .FindSkipEntry
-    pushw %di
-    pushw %si
-    pushw %cx
-    movw $0x0B, %cx
-    repe cmpsb
-    popw %cx
-    popw %si
-    popw %di
-    jnz .FindSkipEntry
-    movw %es:0x1A(%di), %ax
-    movw %es:0x14(%di), %dx
-    shll $0x10, %edx
-    orl %edx, %eax
-    clc
-    jmp .FindEntryDone
-.FindSkipEntry:
-    /* Skip to the next entry */
-    addw $0x20, %di
-    decw %cx
-    jnz .FindEntryLoop
-    call GetFatEntry
-    jmp .FindFatCluster
-.FindEntryFail:
-    /* Error, file/directory not found */
-    stc
-.FindEntryDone:
-    /* Clean up the stack */
-    popw %di
-    popw %si
-    popw %dx
-    popw %cx
-    popw %bx
-    ret
-
-GetFatEntry:
-    /* Get FAT32 sector and offset from FAT table */
-    shll $0x02, %eax
-    movl %eax, %ecx
-    xorl %edx, %edx
-    movzwl BytesPerSector - Start(%bp), %ebx
-    pushl %ebx
-    divl %ebx
-    movzwl ReservedSectors - Start(%bp), %ebx
-    addl %ebx, %eax
-    movl HiddenSectors - Start(%bp), %ebx
-    addl %ebx, %eax
-    popl %ebx
-    decl %ebx
-    andl %ebx, %ecx
-    movzwl ExtendedFlags - Start(%bp), %ebx
-    andw $0x0F, %bx
-    jz LoadFatSector
-    cmpb FatCopies - Start(%bp), %bl
-    jae FsError
-    pushl %eax
-    movl BigSectorsPerFat - Start(%bp), %eax
-    mull %ebx
-    popl %edx
-    addl %edx, %eax
-
-LoadFatSector:
-    /* Load FAT32 sector from disk */
-    pushl %ecx
-    movw $0x9000, %bx
-    movw %bx, %es
-    cmpl %esi, %eax
-    je .LoadFatSectorDone
-    movl %eax, %esi
-    xorw %bx, %bx
-    movw $0x01, %cx
-    call ReadSectors
-.LoadFatSectorDone:
-    /* Clean up the stack */
-    popl %ecx
-    movl %es:(%ecx), %eax
-    andl $0x0FFFFFFF, %eax
-    ret
-
-LoadStage2:
-    /* Load Stage2 executable, first find file in the path */
-    movl $0xFFFFFFFF, %esi
-    pushl %esi
-    movl 0x7C2C, %eax
-    movw $.EfiDirName, %si
-    call FindFatEntry
-    jc Stage2NotLoaded
-    movw $.BootDirName, %si
-    call FindFatEntry
-    jc Stage2NotLoaded
-    movw $.Stage2FileName, %si
-    call FindFatEntry
-    jc Stage2NotLoaded
-    popl %esi
-    /* Load XTLDR file from disk */
-    cmpl $0x02, %eax
-    jb FileNotFound
-    cmpl $0x0FFFFFF8, %eax
-    jae FileNotFound
-    movw $(0xF800 / 16), %bx
-    movw %bx, %es
-.LoadStage2Loop:
-    /* Load file data from disk */
-    pushl %eax
-    xorw %bx, %bx
-    pushw %es
-    call ReadCluster
-    popw %es
-    xorw %bx, %bx
-    movb SectorsPerCluster - Start(%bp), %bl
-    shlw $0x05, %bx
-    movw %es, %ax
-    addw %bx, %ax
-    movw %ax, %es
-    popl %eax
-    pushw %es
-    call GetFatEntry
-    popw %es
-    cmpl $0x0FFFFFF8, %eax
-    jb .LoadStage2Loop
-    ret
-
-ParseExecutableHeader:
-    /* Parse Stage2 PE/COFF executable header */
-    pushw %es
-    movw $(0xF800 / 16), %ax
-    movw %ax, %es
-    movl %es:60, %eax
-    addl $(4 + 20), %eax
-    movl %es:16(%eax), %eax
-    addl $0xF800, %eax
-    popw %es
-    ret
-
-ReadCluster:
-    /* Read FAT32 cluster from disk */
-    decl %eax
-    decl %eax
-    xorl %edx, %edx
-    movzbl SectorsPerCluster - Start(%bp), %ebx
-    mull %ebx
-    pushl %eax
-    xorl %edx, %edx
-    movzbl FatCopies - Start(%bp), %eax
-    mull BigSectorsPerFat - Start(%bp)
-    movzwl ReservedSectors - Start(%bp), %ebx
-    addl %ebx, %eax
-    addl HiddenSectors - Start(%bp), %eax
-    popl %ebx
-    addl %ebx, %eax
-    xorw %bx, %bx
-    movzbw SectorsPerCluster - Start(%bp), %cx
-    call ReadSectors
-    ret
-
-/* Include architecture specific code */
-.include ARCH_ESP_SOURCE
-
-CpuUnsupported:
-    /* Display CPU unsupported message and reboot */
-    popal
-    movw $.MsgCpuUnsupported, %si
-    call Print
-    jmp Reboot
-
-FileNotFound:
-    /* Display XTLDR not found message and reboot */
-    movw $.MsgXtLdrNotFound, %si
-    call Print
-    jmp Reboot
-
-Stage2NotLoaded:
-    /* Clean up the stack and display XTLDR not found message and reboot */
-    popl %esi
-    jmp FileNotFound
-
-.BootDirName:
-    /* Boot directory name */
-    .ascii "BOOT       "
-
-.EfiDirName:
-    /* EFI directory name */
-    .ascii "EFI        "
-
-.MsgCpuUnsupported:
-    .ascii "CPU not supported!\r\n\0"
-
-.MsgXtLdrNotFound:
-    .ascii "XTLDR Stage2 not found!\r\n\0"
-
-/* Fill the rest of the extra VBR with zeros and add signature */
-.fill (2043 - (. - Start)), 1, 0
-.ascii "XTLDR"
--- a/boot/bootsect/i686/cpu.S
+++ b/boot/bootsect/i686/cpu.S
@@ -1,124 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            boot/bootsect/i686/cpu.S
- * DESCRIPTION:     Low-level support for CPU initialization
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-
-BuildPageMap:
-    /* Generate page map for first 16MB of memory */
-    pushaw
-    pushw %es
-    cld
-    movw $(0x1000 >> 0x04), %ax
-    movw %ax, %es
-    xorw %di, %di
-    movl $(0x2000 | 0x03), %eax
-    stosl
-    movl $(0x3000 | 0x03), %eax
-    stosl
-    movl $(0x4000 | 0x03), %eax
-    stosl
-    movl $(0x5000 | 0x03), %eax
-    stosl
-    xorl %eax, %eax
-    movw $(1024 - 4), %cx
-    rep stosl
-    movl $0x00000003, %eax
-    movl $4, %edx
-    movw $(0x2000 >> 0x04), %bx
-.BuildPageMapLoop:
-    /* Identity map 1024 pages of 4KB */
-    movw %bx, %es
-    xorw %di, %di
-    pushl %edx
-    movw $1024, %cx
-.FillPageMapTable:
-    /* Fill the page table */
-    movl %eax, %es:(%di)
-    addl $4096, %eax
-    addw $0x04, %di
-    loop .FillPageMapTable
-    popl %edx
-    addw $(0x1000 >> 0x04), %bx
-    decl %edx
-    jnz .BuildPageMapLoop
-    popw %es
-    popaw
-    ret
-
-InitializeCpu:
-    /* Check if CPU supports CPUID */
-    pushal
-    pushfl
-    popl %eax
-    movl %eax, %ebx
-    xorl $0x00200000, %eax
-    pushl %eax
-    popfl
-    pushfl
-    popl %eax
-    cmpl %ebx, %eax
-    je CpuUnsupported
-    popal
-    call LoadGdt
-    ret
-
-LoadGdt:
-    /* Load Global Descriptor Table */
-    lgdt .GdtPointer
-    ret
-
-RunStage2:
-    /* Switch to protected mode and pass control to Stage 2 */
-    call BuildPageMap
-    call ParseExecutableHeader
-    pushl %eax
-    cli
-    movl %cr0, %eax
-    orl $0x01, %eax
-    movl %eax, %cr0
-    ljmp $0x08, $.Stage2ProtectedMode
-.code32
-.Stage2ProtectedMode:
-    /* Set segments and stack, then jump to Stage 2 */
-    movw $0x10, %ax
-    movw %ax, %ds
-    movw %ax, %es
-    movw %ax, %ss
-    xorw %ax, %ax
-    movw %ax, %fs
-    movw %ax, %gs
-    popl %eax
-    xorl %ebx, %ebx
-    xorl %ecx, %ecx
-    xorl %edx, %edx
-    xorl %esi, %esi
-    xorl %edi, %edi
-    xorl %ebp, %ebp
-    movl $0x1000, %ebx
-    movl %ebx, %cr3
-    movl %cr0, %ebx
-    orl $0x80000000, %ebx
-    movl %ebx, %cr0
-    jmp *%eax
-
-.code16
-.GdtDescriptor:
-    /* Global Descriptor Table */
-    .quad 0x0000000000000000
-    .quad 0x00CF9A000000FFFF
-    .quad 0x00CF92000000FFFF
-    .quad 0x00009E000000FFFF
-    .quad 0x000092000000FFFF
-
-.GdtPointer:
-    /* Pointer to Global Descriptor Table */
-    .word .GdtPointer - .GdtDescriptor - 1
-    .long .GdtDescriptor
-
-.Stage2FileName:
-    /* Name of Stage 2 executable file */
-    .ascii "BOOTIA32EFI"
--- a/boot/bootsect/mbrboot.S
+++ b/boot/bootsect/mbrboot.S
@@ -4,7 +4,6 @@
 * FILE:            boot/bootsect/amd64/mbrboot.S
 * DESCRIPTION:     XT Boot Loader MBR boot code
 * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
- *                  Aiken Harris <aiken@codingworkshop.eu.org>
 */

 .text
@@ -42,7 +41,7 @@ RealStart:
    movw %ax, %ss

    /* Print welcome message */
-    leaw .MsgXtosBoot, %si
+    leaw msgXtosBoot, %si
    call Print

    /* Get BIOS boot drive and partition table offset */
@@ -91,19 +90,19 @@ PartitionFound:

 InvalidSignature:
    /* Invalid signature error */
-    leaw .MsgInvalidSignature, %si
+    leaw msgInvalidSignature, %si
    call Print
    jmp HaltSystem

 PartitionNotFound:
    /* Active partition not found error */
-    leaw .MsgPartitionNotFound, %si
+    leaw msgPartitionNotFound, %si
    call Print
    jmp HaltSystem

 VbrReadFail:
    /* VBR read failed error */
-    leaw .MsgVbrReadFail, %si
+    leaw msgVbrReadFail, %si
    call Print
    jmp HaltSystem

@@ -137,16 +136,16 @@ DonePrint:
    /* Storage for the LBA start */
    .long 0

-.MsgInvalidSignature:
+msgInvalidSignature:
    .asciz "Invalid partition signature!"

-.MsgPartitionNotFound:
+msgPartitionNotFound:
    .asciz "Bootable partition not found!"

-.MsgVbrReadFail:
+msgVbrReadFail:
    .asciz "VBR read failed!"

-.MsgXtosBoot:
+msgXtosBoot:
    .asciz "Starting XTOS boot loader...\r\n"

 /* Fill the rest of the MBR with zeros and add MBR signature at the end */
--- a/boot/xtldr/biosutil.cc
+++ b/boot/xtldr/biosutil.cc
@@ -1,190 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/biosutil.cc
- * DESCRIPTION:     Legacy BIOS support
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-#include <xtldr.hh>
-
-
-/**
- * Clears the entire screen and moves the cursor to the top-left corner.
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTCDECL
-VOID
-BiosUtils::ClearScreen()
-{
-    VOLATILE PUSHORT VgaBuffer = (PUSHORT)0xB8000;
-    USHORT Blank;
-    UINT Index;
-
-    /* Set blank character */
-    Blank = (0x0F << 8) | L' ';
-
-    /* Fill the entire screen with blank characters */
-    for(Index = 0; Index < VgaWidth * VgaHeight; Index++)
-    {
-        VgaBuffer[Index] = Blank;
-    }
-
-    /* Reset cursor position to the top-left corner */
-    CursorX = 0;
-    CursorY = 0;
-
-    /* Update the hardware cursor position */
-    UpdateCursor();
-}
-
-/**
- * Formats the input string and prints it out to the screen.
- *
- * @param Format
- *        The formatted string that is to be written to the output.
- *
- * @param ...
- *        Depending on the format string, this routine might expect a sequence of additional arguments.
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTCDECL
-VOID
-BiosUtils::Print(IN PCWSTR Format,
-                 IN ...)
-{
-    RTL_PRINT_CONTEXT PrintContext;
-    VA_LIST Arguments;
-
-    /* Initialise the print contexts */
-    PrintContext.WriteWideCharacter = PutChar;
-
-    /* Initialise the va_list */
-    VA_START(Arguments, Format);
-
-    /* Format and print the string to the stdout */
-    RTL::WideString::FormatWideString(&PrintContext, (PWCHAR)Format, Arguments);
-
-    /* Clean up the va_list */
-    VA_END(Arguments);
-}
-
-/**
- * Writes a single wide character to the screen using legacy BIOS VGA text mode.
- *
- * @param Character
- *        The wide character to be printed.
- *
- * @return This routine returns a status code.
- *
- * @since XT 1.0
- */
-XTCDECL
-XTSTATUS
-BiosUtils::PutChar(IN WCHAR Character)
-{
-    VOLATILE PUSHORT VgaBuffer = (PUSHORT)0xB8000;
-    USHORT VgaCharacter;
-
-    /* Handle special characters */
-    if(Character == L'\n')
-    {
-        /* Move to the next line */
-        CursorX = 0;
-        CursorY++;
-    }
-    else if(Character == L'\r')
-    {
-        /* Move to the beginning of the current line */
-        CursorX = 0;
-    }
-    else
-    {
-        /* Print character and move cursor to the right */
-        VgaCharacter = (0x0F << 8) | (Character & 0xFF);
-        VgaBuffer[CursorY * VgaWidth + CursorX] = VgaCharacter;
-        CursorX++;
-    }
-
-    /* Handle moving to the next line if cursor is at the end of the line */
-    if(CursorX >= VgaWidth)
-    {
-        CursorX = 0;
-        CursorY++;
-    }
-
-    /* Handle scrolling if cursor is at the end of the screen */
-    if(CursorY >= VgaHeight)
-    {
-        ScrollScreen();
-        CursorY = VgaHeight - 1;
-    }
-
-    /* Update the hardware cursor position */
-    UpdateCursor();
-
-    /* Return success */
-    return STATUS_EFI_SUCCESS;
-}
-
-/**
- * Scrolls the entire screen content up by one line and clears the last line.
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTCDECL
-VOID
-BiosUtils::ScrollScreen()
-{
-    VOLATILE PUSHORT VgaBuffer = (PUSHORT)0xB8000;
-    USHORT Blank;
-    UINT Index;
-
-    /* Set blank character */
-    Blank = (0x0F << 8) | L' ';
-
-    /* Move every line up by one */
-    for(Index = 0; Index < (VgaHeight - 1) * VgaWidth; Index++)
-    {
-        VgaBuffer[Index] = VgaBuffer[Index + VgaWidth];
-    }
-
-    /* Clear the last line */
-    for(Index = (VgaHeight - 1) * VgaWidth; Index < VgaHeight * VgaWidth; Index++)
-    {
-        VgaBuffer[Index] = Blank;
-    }
-}
-
-/**
- * Updates the hardware cursor position on the screen.
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTCDECL
-VOID
-BiosUtils::UpdateCursor()
-{
-    USHORT Position;
-
-    /* Calculate cursor position */
-    Position = CursorY * VgaWidth + CursorX;
-
-    /* Send command to set the high byte of the cursor position */
-    HL::IoPort::WritePort8(0x3D4, 0x0E);
-    HL::IoPort::WritePort8(0x3D5, (UCHAR)((Position >> 8) & 0xFF));
-
-    /* Send command to set the low byte of the cursor position */
-    HL::IoPort::WritePort8(0x3D4, 0x0F);
-    HL::IoPort::WritePort8(0x3D5, (UCHAR)(Position & 0xFF));
-}
--- a/boot/bootdata/CMakeLists.txt
+++ b/boot/bootdata/CMakeLists.txt
--- a/boot/bootdata/xtldr/CMakeLists.txt
+++ b/boot/bootdata/xtldr/CMakeLists.txt
--- a/boot/bootdata/xtldr/xtldr.ini
+++ b/boot/bootdata/xtldr/xtldr.ini
--- a/configure.ps1
+++ b/configure.ps1
@@ -4,41 +4,48 @@
 # DESCRIPTION: Project configuration script for preparing the build environment
 # DEVELOPERS:  Aiken Harris <harraiken91@gmail.com>

+
 # Check XTchain
 if (-not $env:XTCVER) {
-    Write-Error "XTChain not detected or corrupted!"
+    Write-Host "XTChain not detected or corrupted!"
    exit 1
 }

-# Set target architecture defaulting to amd64
-$ARCH = if ($env:TARGET) { $env:TARGET } else { "amd64" }
-
-# Set target build type defaulting to Debug
-$env:BUILD_TYPE = if ($env:BUILD_TYPE -in @("Debug", "Release")) { $env:BUILD_TYPE } else { "Debug" }
-
-# Set variables
-$EXECTOS_SOURCE_DIR = $PSScriptRoot
-$EXECTOS_BINARY_DIR = Join-Path $EXECTOS_SOURCE_DIR "build-$ARCH-$($env:BUILD_TYPE.ToLower())"
-
-# Create build directory
-if (-not (Test-Path $EXECTOS_BINARY_DIR)) {
-    Write-Host "Creating build directory: $EXECTOS_BINARY_DIR"
-    New-Item -ItemType Directory -Path $EXECTOS_BINARY_DIR -Force | Out-Null
+# Set target architecture
+if ($env:TARGET) {
+    $ARCH = $env:TARGET
+} else {
+    $ARCH = "amd64"
 }

-Set-Location $EXECTOS_BINARY_DIR
+# Set target build type
+if (-not $env:BUILD_TYPE) {
+    $env:BUILD_TYPE = "DEBUG"
+}
+
+# Set variables
+$EXECTOS_SOURCE_DIR = (Get-Location).Path
+$EXECTOS_BINARY_DIR = "build-$($ARCH)-$($env:BUILD_TYPE.ToLower())"
+
+# Create directories if needed
+if ($EXECTOS_SOURCE_DIR -eq (Get-Location).Path) {
+    Write-Host "Creating directories in $EXECTOS_BINARY_DIR"
+    New-Item -ItemType Directory -Path $EXECTOS_BINARY_DIR -Force | Out-Null
+    Set-Location -Path $EXECTOS_BINARY_DIR
+}

 # Delete old cache
-Remove-Item "CMakeCache.txt", "host-tools/CMakeCache.txt" -ErrorAction SilentlyContinue
+Remove-Item -Path "CMakeCache.txt" -ErrorAction SilentlyContinue
+Remove-Item -Path "host-tools/CMakeCache.txt" -ErrorAction SilentlyContinue

 # Configure project using CMake
-& cmake -G Ninja "-DARCH:STRING=$ARCH" "-DBUILD_TYPE:STRING=$($env:BUILD_TYPE)" $EXECTOS_SOURCE_DIR
+& cmake -G Ninja -DARCH:STRING=$($ARCH) -DBUILD_TYPE:STRING=$($env:BUILD_TYPE) $EXECTOS_SOURCE_DIR

 # Check if configuration succeeded
 if ($LASTEXITCODE -ne 0) {
-    Write-Error "Configure script failed."
+    Write-Host "Configure script failed."
    exit 1
+} else {
+    "$($ARCH)" | Out-File -Encoding ASCII -NoNewline build.arch
+    Write-Host "Configure script completed. Enter '$EXECTOS_BINARY_DIR' directory and execute 'xbuild' to build ExectOS."
 }
-
-$ARCH | Out-File -Encoding ASCII -NoNewline "build.arch"
-Write-Host "Configure completed. Run 'xbuild' to build ExectOS."
--- a/sdk/CMakeLists.txt
+++ b/sdk/CMakeLists.txt
@@ -1,3 +1 @@
-add_subdirectory("xtadk")
-
 set_sdk_target("xtdk/" "include")
--- a/sdk/cmake/baseaddress/amd64.cmake
+++ b/sdk/cmake/baseaddress/amd64.cmake
@@ -1,3 +1,2 @@
 # Set base addresses for all modules
-set(BASEADDRESS_XTLDR    0x000000000000F800)
 set(BASEADDRESS_XTOSKRNL 0x0000000140000000)
--- a/sdk/cmake/baseaddress/i686.cmake
+++ b/sdk/cmake/baseaddress/i686.cmake
@@ -1,3 +1,2 @@
 # Set base addresses for all modules
-set(BASEADDRESS_XTLDR    0x0000F800)
 set(BASEADDRESS_XTOSKRNL 0x00400000)
--- a/sdk/cmake/emulation.cmake
+++ b/sdk/cmake/emulation.cmake
@@ -23,57 +23,49 @@ endif()

 find_program(QEMU_EMULATOR ${QEMU_COMMAND})
 if(QEMU_EMULATOR)
-    if(CMAKE_HOST_LINUX)
-        # This target starts up a QEMU+OVMF virtual machine using KVM accelerator
-        add_custom_target(testefikvm
-                          DEPENDS install
-                          COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-EFI-KVM" -machine type=q35,kernel_irqchip=on,accel=kvm,mem-merge=off,vmport=off -enable-kvm -cpu host,-hypervisor,+topoext
-                                                  -smp 2,sockets=1,cores=1,threads=2 -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
-                                                  -bios ${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_${ARCH}.fd
-                                                  -hda fat:rw:${EXECTOS_BINARY_DIR}/output/binaries
-                                                  -boot menu=on -d int -M smm=off -no-reboot -no-shutdown -serial stdio
-                          VERBATIM USES_TERMINAL)
-    elseif(CMAKE_HOST_WIN32)
-        # This target starts up a QEMU+OVMF virtual machine using WHPX accelerator
-        add_custom_target(testefiwhpx
-                          DEPENDS install
-                          COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-EFI-WHPX" -machine type=q35,kernel_irqchip=off,accel=whpx,mem-merge=off,vmport=off
-                                                  -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
-                                                  -bios ${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_${ARCH}.fd
-                                                  -hda fat:rw:${EXECTOS_BINARY_DIR}/output/binaries
-                                                  -boot menu=on -d int -M smm=off -no-reboot -no-shutdown -serial stdio
-                          VERBATIM USES_TERMINAL)
-    endif()
+    # This target starts up a QEMU+OVMF virtual machine using KVM accelerator
+    add_custom_target(testefikvm
+                      DEPENDS install
+                      COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-EFI-KVM" -machine type=q35,kernel_irqchip=on,accel="kvm:whpx",mem-merge=off,vmport=off -enable-kvm -cpu host,-hypervisor,+topoext
+                                              -smp 2,sockets=1,cores=1,threads=2 -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
+                                              -drive file=${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_code_${ARCH}.fd,if=pflash,format=raw,unit=0,readonly=on
+                                              -drive file=${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_vars_${ARCH}.fd,if=pflash,format=raw,unit=1
+                                              -hda fat:rw:${EXECTOS_BINARY_DIR}/output/binaries
+                                              -boot menu=on -d int -M smm=off -no-reboot -no-shutdown -serial stdio
+                      VERBATIM USES_TERMINAL)

    # This target starts up a QEMU+OVMF virtual machine using TCG accelerator
    add_custom_target(testefitcg
                      DEPENDS install
                      COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-EFI-TCG" -machine type=q35,accel=tcg -cpu max,-hypervisor
                                              -smp 2,sockets=1,cores=1,threads=2 -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
-                                              -bios ${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_${ARCH}.fd
+                                              -drive file=${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_code_${ARCH}.fd,if=pflash,format=raw,unit=0,readonly=on
+                                              -drive file=${EXECTOS_SOURCE_DIR}/sdk/firmware/ovmf_vars_${ARCH}.fd,if=pflash,format=raw,unit=1
                                              -hda fat:rw:${EXECTOS_BINARY_DIR}/output/binaries
                                              -boot menu=on -d int -no-reboot -no-shutdown -serial stdio
                      VERBATIM USES_TERMINAL)

-    if(CMAKE_HOST_LINUX)
+if(WIN32)
+        # This target starts up a QEMU+OVMF virtual machine using WHPX accelerator on Windows
+        add_custom_target(testkvm
+                        DEPENDS install
+                        COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-WHPX" -machine accel=whpx,kernel-irqchip=off 
+                            -bios ${EXECTOS_SOURCE_DIR}/sdk/firmware/OVMF-pure-efi.fd
+                            -hda fat:rw:${EXECTOS_BINARY_DIR}/output/binaries 
+                            -no-reboot -no-shutdown -serial stdio
+                        COMMENT "Using WHPX acceleration on Windows"
+                        VERBATIM USES_TERMINAL)
+
+else()
        # This target starts up a QEMU+SEABIOS virtual machine using KVM accelerator
        add_custom_target(testkvm
-                          DEPENDS diskimg
-                          COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-BIOS-KVM" -machine type=q35,kernel_irqchip=on,accel=kvm,mem-merge=off,vmport=off -enable-kvm -cpu host,-hypervisor,+topoext
-                                                  -smp 2,sockets=1,cores=1,threads=2 -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
-                                                  -hda ${EXECTOS_BINARY_DIR}/output/disk.img
-                                                  -boot menu=on -d int -no-reboot -no-shutdown -serial stdio
-                          VERBATIM USES_TERMINAL)
-    elseif(CMAKE_HOST_WIN32)
-        # This target starts up a QEMU+SEABIOS virtual machine using WHPX accelerator
-        add_custom_target(testwhpx
-                          DEPENDS diskimg
-                          COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-BIOS-WHPX" -machine type=q35,kernel_irqchip=off,accel=whpx,mem-merge=off,vmport=off
-                                                  -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
-                                                  -hda ${EXECTOS_BINARY_DIR}/output/disk.img
-                                                  -boot menu=on -d int -no-reboot -no-shutdown -serial stdio
-                          VERBATIM USES_TERMINAL)
-    endif()
+                        DEPENDS diskimg
+                        COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-BIOS-KVM" -machine type=q35,kernel_irqchip=on,accel="kvm:whpx",mem-merge=off,vmport=off -enable-kvm -cpu host,-hypervisor,+topoext
+                                                -smp 2,sockets=1,cores=1,threads=2 -m 4G -overcommit mem-lock=off -rtc clock=host,base=localtime,driftfix=none
+                                                -hda ${EXECTOS_BINARY_DIR}/output/disk.img
+                                                -boot menu=on -d int -no-reboot -no-shutdown -serial stdio
+                        VERBATIM USES_TERMINAL)
+endif()

    # This target starts up a QEMU+SEABIOS virtual machine using TCG accelerator
    add_custom_target(testtcg
--- a/sdk/cmake/functions.cmake
+++ b/sdk/cmake/functions.cmake
@@ -59,103 +59,16 @@ function(add_module_linker_flags MODULE FLAGS)
    set_module_property(${MODULE} LINK_FLAGS ${FLAGS})
 endfunction()

-# This function compiles XT Assembly Development Kit
-function(generate_xtadk TARGET_NAME SOURCE_FILES)
-    # Define the absolute destination path for the generated header file
-    set(HEADER_OUTPUT "${EXECTOS_BINARY_DIR}/sdk/includes/${TARGET_NAME}.h")
-    get_filename_component(HEADER_OUTPUT_DIRECTORY "${HEADER_OUTPUT}" DIRECTORY)
-
-    # Tokenize global CXX flags into a list to ensure correct argument expansion
-    separate_arguments(COMPILER_FLAGS NATIVE_COMMAND "${CMAKE_CXX_FLAGS}")
-
-    # Resolve and tokenize build-configuration specific flags
-    string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
-    if(BUILD_TYPE)
-        separate_arguments(BUILD_TYPE_SPECIFIC_FLAGS NATIVE_COMMAND "${CMAKE_CXX_FLAGS_${BUILD_TYPE}}")
-    endif()
-
-    # Retrieve compiler definitions, include paths, and options
-    get_directory_property(COMPILE_DEFINITIONS COMPILE_DEFINITIONS)
-    get_directory_property(INCLUDE_DIRECTORIES INCLUDE_DIRECTORIES)
-    get_directory_property(COMPILE_OPTIONS COMPILE_OPTIONS)
-
-    # Initialize the final compiler argument list
-    set(COMPILER_ARGUMENTS "")
-    list(APPEND COMPILER_ARGUMENTS ${COMPILER_FLAGS} ${BUILD_TYPE_SPECIFIC_FLAGS})
-
-    # Transform definitions into MSVC-style
-    foreach(DEFINITION ${COMPILE_DEFINITIONS})
-        list(APPEND COMPILER_ARGUMENTS "/D${DEFINITION}")
-    endforeach()
-
-    # Transform include paths into MSVC-style
-    foreach(INCLUDE_PATH ${INCLUDE_DIRECTORIES})
-        list(APPEND COMPILER_ARGUMENTS "/I${INCLUDE_PATH}")
-    endforeach()
-
-    # Append all supplemental compiler options
-    list(APPEND COMPILER_ARGUMENTS ${COMPILE_OPTIONS})
-    set(COLLECTED_ASSEMBLY_OUTPUTS "")
-
-    # Iterate through each source file to create individual assembly generation rules
-    foreach(SOURCE_FILE_PATH ${SOURCE_FILES})
-        # Extract the base filename
-        get_filename_component(FILENAME_WITHOUT_EXTENSION "${SOURCE_FILE_PATH}" NAME_WE)
-
-        # Define the unique output path for the intermediate assembly file
-        set(CURRENT_ASSEMBLY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FILENAME_WITHOUT_EXTENSION}.S")
-        list(APPEND COLLECTED_ASSEMBLY_OUTPUTS "${CURRENT_ASSEMBLY_OUTPUT}")
-        get_filename_component(CURRENT_ASSEMBLY_DIRECTORY "${CURRENT_ASSEMBLY_OUTPUT}" DIRECTORY)
-
-        # Execute the compiler to generate assembly code
-        add_custom_command(
-            OUTPUT "${CURRENT_ASSEMBLY_OUTPUT}"
-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CURRENT_ASSEMBLY_DIRECTORY}"
-            COMMAND ${CMAKE_CXX_COMPILER}
-                ${COMPILER_ARGUMENTS}
-                /c /FAs /Fa${CURRENT_ASSEMBLY_OUTPUT}
-                -- ${SOURCE_FILE_PATH}
-            DEPENDS "${SOURCE_FILE_PATH}"
-            COMMENT "Generating XTADK Assembly: ${FILENAME_WITHOUT_EXTENSION}"
-            VERBATIM
-            COMMAND_EXPAND_LISTS
-        )
-    endforeach()
-
-    # Aggregate all generated assembly units into a single consolidated XTADK header
-    add_custom_command(
-        OUTPUT "${HEADER_OUTPUT}"
-        COMMAND ${CMAKE_COMMAND} -E make_directory "${HEADER_OUTPUT_DIRECTORY}"
-        COMMAND xtadkgen ${COLLECTED_ASSEMBLY_OUTPUTS} -O "${HEADER_OUTPUT}"
-        DEPENDS ${COLLECTED_ASSEMBLY_OUTPUTS}
-        COMMENT "Generating XTADK header: ${TARGET_NAME}"
-        VERBATIM
-    )
-
-    # Establish the generation target and expose the header directory via an interface library
-    add_custom_target(${TARGET_NAME}_gen DEPENDS "${HEADER_OUTPUT}")
-    add_library(${TARGET_NAME} INTERFACE)
-    add_dependencies(${TARGET_NAME} ${TARGET_NAME}_gen)
-    target_include_directories(${TARGET_NAME} INTERFACE "${EXECTOS_BINARY_DIR}/sdk/includes")
-endfunction()
-
 # This function compiles an assembly bootsector file into a flat binary
 function(compile_bootsector NAME SOURCE BASEADDR ENTRYPOINT)
    set(BINARY_NAME "${NAME}.bin")
    set(OBJECT_NAME "${NAME}.obj")

-    get_directory_property(DEFS COMPILE_DEFINITIONS)
-    foreach(def ${DEFS})
-        list(APPEND ASM_DEFS "-D${def}")
-    endforeach()
-
    add_custom_command(
        OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${BINARY_NAME}
        COMMAND ${CMAKE_ASM_COMPILER}
            /nologo
            --target=i386-none-elf
-            ${ASM_DEFS}
-            -I${CMAKE_CURRENT_SOURCE_DIR}
            /Fo${CMAKE_CURRENT_BINARY_DIR}/${OBJECT_NAME}
            -c -- ${SOURCE}
        COMMAND ${CMAKE_ASM_LINKER}
--- a/sdk/firmware/OVMF-pure-efi.fd
+++ b/sdk/firmware/OVMF-pure-efi.fd
--- a/sdk/firmware/README.md
+++ b/sdk/firmware/README.md
@@ -13,10 +13,6 @@ The ovmf_vars files, store UEFI variables, which are used to store and retrieve
 boot options, device settings, and system preferences. The ovmf_vars file contains the persistent variables specific to
 a virtual machine, allowing it to maintain its configuration across multiple boot sessions.

-## BOCHS ROM BIOS
-The rombios.bin file contains the ROM BIOS image for Bochs. This image is distributed under the GNU Lesser General Public
-License (LGPL).
-
 ## Video BIOS (LGPL'd VGABios)
 The vgabios.bin file contains the Video Bios for Bochs and QEMU. This VGA Bios is very specific to the emulated VGA card.
 It is NOT meant to drive a physical vga card. It also implements support for VBE version 2.0.
--- a/sdk/firmware/ovmf_code_amd64.fd
+++ b/sdk/firmware/ovmf_code_amd64.fd
--- a/sdk/firmware/ovmf_code_i686.fd
+++ b/sdk/firmware/ovmf_code_i686.fd
--- a/sdk/firmware/ovmf_vars_amd64.fd
+++ b/sdk/firmware/ovmf_vars_amd64.fd
--- a/sdk/firmware/ovmf_vars_i686.fd
+++ b/sdk/firmware/ovmf_vars_i686.fd
--- a/sdk/xtadk/CMakeLists.txt
+++ b/sdk/xtadk/CMakeLists.txt
@@ -1,14 +0,0 @@
-# XT Assembly Development Kit
-PROJECT(XTADK)
-
-# Specify include directories
-include_directories(
-    ${EXECTOS_SOURCE_DIR}/sdk/xtdk
-    ${XTADK_SOURCE_DIR}/includes)
-
-# Specify list of XTADK source code files
-list(APPEND XTADK_SOURCE
-    ${XTADK_SOURCE_DIR}/${ARCH}/ke.cc)
-
-# Generate assembly header from XTADK sources
-generate_xtadk(xtadk "${XTADK_SOURCE}")
--- a/sdk/xtadk/amd64/ke.cc
+++ b/sdk/xtadk/amd64/ke.cc
@@ -1,83 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            sdk/xtadk/amd64/ke.cc
- * DESCRIPTION:     ADK generator for AMD64 version of Kernel Library
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-#include <xtkmapi.h>
-#include <adkdefs.h>
-
-
-/**
- * Generates a definitions file for the Kernel Library used by the XTOS kernel assembly code
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTCLINK
-XTAPI
-VOID
-GenerateAssemblyDefinitions(VOID)
-{
-    /* Generate KTRAP_FRAME offsets */
-    ADK_OFFSET(KTRAP_FRAME, Xmm0);
-    ADK_OFFSET(KTRAP_FRAME, Xmm1);
-    ADK_OFFSET(KTRAP_FRAME, Xmm2);
-    ADK_OFFSET(KTRAP_FRAME, Xmm3);
-    ADK_OFFSET(KTRAP_FRAME, Xmm4);
-    ADK_OFFSET(KTRAP_FRAME, Xmm5);
-    ADK_OFFSET(KTRAP_FRAME, Xmm6);
-    ADK_OFFSET(KTRAP_FRAME, Xmm7);
-    ADK_OFFSET(KTRAP_FRAME, Xmm8);
-    ADK_OFFSET(KTRAP_FRAME, Xmm9);
-    ADK_OFFSET(KTRAP_FRAME, Xmm10);
-    ADK_OFFSET(KTRAP_FRAME, Xmm11);
-    ADK_OFFSET(KTRAP_FRAME, Xmm12);
-    ADK_OFFSET(KTRAP_FRAME, Xmm13);
-    ADK_OFFSET(KTRAP_FRAME, Xmm14);
-    ADK_OFFSET(KTRAP_FRAME, Xmm15);
-    ADK_OFFSET(KTRAP_FRAME, MxCsr);
-    ADK_OFFSET(KTRAP_FRAME, PreviousMode);
-    ADK_OFFSET(KTRAP_FRAME, Cr2);
-    ADK_OFFSET(KTRAP_FRAME, Cr3);
-    ADK_OFFSET(KTRAP_FRAME, Dr0);
-    ADK_OFFSET(KTRAP_FRAME, Dr1);
-    ADK_OFFSET(KTRAP_FRAME, Dr2);
-    ADK_OFFSET(KTRAP_FRAME, Dr3);
-    ADK_OFFSET(KTRAP_FRAME, Dr6);
-    ADK_OFFSET(KTRAP_FRAME, Dr7);
-    ADK_OFFSET(KTRAP_FRAME, SegDs);
-    ADK_OFFSET(KTRAP_FRAME, SegEs);
-    ADK_OFFSET(KTRAP_FRAME, SegFs);
-    ADK_OFFSET(KTRAP_FRAME, SegGs);
-    ADK_OFFSET(KTRAP_FRAME, Rax);
-    ADK_OFFSET(KTRAP_FRAME, Rbx);
-    ADK_OFFSET(KTRAP_FRAME, Rcx);
-    ADK_OFFSET(KTRAP_FRAME, Rdx);
-    ADK_OFFSET(KTRAP_FRAME, R8);
-    ADK_OFFSET(KTRAP_FRAME, R9);
-    ADK_OFFSET(KTRAP_FRAME, R10);
-    ADK_OFFSET(KTRAP_FRAME, R11);
-    ADK_OFFSET(KTRAP_FRAME, R12);
-    ADK_OFFSET(KTRAP_FRAME, R13);
-    ADK_OFFSET(KTRAP_FRAME, R14);
-    ADK_OFFSET(KTRAP_FRAME, R15);
-    ADK_OFFSET(KTRAP_FRAME, Rsi);
-    ADK_OFFSET(KTRAP_FRAME, Rdi);
-    ADK_OFFSET(KTRAP_FRAME, Rbp);
-    ADK_OFFSET(KTRAP_FRAME, Vector);
-    ADK_OFFSET(KTRAP_FRAME, ErrorCode);
-    ADK_OFFSET(KTRAP_FRAME, ExceptionFrame);
-    ADK_OFFSET(KTRAP_FRAME, Rip);
-    ADK_OFFSET(KTRAP_FRAME, SegCs);
-    ADK_OFFSET(KTRAP_FRAME, Flags);
-    ADK_OFFSET(KTRAP_FRAME, Rsp);
-    ADK_OFFSET(KTRAP_FRAME, SegSs);
-
-    /* Generate KTRAP_FRAME size and REGISTERS_SIZE */
-    ADK_SIZE(KTRAP_FRAME);
-    ADK_SIZE_FROM(REGISTERS_SIZE, KTRAP_FRAME, Rax);
-}
--- a/sdk/xtadk/i686/ke.cc
+++ b/sdk/xtadk/i686/ke.cc
@@ -1,57 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            sdk/xtadk/i686/ke.cc
- * DESCRIPTION:     ADK generator for i686 version of Kernel Library
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-#include <xtkmapi.h>
-#include <adkdefs.h>
-
-
-/**
- * Generates a definitions file for the Kernel Library used by the XTOS kernel assembly code
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTCLINK
-XTAPI
-VOID
-GenerateAssemblyDefinitions(VOID)
-{
-    /* Generate KTRAP_FRAME offsets */
-    ADK_OFFSET(KTRAP_FRAME, PreviousMode);
-    ADK_OFFSET(KTRAP_FRAME, Cr2);
-    ADK_OFFSET(KTRAP_FRAME, Cr3);
-    ADK_OFFSET(KTRAP_FRAME, Dr0);
-    ADK_OFFSET(KTRAP_FRAME, Dr1);
-    ADK_OFFSET(KTRAP_FRAME, Dr2);
-    ADK_OFFSET(KTRAP_FRAME, Dr3);
-    ADK_OFFSET(KTRAP_FRAME, Dr6);
-    ADK_OFFSET(KTRAP_FRAME, Dr7);
-    ADK_OFFSET(KTRAP_FRAME, SegDs);
-    ADK_OFFSET(KTRAP_FRAME, SegEs);
-    ADK_OFFSET(KTRAP_FRAME, SegFs);
-    ADK_OFFSET(KTRAP_FRAME, SegGs);
-    ADK_OFFSET(KTRAP_FRAME, Eax);
-    ADK_OFFSET(KTRAP_FRAME, Ebx);
-    ADK_OFFSET(KTRAP_FRAME, Ecx);
-    ADK_OFFSET(KTRAP_FRAME, Edx);
-    ADK_OFFSET(KTRAP_FRAME, Esi);
-    ADK_OFFSET(KTRAP_FRAME, Edi);
-    ADK_OFFSET(KTRAP_FRAME, Ebp);
-    ADK_OFFSET(KTRAP_FRAME, Vector);
-    ADK_OFFSET(KTRAP_FRAME, ErrorCode);
-    ADK_OFFSET(KTRAP_FRAME, Eip);
-    ADK_OFFSET(KTRAP_FRAME, SegCs);
-    ADK_OFFSET(KTRAP_FRAME, Flags);
-    ADK_OFFSET(KTRAP_FRAME, Esp);
-    ADK_OFFSET(KTRAP_FRAME, SegSs);
-
-    /* Generate KTRAP_FRAME size and REGISTERS_SIZE */
-    ADK_SIZE(KTRAP_FRAME);
-    ADK_SIZE_FROM(REGISTERS_SIZE, KTRAP_FRAME, Eax);
-}
--- a/sdk/xtadk/includes/adkdefs.h
+++ b/sdk/xtadk/includes/adkdefs.h
@@ -1,19 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            sdk/xtadk/adkdefs.h
- * DESCRIPTION:     Definitions for XTADK
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-#ifndef __XTADK_ADKDEFS_H
-#define __XTADK_ADKDEFS_H
-
-
-/* Macros for calculating structure size and offsets for assembler code */
-#define ADK_DEFINE(Symbol, Value)              __asm__ volatile("\n\t# ==> " #Symbol " %c0" : : "i" ((SIZE_T)(Value)))
-#define ADK_OFFSET(Structure, Member)          ADK_DEFINE(Structure ## _ ## Member, FIELD_OFFSET(Structure, Member))
-#define ADK_SIZE(Structure)                    ADK_DEFINE(Structure ## _SIZE, sizeof(Structure))
-#define ADK_SIZE_FROM(Name, Structure, Member) ADK_DEFINE(Structure ## _ ## Name, sizeof(Structure) - FIELD_OFFSET(Structure, Member))
-
-#endif /* __XTADK_ADKDEFS_H */
--- a/sdk/xtdk/amd64/artypes.h
+++ b/sdk/xtdk/amd64/artypes.h
@@ -12,7 +12,6 @@
 #include <xtdefs.h>
 #include <xtstruct.h>
 #include <xttypes.h>
-#include ARCH_HEADER(xtstruct.h)


 /* Control Register 0 constants */
@@ -128,10 +127,6 @@
 #define X86_EFLAGS_VIP_MASK                             0x00100000 /* Virtual Interrupt Pending */
 #define X86_EFLAGS_ID_MASK                              0x00200000 /* Identification */

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* CPU vendor enumeration list */
 typedef enum _CPU_VENDOR
 {
@@ -140,18 +135,6 @@ typedef enum _CPU_VENDOR
    CPU_VENDOR_UNKNOWN = 0xFFFFFFFF
 } CPU_VENDOR, *PCPU_VENDOR;

-/* CPUID advanced power management features (0x80000007) enumeration list */
-typedef enum _CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT
-{
-    CPUID_FEATURES_EDX_TS                     = 1 << 0, /* Temperature Sensor */
-    CPUID_FEATURES_EDX_FIS                    = 1 << 1, /* Frequency ID Selection */
-    CPUID_FEATURES_EDX_VIS                    = 1 << 2, /* Voltage ID Selection */
-    CPUID_FEATURES_EDX_TTS                    = 1 << 3, /* ThermaTrip Support */
-    CPUID_FEATURES_EDX_HTC                    = 1 << 4, /* Hardware Thermal Throttling */
-    CPUID_FEATURES_EDX_STC                    = 1 << 5, /* Software Thermal Throttling */
-    CPUID_FEATURES_EDX_TSCI                   = 1 << 8 /* TSC Invariant */
-} CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT, *PCPUID_FEATURES_ADVANCED_POWER_MANAGEMENT;
-
 /* CPUID extended features (0x80000001) enumeration list */
 typedef enum _CPUID_FEATURES_EXTENDED
 {
@@ -193,23 +176,6 @@ typedef enum _CPUID_FEATURES_EXTENDED
    CPUID_FEATURES_EDX_3DNOW                  = 1 << 31
 } CPUID_FEATURES_EXTENDED, *PCPUID_FEATURES_EXTENDED;

-/* CPUID Thermal and Power Management features (0x00000006) enumeration list */
-typedef enum _CPUID_FEATURES_POWER_MANAGEMENT
-{
-    CPUID_FEATURES_EAX_DTHERM                  = 1 << 0,
-    CPUID_FEATURES_EAX_IDA                     = 1 << 1,
-    CPUID_FEATURES_EAX_ARAT                    = 1 << 2,
-    CPUID_FEATURES_EAX_PLN                     = 1 << 4,
-    CPUID_FEATURES_EAX_PTS                     = 1 << 6,
-    CPUID_FEATURES_EAX_HWP                     = 1 << 7,
-    CPUID_FEATURES_EAX_HWP_NOTIFY              = 1 << 8,
-    CPUID_FEATURES_EAX_HWP_ACT_WINDOW          = 1 << 9,
-    CPUID_FEATURES_EAX_HWP_EPP                 = 1 << 10,
-    CPUID_FEATURES_EAX_HWP_PKG_REQ             = 1 << 11,
-    CPUID_FEATURES_EAX_HWP_HIGHEST_PERF_CHANGE = 1 << 15,
-    CPUID_FEATURES_EAX_HFI                     = 1 << 19
-} CPUID_FEATURES_LEAF6, *PCPUID_FEATURES_LEAF6;
-
 /* CPUID STD1 features (0x00000001) enumeration list */
 typedef enum _CPUID_FEATURES_STANDARD1
 {
@@ -236,7 +202,7 @@ typedef enum _CPUID_FEATURES_STANDARD1
    CPUID_FEATURES_ECX_X2APIC                 = 1 << 21,
    CPUID_FEATURES_ECX_MOVBE                  = 1 << 22,
    CPUID_FEATURES_ECX_POPCNT                 = 1 << 23,
-    CPUID_FEATURES_ECX_TSC_DEADLINE           = 1 << 24,
+    CPUID_FEATURES_ECX_TSC                    = 1 << 24,
    CPUID_FEATURES_ECX_AES                    = 1 << 25,
    CPUID_FEATURES_ECX_XSAVE                  = 1 << 26,
    CPUID_FEATURES_ECX_OSXSAVE                = 1 << 27,
@@ -410,23 +376,16 @@ typedef enum _CPUID_FEATURES_STANDARD7_LEAF1
 /* CPUID requests */
 typedef enum _CPUID_REQUESTS
 {
-    CPUID_GET_VENDOR_STRING                   = 0x00000000,
-    CPUID_GET_STANDARD1_FEATURES              = 0x00000001,
-    CPUID_GET_TLB_CACHE                       = 0x00000002,
-    CPUID_GET_SERIAL                          = 0x00000003,
-    CPUID_GET_CACHE_TOPOLOGY                  = 0x00000004,
-    CPUID_GET_MONITOR_MWAIT                   = 0x00000005,
-    CPUID_GET_POWER_MANAGEMENT                = 0x00000006,
-    CPUID_GET_STANDARD7_FEATURES              = 0x00000007,
-    CPUID_GET_TSC_CRYSTAL_CLOCK               = 0x00000015,
-    CPUID_GET_EXTENDED_MAX                    = 0x80000000,
-    CPUID_GET_EXTENDED_FEATURES               = 0x80000001,
-    CPUID_GET_ADVANCED_POWER_MANAGEMENT       = 0x80000007
+    CPUID_GET_VENDOR_STRING,
+    CPUID_GET_STANDARD1_FEATURES,
+    CPUID_GET_TLB_CACHE,
+    CPUID_GET_SERIAL,
+    CPUID_GET_CACHE_TOPOLOGY,
+    CPUID_GET_MONITOR_MWAIT,
+    CPUID_GET_POWER_MANAGEMENT,
+    CPUID_GET_STANDARD7_FEATURES
 } CPUID_REQUESTS, *PCPUID_REQUESTS;

-/* Interrupt handler */
-typedef VOID (*PINTERRUPT_HANDLER)(PKTRAP_FRAME TrapFrame);
-
 /* Processor identification information */
 typedef struct _CPU_IDENTIFICATION
 {
@@ -467,5 +426,4 @@ typedef enum _TRAMPOLINE_TYPE
    TrampolineEnableXpa
 } TRAMPOLINE_TYPE, *PTRAMPOLINE_TYPE;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_AMD64_ARTYPES_H */
--- a/sdk/xtdk/amd64/hlfuncs.h
+++ b/sdk/xtdk/amd64/hlfuncs.h
@@ -15,9 +15,6 @@
 #include <amd64/xtstruct.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Hardware layer routines forward references */
 XTCLINK
 XTCDECL
@@ -52,5 +49,4 @@ VOID
 HlWritePort32(IN USHORT Port,
              IN ULONG Value);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_AMD64_HLFUNCS_H */
--- a/sdk/xtdk/amd64/hltypes.h
+++ b/sdk/xtdk/amd64/hltypes.h
@@ -62,10 +62,6 @@
 /* PIC vector definitions */
 #define PIC1_VECTOR_SPURIOUS                            0x37

-/* PIT ports definitions */
-#define PIT_COMMAND_PORT                                0x43
-#define PIT_DATA_PORT0                                  0x40
-
 /* Serial ports information */
 #define COMPORT_ADDRESS                                 {0x3F8, 0x2F8, 0x3E8, 0x2E8, 0x5F8, 0x4F8, 0x5E8, 0x4E8}
 #define COMPORT_COUNT                                   8
@@ -73,10 +69,6 @@
 /* Initial stall factor */
 #define INITIAL_STALL_FACTOR                            100

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* APIC delivery mode enumeration list */
 typedef enum _APIC_DM
 {
@@ -134,7 +126,6 @@ typedef enum _APIC_REGISTER
    APIC_TICR     = 0x38, /* Initial Count Register for Timer */
    APIC_TCCR     = 0x39, /* Current Count Register for Timer */
    APIC_TDCR     = 0x3E, /* Timer Divide Configuration Register */
-    APIC_SIPI     = 0x3F, /* Self-IPI Register */
    APIC_EAFR     = 0x40, /* extended APIC Feature register */
    APIC_EACR     = 0x41, /* Extended APIC Control Register */
    APIC_SEOI     = 0x42, /* Specific End Of Interrupt Register */
@@ -144,19 +135,6 @@ typedef enum _APIC_REGISTER
    APIC_EXT3LVTR = 0x53  /* Extended Interrupt 3 Local Vector Table */
 } APIC_REGISTER, *PAPIC_REGISTER;

-/* APIC Timer Divide enumeration list */
-typedef enum _APIC_TIMER_DIVISOR
-{
-    TIMER_DivideBy2   = 0,
-    TIMER_DivideBy4   = 1,
-    TIMER_DivideBy8   = 2,
-    TIMER_DivideBy16  = 3,
-    TIMER_DivideBy32  = 8,
-    TIMER_DivideBy64  = 9,
-    TIMER_DivideBy128 = 10,
-    TIMER_DivideBy1   = 11,
-} APIC_TIMER_DIVISOR, *PAPIC_TIMER_DIVISOR;
-
 /* I8259 PIC interrupt mode enumeration list */
 typedef enum _PIC_I8259_ICW1_INTERRUPT_MODE
 {
@@ -339,17 +317,4 @@ typedef union _PIC_I8259_ICW4
    UCHAR Bits;
 } PIC_I8259_ICW4, *PPIC_I8259_ICW4;

-typedef struct _TIMER_CAPABILITIES
-{
-    BOOLEAN Arat;
-    BOOLEAN Art;
-    BOOLEAN InvariantTsc;
-    BOOLEAN RDTSCP;
-    ULONG TimerFrequency;
-    BOOLEAN TscDeadline;
-    ULONG TscDenominator;
-    ULONG TscNumerator;
-} TIMER_CAPABILITIES, *PTIMER_CAPABILITIES;
-
-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_AMD64_HLTYPES_H */
--- a/sdk/xtdk/amd64/ketypes.h
+++ b/sdk/xtdk/amd64/ketypes.h
@@ -23,7 +23,6 @@

 /* GDT selector names */
 #define KGDT_NULL                                 0x0000
-#define KGDT_R0_CMCODE                            0x0008
 #define KGDT_R0_CODE                              0x0010
 #define KGDT_R0_DATA                              0x0018
 #define KGDT_R3_CMCODE                            0x0020
@@ -47,7 +46,7 @@
 #define KGDT_DESCRIPTOR_CODE                      0x08

 /* GDT descriptor type codes */
-#define KGDT_TYPE_NONE                            0x00
+#define KGDT_TYPE_NONE                            0x0
 #define KGDT_TYPE_CODE                            (0x10 | KGDT_DESCRIPTOR_CODE | KGDT_DESCRIPTOR_EXECUTE_READ)
 #define KGDT_TYPE_DATA                            (0x10 | KGDT_DESCRIPTOR_READ_WRITE)

@@ -59,7 +58,6 @@
 #define KIDT_IST_RESERVED                         0
 #define KIDT_IST_PANIC                            1
 #define KIDT_IST_MCA                              2
-#define KIDT_IST_NMI                              3

 /* AMD64 Segment Types */
 #define AMD64_TASK_GATE                           0x5
@@ -110,9 +108,11 @@
 /* Static Kernel-Mode address start */
 #define KSEG0_BASE                        0xFFFFF80000000000

+/* XTOS Kernel address base */
+#define KSEG0_KERNEL_BASE                 0x0000000800000000
+
 /* XTOS Kernel stack size */
 #define KERNEL_STACK_SIZE                 0x8000
-#define KERNEL_STACKS                     3

 /* XTOS Kernel stack guard pages */
 #define KERNEL_STACK_GUARD_PAGES          1
@@ -138,10 +138,6 @@
 #define NPX_STATE_SCRUB                   0x1
 #define NPX_STATE_SWITCH                  0x2

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Floating point state storing structure */
 typedef struct _FLOATING_SAVE_AREA
 {
@@ -276,18 +272,11 @@ typedef struct _KIDTENTRY
 {
    USHORT OffsetLow;
    USHORT Selector;
-    union
-    {
-        struct
-        {
-            USHORT IstIndex:3;
-            USHORT Reserved0:5;
-            USHORT Type:5;
-            USHORT Dpl:2;
-            USHORT Present:1;
-        };
-        USHORT Access;
-    };
+    USHORT IstIndex:3;
+    USHORT Reserved0:5;
+    USHORT Type:5;
+    USHORT Dpl:2;
+    USHORT Present:1;
    USHORT OffsetMiddle;
    ULONG OffsetHigh;
    ULONG Reserved1;
@@ -523,7 +512,6 @@ typedef struct _KPROCESSOR_BLOCK
    KAFFINITY SetMember;
    ULONG StallScaleFactor;
    UCHAR CpuNumber;
-    PINTERRUPT_HANDLER InterruptDispatchTable[256];
 } KPROCESSOR_BLOCK, *PKPROCESSOR_BLOCK;

 /* Thread Environment Block (TEB) structure definition */
@@ -532,5 +520,4 @@ typedef struct _THREAD_ENVIRONMENT_BLOCK
    THREAD_INFORMATION_BLOCK InformationBlock;
 } THREAD_ENVIRONMENT_BLOCK, *PTHREAD_ENVIRONMENT_BLOCK;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_AMD64_KETYPES_H */
--- a/sdk/xtdk/amd64/mmtypes.h
+++ b/sdk/xtdk/amd64/mmtypes.h
@@ -25,11 +25,11 @@
 #define MM_PXE_BASE                                0xFFFFF6FB7DBED000ULL

 /* Page directory and page base addresses for 5-level paging */
-#define MM_PTE_LA57_BASE                           0xFFED000000000000ULL
-#define MM_PDE_LA57_BASE                           0xFFEDF68000000000ULL
-#define MM_PPE_LA57_BASE                           0xFFEDF6FB40000000ULL
-#define MM_PXE_LA57_BASE                           0xFFEDF6FB7DA00000ULL
-#define MM_P5E_LA57_BASE                           0xFFEDF6FB7DBED000ULL
+#define MM_PTE_LA57_BASE                           0xFFFF000000000000ULL
+#define MM_PDE_LA57_BASE                           0xFFFF010000000000ULL
+#define MM_PPE_LA57_BASE                           0xFFFF010800000000ULL
+#define MM_PXE_LA57_BASE                           0xFFFF010840000000ULL
+#define MM_P5E_LA57_BASE                           0xFFFF010840200000ULL

 /* PTE shift values */
 #define MM_PTE_SHIFT                               3
@@ -39,56 +39,15 @@
 #define MM_PXI_SHIFT                               39
 #define MM_P5I_SHIFT                               48

-/* PTE state flags */
-#define MM_PTE_VALID                               0x0000000000000001ULL
-#define MM_PTE_ACCESSED                            0x0000000000000020ULL
-#define MM_PTE_DIRTY                               0x0000000000000040ULL
-
-/* PTE scope flags */
-#define MM_PTE_LARGE_PAGE                          0x0000000000000080ULL
-#define MM_PTE_GLOBAL                              0x0000000000000100ULL
-
-/* PTE access flags */
-#define MM_PTE_NOACCESS                            0x0000000000000000ULL
-#define MM_PTE_READONLY                            0x0000000000000000ULL
-#define MM_PTE_EXECUTE                             0x0000000000000000ULL
-#define MM_PTE_EXECUTE_READ                        0x0000000000000000ULL
-#define MM_PTE_READWRITE                           0x8000000000000002ULL
-#define MM_PTE_WRITECOPY                           0x8000000000000200ULL
-#define MM_PTE_EXECUTE_READWRITE                   0x0000000000000002ULL
-#define MM_PTE_EXECUTE_WRITECOPY                   0x0000000000000200ULL
-
-/* PTE protection flags */
-#define MM_PTE_NOEXECUTE                           0x8000000000000000ULL
-#define MM_PTE_GUARDED                             0x8000000000000018ULL
-#define MM_PTE_PROTECT                             0x8000000000000612ULL
-
-/* PTE cache flags */
-#define MM_PTE_CACHE_ENABLE                        0x0000000000000000ULL
-#define MM_PTE_CACHE_DISABLE                       0x0000000000000010ULL
-#define MM_PTE_CACHE_WRITECOMBINED                 0x0000000000000010ULL
-#define MM_PTE_CACHE_WRITETHROUGH                  0x0000000000000008ULL
-
-/* PTE software flags */
-#define MM_PTE_COPY_ON_WRITE                       0x0000000000000200ULL
-#define MM_PTE_PROTOTYPE                           0x0000000000000400ULL
-#define MM_PTE_TRANSITION                          0x0000000000000800ULL
-
-/* PTE frame bits */
-#define MM_PTE_FRAME_BITS                          57
-
-/* PTE protection bits */
-#define MM_PTE_PROTECTION_BITS                     5
-
-/* Base address of the system page table */
-#define MM_SYSTEM_PTE_BASE                         KSEG0_BASE
+/* Number of PTEs per page */
+#define MM_PTE_PER_PAGE                            512
+#define MM_PDE_PER_PAGE                            512
+#define MM_PPE_PER_PAGE                            512
+#define MM_PXE_PER_PAGE                            512

 /* Minimum number of physical pages needed by the system */
 #define MM_MINIMUM_PHYSICAL_PAGES                  2048

-/* Number of system PTEs */
-#define MM_DEFAULT_NUMBER_SYSTEM_PTES              22000
-
 /* Default number of secondary colors */
 #define MM_DEFAULT_SECONDARY_COLORS                64

@@ -104,25 +63,9 @@
 /* Maximum physical address used by HAL allocations */
 #define MM_MAXIMUM_PHYSICAL_ADDRESS                0x00000000FFFFFFFFULL

-/* Highest system address */
-#define MM_HIGHEST_SYSTEM_ADDRESS                  0xFFFFFFFFFFFFFFFFULL
-
 /* Trampoline code address */
 #define MM_TRAMPOLINE_ADDRESS                      0x80000

-/* Pool block size */
-#define MM_POOL_BLOCK_SIZE                         16
-
-/* Number of pool lists per page */
-#define MM_POOL_LISTS_PER_PAGE                     (MM_PAGE_SIZE / MM_POOL_BLOCK_SIZE)
-
-/* Number of pool tracking tables */
-#define MM_POOL_TRACKING_TABLES                    64
-
-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Page size enumeration list */
 typedef enum _PAGE_SIZE
 {
@@ -309,7 +252,6 @@ typedef struct _MMPFN
            USHORT ReferenceCount;
        } e2;
    } u3;
-    ULONG UsedPageTableEntries;
    union
    {
        MMPTE OriginalPte;
@@ -320,33 +262,15 @@ typedef struct _MMPFN
        ULONG_PTR EntireFrame;
        struct
        {
-            ULONG_PTR PteFrame:57;
+            ULONG_PTR PteFrame:58;
            ULONG_PTR InPageError:1;
            ULONG_PTR VerifierAllocation:1;
            ULONG_PTR AweAllocation:1;
-            ULONG_PTR Priority:3;
+            ULONG_PTR LockCharged:1;
+            ULONG_PTR KernelStack:1;
            ULONG_PTR MustBeCached:1;
        };
    } u4;
 } MMPFN, *PMMPFN;

-/* Pool descriptor structure definition */
-typedef struct _POOL_DESCRIPTOR
-{
-    LIST_ENTRY ListHeads[MM_POOL_LISTS_PER_PAGE];
-    PVOID LockAddress;
-    ULONG PoolIndex;
-    LONG PendingFreeDepth;
-    PVOID PendingFrees;
-    MMPOOL_TYPE PoolType;
-    ULONG RunningFrees;
-    ULONG RunningAllocations;
-    ULONG Threshold;
-    ULONG TotalPages;
-    ULONG TotalBigAllocations;
-    SIZE_T TotalBytes;
-    SIZE_T Reserved;
-} POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR;
-
-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_AMD64_MMTYPES_H */
--- a/sdk/xtdk/amd64/xtstruct.h
+++ b/sdk/xtdk/amd64/xtstruct.h
@@ -12,19 +12,13 @@
 #include <xtdefs.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Architecture-specific enumeration lists forward references */
 typedef enum _APIC_DM APIC_DM, *PAPIC_DM;
 typedef enum _APIC_DSH APIC_DSH, *PAPIC_DSH;
 typedef enum _APIC_MODE APIC_MODE, *PAPIC_MODE;
 typedef enum _APIC_REGISTER APIC_REGISTER, *PAPIC_REGISTER;
-typedef enum _APIC_TIMER_DIVISOR APIC_TIMER_DIVISOR, *PAPIC_TIMER_DIVISOR;
 typedef enum _CPU_VENDOR CPU_VENDOR, *PCPU_VENDOR;
-typedef enum _CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT, *PCPUID_FEATURES_ADVANCED_POWER_MANAGEMENT;
 typedef enum _CPUID_FEATURES_EXTENDED CPUID_FEATURES_EXTENDED, *PCPUID_FEATURES_EXTENDED;
-typedef enum _CPUID_FEATURES_POWER_MANAGEMENT CPUID_FEATURES_POWER_MANAGEMENT, *PCPUID_FEATURES_POWER_MANAGEMENT;
 typedef enum _CPUID_FEATURES_STANDARD1 CPUID_FEATURES_STANDARD1, *PCPUID_FEATURES_STANDARD1;
 typedef enum _CPUID_FEATURES_STANDARD7_LEAF0 CPUID_FEATURES_STANDARD7_LEAF0, *PCPUID_FEATURES_STANDARD7_LEAF0;
 typedef enum _CPUID_FEATURES_STANDARD7_LEAF1 CPUID_FEATURES_STANDARD7_LEAF1, *PCPUID_FEATURES_STANDARD7_LEAF1;
@@ -67,9 +61,7 @@ typedef struct _MMPTE_PROTOTYPE MMPTE_PROTOTYPE, *PMMPTE_PROTOTYPE;
 typedef struct _MMPTE_SOFTWARE MMPTE_SOFTWARE, *PMMPTE_SOFTWARE;
 typedef struct _MMPTE_SUBSECTION MMPTE_SUBSECTION, *PMMPTE_SUBSECTION;
 typedef struct _MMPTE_TRANSITION MMPTE_TRANSITION, *PMMPTE_TRANSITION;
-typedef struct _POOL_DESCRIPTOR POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR;
 typedef struct _THREAD_ENVIRONMENT_BLOCK THREAD_ENVIRONMENT_BLOCK, *PTHREAD_ENVIRONMENT_BLOCK;
-typedef struct _TIMER_CAPABILITIES TIMER_CAPABILITIES, *PTIMER_CAPABILITIES;

 /* Unions forward references */
 typedef union _APIC_BASE_REGISTER APIC_BASE_REGISTER, *PAPIC_BASE_REGISTER;
@@ -86,5 +78,4 @@ typedef union _PIC_I8259_ICW2 PIC_I8259_ICW2, *PPIC_I8259_ICW2;
 typedef union _PIC_I8259_ICW3 PIC_I8259_ICW3, *PPIC_I8259_ICW3;
 typedef union _PIC_I8259_ICW4 PIC_I8259_ICW4, *PPIC_I8259_ICW4;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_AMD64_XTSTRUCT_H */
--- a/sdk/xtdk/blfuncs.h
+++ b/sdk/xtdk/blfuncs.h
@@ -13,9 +13,6 @@
 #include <xtuefi.h>


-/* C/C++ specific code */
-#ifndef D__XTOS_ASSEMBLER__
-
 /* XT BootLoader routines forward references */
 XTCLINK
 XTCDECL
@@ -24,5 +21,4 @@ BlGetXtLdrProtocol(IN PEFI_SYSTEM_TABLE SystemTable,
                   IN EFI_HANDLE ImageHandle,
                   OUT PXTBL_LOADER_PROTOCOL *ProtocolHandler);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_BLFUNCS_H */
--- a/sdk/xtdk/bltypes.h
+++ b/sdk/xtdk/bltypes.h
@@ -41,10 +41,6 @@
 /* TUI dialog box maximum width */
 #define XTBL_TUI_MAX_DIALOG_WIDTH                                   100

-
-/* C/C++ specific code */
-#ifndef D__XTOS_ASSEMBLER__
-
 /* XTLDR Routine pointers */
 typedef LOADER_MEMORY_TYPE (XTCDECL *PBL_GET_MEMTYPE_ROUTINE)(IN EFI_MEMORY_TYPE EfiMemoryType);

@@ -55,7 +51,6 @@ typedef EFI_STATUS (XTCDECL *PBL_BOOTMENU_INITIALIZE_OS_LIST)(IN ULONG MaxNameLe
 typedef BOOLEAN (XTCDECL *PBL_BOOTUTILS_GET_BOOLEAN_PARAMETER)(IN PCWSTR Parameters, IN PCWSTR Needle);
 typedef VOID (XTAPI *PBL_BOOTUTILS_GET_TRAMPOLINE_INFORMATION)(IN TRAMPOLINE_TYPE TrampolineType, OUT PVOID *TrampolineCode, OUT PULONG_PTR TrampolineSize);
 typedef EFI_STATUS (XTCDECL *PBL_BUILD_PAGE_MAP)(IN PXTBL_PAGE_MAPPING PageMap, IN ULONG_PTR SelfMapAddress);
-typedef EFI_STATUS (XTCDECL *PBL_COMMIT_PAGE_MAP)(IN PXTBL_PAGE_MAPPING PageMap);
 typedef EFI_STATUS (XTCDECL *PBL_CLOSE_VOLUME)(IN PEFI_HANDLE VolumeHandle);
 typedef VOID (XTCDECL *PBL_CLEAR_CONSOLE_LINE)(IN ULONGLONG LineNo);
 typedef BOOLEAN (XTCDECL *PBL_CPU_CPUID)(IN OUT PCPUID_REGISTERS Registers);
@@ -105,9 +100,9 @@ typedef VOID (XTCDECL *PBL_LLIST_INITIALIZE_HEAD)(IN PLIST_ENTRY ListHead);
 typedef VOID (XTCDECL *PBL_LLIST_INSERT_HEAD)(IN OUT PLIST_ENTRY ListHead, IN PLIST_ENTRY Entry);
 typedef VOID (XTCDECL *PBL_LLIST_INSERT_TAIL)(IN OUT PLIST_ENTRY ListHead, IN PLIST_ENTRY Entry);
 typedef VOID (XTCDECL *PBL_LLIST_REMOVE_ENTRY)(IN PLIST_ENTRY Entry);
-typedef EFI_STATUS (XTCDECL *PBL_MAP_EFI_MEMORY)(IN OUT PXTBL_PAGE_MAPPING PageMap, IN OUT PVOID *BaseAddress, IN BOOLEAN IdentityMapping, IN PBL_GET_MEMTYPE_ROUTINE GetMemoryTypeRoutine);
-typedef EFI_STATUS (XTCDECL *PBL_MAP_PAGE)(IN PXTBL_PAGE_MAPPING PageMap, IN ULONGLONG VirtualAddress, IN ULONGLONG PhysicalAddress, IN ULONGLONG NumberOfPages);
-typedef EFI_STATUS (XTCDECL *PBL_MAP_VIRTUAL_MEMORY)(IN OUT PXTBL_PAGE_MAPPING PageMap, IN ULONGLONG VirtualAddress, IN ULONGLONG PhysicalAddress, IN ULONGLONG NumberOfPages, IN LOADER_MEMORY_TYPE MemoryType);
+typedef EFI_STATUS (XTCDECL *PBL_MAP_EFI_MEMORY)(IN OUT PXTBL_PAGE_MAPPING PageMap, IN OUT PVOID *MemoryMapAddress, IN PBL_GET_MEMTYPE_ROUTINE GetMemoryTypeRoutine);
+typedef EFI_STATUS (XTCDECL *PBL_MAP_PAGE)(IN PXTBL_PAGE_MAPPING PageMap, IN ULONG_PTR VirtualAddress, IN ULONG_PTR PhysicalAddress, IN ULONG NumberOfPages);
+typedef EFI_STATUS (XTCDECL *PBL_MAP_VIRTUAL_MEMORY)(IN OUT PXTBL_PAGE_MAPPING PageMap, IN PVOID VirtualAddress, IN PVOID PhysicalAddress, IN ULONGLONG NumberOfPages, IN LOADER_MEMORY_TYPE MemoryType);
 typedef VOID (XTAPI *PBL_MOVE_MEMORY)(IN OUT PVOID Destination, IN PCVOID Source, IN SIZE_T Length);
 typedef EFI_STATUS (XTCDECL *PBL_OPEN_VOLUME)(IN PEFI_DEVICE_PATH_PROTOCOL DevicePath, OUT PEFI_HANDLE DiskHandle, OUT PEFI_FILE_HANDLE *FsHandle);
 typedef EFI_STATUS (XTCDECL *PBL_OPEN_PROTOCOL)(OUT PEFI_HANDLE Handle, OUT PVOID *ProtocolHandler, IN PEFI_GUID ProtocolGuid);
@@ -237,8 +232,8 @@ typedef struct _XTBL_KNOWN_BOOT_PROTOCOL
 typedef struct _XTBL_MEMORY_MAPPING
 {
    LIST_ENTRY ListEntry;
-    ULONGLONG VirtualAddress;
-    ULONGLONG PhysicalAddress;
+    PVOID VirtualAddress;
+    PVOID PhysicalAddress;
    ULONGLONG NumberOfPages;
    LOADER_MEMORY_TYPE MemoryType;
 } XTBL_MEMORY_MAPPING, *PXTBL_MEMORY_MAPPING;
@@ -454,7 +449,6 @@ typedef struct _XTBL_LOADER_PROTOCOL
        PBL_ALLOCATE_PAGES AllocatePages;
        PBL_ALLOCATE_POOL AllocatePool;
        PBL_BUILD_PAGE_MAP BuildPageMap;
-        PBL_COMMIT_PAGE_MAP CommitPageMap;
        PBL_COMPARE_MEMORY CompareMemory;
        PBL_COPY_MEMORY CopyMemory;
        PBL_FREE_PAGES FreePages;
@@ -524,5 +518,4 @@ typedef struct _XTBL_LOADER_PROTOCOL
    } WideString;
 } XTBL_LOADER_PROTOCOL, *PXTBL_LOADER_PROTOCOL;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_BLTYPES_H */
--- a/sdk/xtdk/exfuncs.h
+++ b/sdk/xtdk/exfuncs.h
@@ -13,9 +13,6 @@
 #include <xttypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Kernel Executive routines forward references */
 XTCLINK
 XTFASTCALL
@@ -47,5 +44,4 @@ XTFASTCALL
 VOID
 ExWaitForRundownProtectionRelease(IN PEX_RUNDOWN_REFERENCE Descriptor);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_EXFUNCS_H */
--- a/sdk/xtdk/extypes.h
+++ b/sdk/xtdk/extypes.h
@@ -17,10 +17,6 @@
 /* Rundown protection flags */
 #define EX_RUNDOWN_ACTIVE                               0x1

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Executive rundown protection structure definition */
 typedef struct _EX_RUNDOWN_REFERENCE
 {
@@ -38,5 +34,4 @@ typedef struct _EX_RUNDOWN_WAIT_BLOCK
    KEVENT WakeEvent;
 } EX_RUNDOWN_WAIT_BLOCK, *PEX_RUNDOWN_WAIT_BLOCK;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_EXTYPES_H */
--- a/sdk/xtdk/hlfuncs.h
+++ b/sdk/xtdk/hlfuncs.h
@@ -14,9 +14,6 @@
 #include <xttypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Hardware layer routines forward references */
 XTCLINK
 XTAPI
@@ -51,5 +48,4 @@ VOID
 HlWriteRegister32(IN PVOID Register,
                  IN ULONG Value);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_HLFUNCS_H */
--- a/sdk/xtdk/hltypes.h
+++ b/sdk/xtdk/hltypes.h
@@ -101,12 +101,6 @@
 #define ACPI_MADT_PLACE_ENABLED                     0 /* Processor Local APIC CPU Enabled */
 #define ACPI_MADT_PLAOC_ENABLED                     1 /* Processor Local APIC Online Capable */

-/* ACPI address space definitions */
-#define ACPI_ADDRESS_SPACE_MEMORY                   0x00
-
-/* Maximum number of cached ACPI tables */
-#define ACPI_MAX_CACHED_TABLES                      32
-
 /* Default serial port settings */
 #define COMPORT_CLOCK_RATE                          0x1C200
 #define COMPORT_WAIT_TIMEOUT                        204800
@@ -185,14 +179,6 @@
 #define COMPORT_REG_MSR                             0x06 /* Modem Status Register */
 #define COMPORT_REG_SR                              0x07 /* Scratch Register */

-/* Minimum and maximum profile intervals */
-#define MIN_PROFILE_INTERVAL 1000
-#define MAX_PROFILE_INTERVAL 10000000
-
-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Generic Address structure */
 typedef struct _GENERIC_ADDRESS
 {
@@ -228,7 +214,7 @@ typedef struct _ACPI_SUBTABLE_HEADER
 typedef struct _ACPI_CACHE_LIST
 {
    LIST_ENTRY ListEntry;
-    PACPI_DESCRIPTION_HEADER Table;
+    ACPI_DESCRIPTION_HEADER Header;
 } ACPI_CACHE_LIST, *PACPI_CACHE_LIST;

 /* ACPI Root System Description Table Pointer (RSDP) structure */
@@ -464,5 +450,4 @@ typedef struct _SMBIOS3_TABLE_HEADER
    ULONGLONG TableAddress;
 } SMBIOS3_TABLE_HEADER, *PSMBIOS3_TABLE_HEADER;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_HLTYPES_H */
--- a/sdk/xtdk/i686/artypes.h
+++ b/sdk/xtdk/i686/artypes.h
@@ -12,7 +12,6 @@
 #include <xtdefs.h>
 #include <xtstruct.h>
 #include <xttypes.h>
-#include ARCH_HEADER(xtstruct.h)


 /* Control Register 0 constants */
@@ -93,10 +92,6 @@
 #define X86_EFLAGS_VIP_MASK                             0x00100000 /* Virtual Interrupt Pending */
 #define X86_EFLAGS_ID_MASK                              0x00200000 /* Identification */

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* CPU vendor enumeration list */
 typedef enum _CPU_VENDOR
 {
@@ -105,18 +100,6 @@ typedef enum _CPU_VENDOR
    CPU_VENDOR_UNKNOWN = 0xFFFFFFFF
 } CPU_VENDOR, *PCPU_VENDOR;

-/* CPUID advanced power management features (0x80000007) enumeration list */
-typedef enum _CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT
-{
-    CPUID_FEATURES_EDX_TS                     = 1 << 0, /* Temperature Sensor */
-    CPUID_FEATURES_EDX_FIS                    = 1 << 1, /* Frequency ID Selection */
-    CPUID_FEATURES_EDX_VIS                    = 1 << 2, /* Voltage ID Selection */
-    CPUID_FEATURES_EDX_TTS                    = 1 << 3, /* ThermaTrip Support */
-    CPUID_FEATURES_EDX_HTC                    = 1 << 4, /* Hardware Thermal Throttling */
-    CPUID_FEATURES_EDX_STC                    = 1 << 5, /* Software Thermal Throttling */
-    CPUID_FEATURES_EDX_TSCI                   = 1 << 8 /* TSC Invariant */
-} CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT, *PCPUID_FEATURES_ADVANCED_POWER_MANAGEMENT;
-
 /* CPUID extended features (0x80000001) enumeration list */
 typedef enum _CPUID_FEATURES_EXTENDED
 {
@@ -158,23 +141,6 @@ typedef enum _CPUID_FEATURES_EXTENDED
    CPUID_FEATURES_EDX_3DNOW                  = 1 << 31
 } CPUID_FEATURES_EXTENDED, *PCPUID_FEATURES_EXTENDED;

-/* CPUID Thermal and Power Management features (0x00000006) enumeration list */
-typedef enum _CPUID_FEATURES_POWER_MANAGEMENT
-{
-    CPUID_FEATURES_EAX_DTHERM                  = 1 << 0,
-    CPUID_FEATURES_EAX_IDA                     = 1 << 1,
-    CPUID_FEATURES_EAX_ARAT                    = 1 << 2,
-    CPUID_FEATURES_EAX_PLN                     = 1 << 4,
-    CPUID_FEATURES_EAX_PTS                     = 1 << 6,
-    CPUID_FEATURES_EAX_HWP                     = 1 << 7,
-    CPUID_FEATURES_EAX_HWP_NOTIFY              = 1 << 8,
-    CPUID_FEATURES_EAX_HWP_ACT_WINDOW          = 1 << 9,
-    CPUID_FEATURES_EAX_HWP_EPP                 = 1 << 10,
-    CPUID_FEATURES_EAX_HWP_PKG_REQ             = 1 << 11,
-    CPUID_FEATURES_EAX_HWP_HIGHEST_PERF_CHANGE = 1 << 15,
-    CPUID_FEATURES_EAX_HFI                     = 1 << 19
-} CPUID_FEATURES_LEAF6, *PCPUID_FEATURES_LEAF6;
-
 /* CPUID STD1 features (0x00000001) enumeration list */
 typedef enum _CPUID_FEATURES_STANDARD1
 {
@@ -201,7 +167,7 @@ typedef enum _CPUID_FEATURES_STANDARD1
    CPUID_FEATURES_ECX_X2APIC                 = 1 << 21,
    CPUID_FEATURES_ECX_MOVBE                  = 1 << 22,
    CPUID_FEATURES_ECX_POPCNT                 = 1 << 23,
-    CPUID_FEATURES_ECX_TSC_DEADLINE           = 1 << 24,
+    CPUID_FEATURES_ECX_TSC                    = 1 << 24,
    CPUID_FEATURES_ECX_AES                    = 1 << 25,
    CPUID_FEATURES_ECX_XSAVE                  = 1 << 26,
    CPUID_FEATURES_ECX_OSXSAVE                = 1 << 27,
@@ -375,23 +341,16 @@ typedef enum _CPUID_FEATURES_STANDARD7_LEAF1
 /* CPUID requests */
 typedef enum _CPUID_REQUESTS
 {
-    CPUID_GET_VENDOR_STRING                   = 0x00000000,
-    CPUID_GET_STANDARD1_FEATURES              = 0x00000001,
-    CPUID_GET_TLB_CACHE                       = 0x00000002,
-    CPUID_GET_SERIAL                          = 0x00000003,
-    CPUID_GET_CACHE_TOPOLOGY                  = 0x00000004,
-    CPUID_GET_MONITOR_MWAIT                   = 0x00000005,
-    CPUID_GET_POWER_MANAGEMENT                = 0x00000006,
-    CPUID_GET_STANDARD7_FEATURES              = 0x00000007,
-    CPUID_GET_TSC_CRYSTAL_CLOCK               = 0x00000015,
-    CPUID_GET_EXTENDED_MAX                    = 0x80000000,
-    CPUID_GET_EXTENDED_FEATURES               = 0x80000001,
-    CPUID_GET_ADVANCED_POWER_MANAGEMENT       = 0x80000007
+    CPUID_GET_VENDOR_STRING,
+    CPUID_GET_STANDARD1_FEATURES,
+    CPUID_GET_TLB_CACHE,
+    CPUID_GET_SERIAL,
+    CPUID_GET_CACHE_TOPOLOGY,
+    CPUID_GET_MONITOR_MWAIT,
+    CPUID_GET_POWER_MANAGEMENT,
+    CPUID_GET_STANDARD7_FEATURES
 } CPUID_REQUESTS, *PCPUID_REQUESTS;

-/* Interrupt handler */
-typedef VOID (*PINTERRUPT_HANDLER)(PKTRAP_FRAME TrapFrame);
-
 /* Processor identification information */
 typedef struct _CPU_IDENTIFICATION
 {
@@ -431,5 +390,4 @@ typedef enum _TRAMPOLINE_TYPE
    TrampolineApStartup
 } TRAMPOLINE_TYPE, *PTRAMPOLINE_TYPE;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_I686_ARTYPES_H */
--- a/sdk/xtdk/i686/hlfuncs.h
+++ b/sdk/xtdk/i686/hlfuncs.h
@@ -15,9 +15,6 @@
 #include <i686/xtstruct.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Hardware layer routines forward references */
 XTCLINK
 XTCDECL
@@ -52,5 +49,4 @@ VOID
 HlWritePort32(IN USHORT Port,
              IN ULONG Value);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_I686_HLFUNCS_H */
--- a/sdk/xtdk/i686/hltypes.h
+++ b/sdk/xtdk/i686/hltypes.h
@@ -69,10 +69,6 @@
 /* PIC vector definitions */
 #define PIC1_VECTOR_SPURIOUS                            0x37

-/* PIT ports definitions */
-#define PIT_COMMAND_PORT                                0x43
-#define PIT_DATA_PORT0                                  0x40
-
 /* Serial ports information */
 #define COMPORT_ADDRESS                                 {0x3F8, 0x2F8, 0x3E8, 0x2E8, 0x5F8, 0x4F8, 0x5E8, 0x4E8}
 #define COMPORT_COUNT                                   8
@@ -80,10 +76,6 @@
 /* Initial stall factor */
 #define INITIAL_STALL_FACTOR                            100

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* APIC delivery mode enumeration list */
 typedef enum _APIC_DM
 {
@@ -141,7 +133,6 @@ typedef enum _APIC_REGISTER
    APIC_TICR     = 0x38, /* Initial Count Register for Timer */
    APIC_TCCR     = 0x39, /* Current Count Register for Timer */
    APIC_TDCR     = 0x3E, /* Timer Divide Configuration Register */
-    APIC_SIPI     = 0x3F, /* Self-IPI Register */
    APIC_EAFR     = 0x40, /* extended APIC Feature register */
    APIC_EACR     = 0x41, /* Extended APIC Control Register */
    APIC_SEOI     = 0x42, /* Specific End Of Interrupt Register */
@@ -151,19 +142,6 @@ typedef enum _APIC_REGISTER
    APIC_EXT3LVTR = 0x53  /* Extended Interrupt 3 Local Vector Table */
 } APIC_REGISTER, *PAPIC_REGISTER;

-/* APIC Timer Divide enumeration list */
-typedef enum _APIC_TIMER_DIVISOR
-{
-    TIMER_DivideBy2   = 0,
-    TIMER_DivideBy4   = 1,
-    TIMER_DivideBy8   = 2,
-    TIMER_DivideBy16  = 3,
-    TIMER_DivideBy32  = 8,
-    TIMER_DivideBy64  = 9,
-    TIMER_DivideBy128 = 10,
-    TIMER_DivideBy1   = 11,
-} APIC_TIMER_DIVISOR, *PAPIC_TIMER_DIVISOR;
-
 /* I8259 PIC interrupt mode enumeration list */
 typedef enum _PIC_I8259_ICW1_INTERRUPT_MODE
 {
@@ -346,18 +324,4 @@ typedef union _PIC_I8259_ICW4
    UCHAR Bits;
 } PIC_I8259_ICW4, *PPIC_I8259_ICW4;

-/* Timer Capabilities */
-typedef struct _TIMER_CAPABILITIES
-{
-    BOOLEAN Arat;
-    BOOLEAN Art;
-    BOOLEAN InvariantTsc;
-    BOOLEAN RDTSCP;
-    ULONG TimerFrequency;
-    BOOLEAN TscDeadline;
-    ULONG TscDenominator;
-    ULONG TscNumerator;
-} TIMER_CAPABILITIES, *PTIMER_CAPABILITIES;
-
-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_I686_HLTYPES_H */
--- a/sdk/xtdk/i686/ketypes.h
+++ b/sdk/xtdk/i686/ketypes.h
@@ -50,7 +50,7 @@
 #define KGDT_DESCRIPTOR_CODE              0x08

 /* GDT descriptor type codes */
-#define KGDT_TYPE_NONE                    0x00
+#define KGDT_TYPE_NONE                    0x0
 #define KGDT_TYPE_CODE                    (0x10 | KGDT_DESCRIPTOR_CODE | KGDT_DESCRIPTOR_EXECUTE_READ)
 #define KGDT_TYPE_DATA                    (0x10 | KGDT_DESCRIPTOR_READ_WRITE)

@@ -58,6 +58,12 @@
 #define KIDT_ACCESS_RING0                 0x00
 #define KIDT_ACCESS_RING3                 0x60

+/* IDT gate types */
+#define KIDT_TASK                         0x05
+#define KIDT_CALL                         0x0C
+#define KIDT_INTERRUPT                    0x0E
+#define KIDT_TRAP                         0x0F
+
 /* TSS Offsets */
 #define KTSS_ESP0                         0x04
 #define KTSS_CR3                          0x1C
@@ -82,7 +88,6 @@
 #define KTSS_IO_MAPS                      0x68

 /* I686 Segment Types */
-#define I686_LDT                          0x2
 #define I686_TASK_GATE                    0x5
 #define I686_TSS                          0x9
 #define I686_ACTIVE_TSS                   0xB
@@ -129,9 +134,11 @@
 /* Static Kernel-Mode address start */
 #define KSEG0_BASE                        0x80000000

+/* XTOS Kernel address base */
+#define KSEG0_KERNEL_BASE                 0x01800000
+
 /* XTOS Kernel stack size */
 #define KERNEL_STACK_SIZE                 0x4000
-#define KERNEL_STACKS                     3

 /* XTOS Kernel stack guard pages */
 #define KERNEL_STACK_GUARD_PAGES          1
@@ -159,10 +166,6 @@
 #define NPX_STATE_LOADED                  0x0
 #define NPX_STATE_UNLOADED                0xA

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Floating point state storing structure */
 typedef struct _FN_SAVE_FORMAT
 {
@@ -281,18 +284,7 @@ typedef struct _KIDTENTRY
 {
    USHORT Offset;
    USHORT Selector;
-    union
-    {
-        struct
-        {
-            UCHAR Reserved;
-            UCHAR Type:4;
-            UCHAR Flag:1;
-            UCHAR Dpl:2;
-            UCHAR Present:1;
-        };
-        USHORT Access;
-    };
+    USHORT Access;
    USHORT ExtendedOffset;
 } KIDTENTRY, *PKIDTENTRY;

@@ -478,7 +470,6 @@ typedef struct _KPROCESSOR_BLOCK
    KAFFINITY SetMember;
    ULONG StallScaleFactor;
    UCHAR CpuNumber;
-    PINTERRUPT_HANDLER InterruptDispatchTable[256];
 } KPROCESSOR_BLOCK, *PKPROCESSOR_BLOCK;

 /* Thread Environment Block (TEB) structure definition */
@@ -487,5 +478,4 @@ typedef struct _THREAD_ENVIRONMENT_BLOCK
    THREAD_INFORMATION_BLOCK InformationBlock;
 } THREAD_ENVIRONMENT_BLOCK, *PTHREAD_ENVIRONMENT_BLOCK;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_I686_KETYPES_H */
--- a/sdk/xtdk/i686/mmtypes.h
+++ b/sdk/xtdk/i686/mmtypes.h
@@ -35,58 +35,9 @@
 #define MM_PTE_LEGACY_SHIFT                        2
 #define MM_PDI_LEGACY_SHIFT                        22

-/* PTE state flags */
-#define MM_PTE_VALID                               0x00000001
-#define MM_PTE_ACCESSED                            0x00000020
-#define MM_PTE_DIRTY                               0x00000040
-
-/* PTE scope flags */
-#define MM_PTE_LARGE_PAGE                          0x00000080
-#define MM_PTE_GLOBAL                              0x00000100
-
-/* PTE access flags */
-#define MM_PTE_NOACCESS                            0x00000000
-#define MM_PTE_READONLY                            0x00000000
-#define MM_PTE_EXECUTE                             0x00000000
-#define MM_PTE_EXECUTE_READ                        0x00000000
-#define MM_PTE_READWRITE                           0x00000002
-#define MM_PTE_WRITECOPY                           0x00000200
-#define MM_PTE_EXECUTE_READWRITE                   0x00000002
-#define MM_PTE_EXECUTE_WRITECOPY                   0x00000200
-
-/* PTE protection flags */
-#define MM_PTE_NOEXECUTE                           0x00000000
-#define MM_PTE_GUARDED                             0x00000018
-#define MM_PTE_PROTECT                             0x00000612
-
-/* PTE cache flags */
-#define MM_PTE_CACHE_ENABLE                        0x00000000
-#define MM_PTE_CACHE_DISABLE                       0x00000010
-#define MM_PTE_CACHE_WRITECOMBINED                 0x00000010
-#define MM_PTE_CACHE_WRITETHROUGH                  0x00000008
-
-/* PTE software flags */
-#define MM_PTE_COPY_ON_WRITE                       0x00000200
-#define MM_PTE_PROTOTYPE                           0x00000400
-#define MM_PTE_TRANSITION                          0x00000800
-
-/* PTE frame bits */
-#define MM_PTE_FRAME_BITS                          25
-
-/* PTE protection bits */
-#define MM_PTE_PROTECTION_BITS                     5
-
-/* Base address of the system page table */
-#define MM_SYSTEM_PTE_BASE                         NULLPTR
-
 /* Minimum number of physical pages needed by the system */
 #define MM_MINIMUM_PHYSICAL_PAGES                  1100

-/* Number of system PTEs */
-#define MM_MINIMUM_NUMBER_SYSTEM_PTES              7000
-#define MM_DEFAULT_NUMBER_SYSTEM_PTES              11000
-#define MM_MAXIMUM_NUMBER_SYSTEM_PTES              22000
-
 /* Default number of secondary colors */
 #define MM_DEFAULT_SECONDARY_COLORS                64

@@ -102,25 +53,9 @@
 /* Maximum physical address used by HAL allocations */
 #define MM_MAXIMUM_PHYSICAL_ADDRESS                0xFFFFFFFF

-/* Highest system address */
-#define MM_HIGHEST_SYSTEM_ADDRESS                  0xFFFFFFFF
-
 /* Trampoline code address */
 #define MM_TRAMPOLINE_ADDRESS                      0x80000

-/* Pool block size */
-#define MM_POOL_BLOCK_SIZE                         8
-
-/* Number of pool lists per page */
-#define MM_POOL_LISTS_PER_PAGE                     (MM_PAGE_SIZE / MM_POOL_BLOCK_SIZE)
-
-/* Number of pool tracking tables */
-#define MM_POOL_TRACKING_TABLES                    32
-
-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Page size enumeration list */
 typedef enum _PAGE_SIZE
 {
@@ -171,6 +106,7 @@ typedef struct _HARDWARE_MODERN_PTE
 /* Generic Page Table entry union to abstract PML2 and PML3 formats */
 typedef union _HARDWARE_PTE
 {
+    ULONGLONG Long;
    HARDWARE_LEGACY_PTE Pml2;
    HARDWARE_MODERN_PTE Pml3;
 } HARDWARE_PTE, *PHARDWARE_PTE;
@@ -265,12 +201,12 @@ typedef struct _MMPML2_PTE_TRANSITION
 typedef union _MMPML2_PTE
 {
    ULONG Long;
-    HARDWARE_LEGACY_PTE Flush;
-    MMPML2_PTE_HARDWARE Hardware;
-    MMPML2_PTE_PROTOTYPE Prototype;
-    MMPML2_PTE_SOFTWARE Software;
-    MMPML2_PTE_TRANSITION Transition;
-    MMPML2_PTE_SUBSECTION Subsection;
+    HARDWARE_PTE Flush;
+    MMPML2_PTE_HARDWARE Hard;
+    MMPML2_PTE_PROTOTYPE Proto;
+    MMPML2_PTE_SOFTWARE Soft;
+    MMPML2_PTE_TRANSITION Trans;
+    MMPML2_PTE_SUBSECTION Subsect;
    MMPML2_PTE_LIST List;
 } MMPML2_PTE, *PMMPML2_PTE;

@@ -360,7 +296,7 @@ typedef struct _MMPML3_PTE_TRANSITION
 typedef union _MMPML3_PTE
 {
    ULONGLONG Long;
-    HARDWARE_MODERN_PTE Flush;
+    HARDWARE_PTE Flush;
    MMPML3_PTE_HARDWARE Hardware;
    MMPML3_PTE_PROTOTYPE Prototype;
    MMPML3_PTE_SOFTWARE Software;
@@ -372,6 +308,7 @@ typedef union _MMPML3_PTE
 /* Generic Page Table Entry union to abstract PML2 and PML3 formats */
 typedef union _MMPTE
 {
+    ULONGLONG Long;
    MMPML2_PTE Pml2;
    MMPML3_PTE Pml3;
 } MMPTE, *PMMPTE;
@@ -402,7 +339,6 @@ typedef struct _MMPFN
            USHORT ReferenceCount;
        } e2;
    } u3;
-    ULONG UsedPageTableEntries;
    union
    {
        MMPTE OriginalPte;
@@ -413,33 +349,15 @@ typedef struct _MMPFN
        ULONG_PTR EntireFrame;
        struct
        {
-            ULONG_PTR PteFrame:25;
+            ULONG_PTR PteFrame:26;
            ULONG_PTR InPageError:1;
            ULONG_PTR VerifierAllocation:1;
            ULONG_PTR AweAllocation:1;
-            ULONG_PTR Priority:3;
+            ULONG_PTR LockCharged:1;
+            ULONG_PTR KernelStack:1;
            ULONG_PTR MustBeCached:1;
        };
    } u4;
 } MMPFN, *PMMPFN;

-/* Pool descriptor structure definition */
-typedef struct _POOL_DESCRIPTOR
-{
-    LIST_ENTRY ListHeads[MM_POOL_LISTS_PER_PAGE];
-    PVOID LockAddress;
-    ULONG PoolIndex;
-    LONG PendingFreeDepth;
-    PVOID PendingFrees;
-    MMPOOL_TYPE PoolType;
-    ULONG RunningFrees;
-    ULONG RunningAllocations;
-    ULONG Threshold;
-    ULONG TotalPages;
-    ULONG TotalBigAllocations;
-    SIZE_T TotalBytes;
-    SIZE_T Reserved;
-} POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR;
-
-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_I686_MMTYPES_H */
--- a/sdk/xtdk/i686/xtstruct.h
+++ b/sdk/xtdk/i686/xtstruct.h
@@ -12,19 +12,13 @@
 #include <xtdefs.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Architecture-specific enumeration lists forward references */
 typedef enum _APIC_DM APIC_DM, *PAPIC_DM;
 typedef enum _APIC_DSH APIC_DSH, *PAPIC_DSH;
 typedef enum _APIC_MODE APIC_MODE, *PAPIC_MODE;
 typedef enum _APIC_REGISTER APIC_REGISTER, *PAPIC_REGISTER;
-typedef enum _APIC_TIMER_DIVISOR APIC_TIMER_DIVISOR, *PAPIC_TIMER_DIVISOR;
 typedef enum _CPU_VENDOR CPU_VENDOR, *PCPU_VENDOR;
-typedef enum _CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT CPUID_FEATURES_ADVANCED_POWER_MANAGEMENT, *PCPUID_FEATURES_ADVANCED_POWER_MANAGEMENT;
 typedef enum _CPUID_FEATURES_EXTENDED CPUID_FEATURES_EXTENDED, *PCPUID_FEATURES_EXTENDED;
-typedef enum _CPUID_FEATURES_POWER_MANAGEMENT CPUID_FEATURES_POWER_MANAGEMENT, *PCPUID_FEATURES_POWER_MANAGEMENT;
 typedef enum _CPUID_FEATURES_STANDARD1 CPUID_FEATURES_STANDARD1, *PCPUID_FEATURES_STANDARD1;
 typedef enum _CPUID_FEATURES_STANDARD7_LEAF0 CPUID_FEATURES_STANDARD7_LEAF0, *PCPUID_FEATURES_STANDARD7_LEAF0;
 typedef enum _CPUID_FEATURES_STANDARD7_LEAF1 CPUID_FEATURES_STANDARD7_LEAF1, *PCPUID_FEATURES_STANDARD7_LEAF1;
@@ -76,9 +70,7 @@ typedef struct _MMPML3_PTE_PROTOTYPE MMPML3_PTE_PROTOTYPE, *PMMPML3_PTE_PROTOTYP
 typedef struct _MMPML3_PTE_SOFTWARE MMPML3_PTE_SOFTWARE, *PMMPML3_PTE_SOFTWARE;
 typedef struct _MMPML3_PTE_SUBSECTION MMPML3_PTE_SUBSECTION, *PMMPML3_PTE_SUBSECTION;
 typedef struct _MMPML3_PTE_TRANSITION MMPML3_PTE_TRANSITION, *PMMPML3_PTE_TRANSITION;
-typedef struct _POOL_DESCRIPTOR POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR;
 typedef struct _THREAD_ENVIRONMENT_BLOCK THREAD_ENVIRONMENT_BLOCK, *PTHREAD_ENVIRONMENT_BLOCK;
-typedef struct _TIMER_CAPABILITIES TIMER_CAPABILITIES, *PTIMER_CAPABILITIES;

 /* Unions forward references */
 typedef union _APIC_BASE_REGISTER APIC_BASE_REGISTER, *PAPIC_BASE_REGISTER;
@@ -96,5 +88,4 @@ typedef union _PIC_I8259_ICW2 PIC_I8259_ICW2, *PPIC_I8259_ICW2;
 typedef union _PIC_I8259_ICW3 PIC_I8259_ICW3, *PPIC_I8259_ICW3;
 typedef union _PIC_I8259_ICW4 PIC_I8259_ICW4, *PPIC_I8259_ICW4;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_I686_XTSTRUCT_H */
--- a/sdk/xtdk/iotypes.h
+++ b/sdk/xtdk/iotypes.h
@@ -58,10 +58,6 @@
 #define PCI_STATUS_SIGNALED_SYSTEM_ERROR        0x4000
 #define PCI_STATUS_DETECTED_PARITY_ERROR        0x8000

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* PCI bridge control registers */
 typedef struct _PCI_BRIDGE_CONTROL_REGISTER
 {
@@ -218,5 +214,4 @@ typedef struct _PCI_TYPE1_DEVICE
    PCI_BRIDGE_CONTROL_REGISTER Bridge;
 } PCI_TYPE1_DEVICE, *PPCI_TYPE1_DEVICE;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_IOTYPES_H */
--- a/sdk/xtdk/kdfuncs.h
+++ b/sdk/xtdk/kdfuncs.h
@@ -13,9 +13,6 @@
 #include <xttypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Kernel debugger routines forward references */
 XTCLINK
 XTCDECL
@@ -23,5 +20,4 @@ VOID
 DbgPrint(PCWSTR Format,
         ...);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_KDFUNCS_H */
--- a/sdk/xtdk/kdtypes.h
+++ b/sdk/xtdk/kdtypes.h
@@ -21,10 +21,6 @@
 #define DEBUG_PROVIDER_COMPORT                              0x00000001
 #define DEBUG_PROVIDER_FRAMEBUFFER                          0x00000002

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Kernel routine callbacks */
 typedef XTSTATUS (XTAPI *PKD_INIT_ROUTINE)();
 typedef VOID (*PKD_PRINT_ROUTINE)(IN PCWSTR Format, IN ...);
@@ -46,5 +42,4 @@ typedef struct _KD_DISPATCH_TABLE
    RTL_PRINT_CONTEXT PrintContext;
 } KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_KDTYPES_H */
--- a/sdk/xtdk/kefuncs.h
+++ b/sdk/xtdk/kefuncs.h
@@ -15,9 +15,6 @@
 #include <ketypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Kernel services routines forward references */
 XTCLINK
 XTFASTCALL
@@ -162,5 +159,4 @@ XTAPI
 BOOLEAN
 KeSignalCallDpcSynchronize(IN PVOID SystemArgument);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_KEFUNCS_H */
--- a/sdk/xtdk/ketypes.h
+++ b/sdk/xtdk/ketypes.h
@@ -49,10 +49,6 @@
 #define THREAD_HIGH_PRIORITY                        31
 #define THREAD_MAXIMUM_PRIORITY                     32

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Adjust reason */
 typedef enum _ADJUST_REASON
 {
@@ -137,37 +133,6 @@ typedef enum _KPROCESS_STATE
    ProcessOutSwap
 } KPROCESS_STATE, *PKPROCESS_STATE;

-/* Kernel profiling sources */
-typedef enum _KPROFILE_SOURCE
-{
-    ProfileTime,
-    ProfileAlignmentFixup,
-    ProfileTotalIssues,
-    ProfilePipelineDry,
-    ProfileLoadInstructions,
-    ProfilePipelineFrozen,
-    ProfileBranchInstructions,
-    ProfileTotalNonissues,
-    ProfileDcacheMisses,
-    ProfileIcacheMisses,
-    ProfileCacheMisses,
-    ProfileBranchMispredictions,
-    ProfileStoreInstructions,
-    ProfileFpInstructions,
-    ProfileIntegerInstructions,
-    Profile2Issue,
-    Profile3Issue,
-    Profile4Issue,
-    ProfileSpecialInstructions,
-    ProfileTotalCycles,
-    ProfileIcacheIssues,
-    ProfileDcacheAccesses,
-    ProfileMemoryBarrierCycles,
-    ProfileLoadLinkedIssues,
-    ProfileXtKernel,
-    ProfileMaximum
-} KPROFILE_SOURCE, *PKPROFILE_SOURCE;
-
 /* Thread state */
 typedef enum _KTHREAD_STATE
 {
@@ -185,23 +150,21 @@ typedef enum _KTHREAD_STATE
 typedef enum _KSPIN_LOCK_QUEUE_LEVEL
 {
    DispatcherLock,
-    ExpansionLock,
+    UnusedSpareLock,
    PfnLock,
    SystemSpaceLock,
    VacbLock,
    MasterLock,
-    NonPagedAllocPoolLock,
+    NonPagedPoolLock,
    IoCancelLock,
    WorkQueueLock,
    IoVpbLock,
    IoDatabaseLock,
    IoCompletionLock,
-    FileSystemLock,
+    FsStructLock,
    AfdWorkQueueLock,
    BcbLock,
-    NonPagedPoolLock,
-    ReservedSystemLock,
-    TimerTableLock,
+    MmNonPagedPoolLock,
    MaximumLock
 } KSPIN_LOCK_QUEUE_LEVEL, *PKSPIN_LOCK_QUEUE_LEVEL;

@@ -682,5 +645,4 @@ typedef struct _KUBSAN_TYPE_MISMATCH_DATA_V1
    UCHAR TypeCheckKind;
 } KUBSAN_TYPE_MISMATCH_DATA_V1, *PKUBSAN_TYPE_MISMATCH_DATA_V1;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_KEFUNCS_H */
--- a/sdk/xtdk/ldrtypes.h
+++ b/sdk/xtdk/ldrtypes.h
@@ -38,10 +38,6 @@
 #define LDR_DTE_MM_LOADED                          0x40000000
 #define LDR_DTE_COMPAT_DATABASE_PROCESSED          0x80000000

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Loader data table entry */
 typedef struct _LDR_DATA_TABLE_ENTRY
 {
@@ -74,5 +70,4 @@ typedef struct _LDR_DATA_TABLE_ENTRY
    PVOID PatchInformation;
 } LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_LDRTYPES_H */
--- a/sdk/xtdk/mmfuncs.h
+++ b/sdk/xtdk/mmfuncs.h
@@ -1,44 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            sdk/xtdk/mmfuncs.h
- * DESCRIPTION:     XTOS memory manager routine definitions
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-#ifndef __XTDK_MMFUNCS_H
-#define __XTDK_MMFUNCS_H
-
-#include <xtdefs.h>
-#include <xtstruct.h>
-#include <xttypes.h>
-
-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
-/* Memory manager routines forward references */
-XTAPI
-XTSTATUS
-MmAllocatePool(IN MMPOOL_TYPE PoolType,
-               IN SIZE_T Bytes,
-               OUT PVOID *Memory);
-
-XTAPI
-XTSTATUS
-MmAllocatePoolWithTag(IN MMPOOL_TYPE PoolType,
-                      IN SIZE_T Bytes,
-                      OUT PVOID *Memory,
-                      IN ULONG Tag);
-
-XTAPI
-XTSTATUS
-MmFreePool(IN PVOID VirtualAddress);
-
-XTAPI
-XTSTATUS
-MmFreePoolWithTag(IN PVOID VirtualAddress,
-                  IN ULONG Tag);
-
-#endif /* __XTOS_ASSEMBLER__ */
-#endif /* __XTDK_MMFUNCS_H */
--- a/sdk/xtdk/mmtypes.h
+++ b/sdk/xtdk/mmtypes.h
@@ -4,7 +4,6 @@
 * FILE:            sdk/xtdk/mmtypes.h
 * DESCRIPTION:     Memory management data structures
 * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
- *                  Aiken Harris <harraiken91@gmail.com>
 */

 #ifndef __XTDK_MMTYPES_H
@@ -14,99 +13,6 @@
 #include ARCH_HEADER(xtstruct.h)


-/* Number of hyper space pages */
-#define MM_HYPERSPACE_PAGE_COUNT                   255
-
-/* Number of free page list heads */
-#define MM_MAX_FREE_PAGE_LIST_HEADS                4
-
-/* Number of paging colors */
-#define MM_PAGING_COLORS                           64
-
-/* PTE frame mask definition */
-#define MM_PFN_PTE_FRAME                           (((ULONG_PTR)1 << MM_PTE_FRAME_BITS) - 1)
-
-/* Memory manager pool type mask definition */
-#define MM_POOL_TYPE_MASK                          1
-
-/* Bad pool caller reasons */
-#define MM_POOL_INVALID_ALLOC_RUNLEVEL             8
-#define MM_POOL_INVALID_FREE_RUNLEVEL              9
-
-/* Pool flags */
-#define MM_POOL_BIG_ALLOCATIONS_ENTRY_FREE         0x1
-#define MM_POOL_PROTECTED                          0x80000000
-#define MM_POOL_RAISE_EXCEPTION                    0x10
-
-/* Number of reserved zeroed PTEs */
-#define MM_RESERVED_ZERO_PTES                      32
-
-/* Memory Manager Protection Bits */
-#define MM_ZERO_ACCESS                             0
-#define MM_READONLY                                1
-#define MM_EXECUTE                                 2
-#define MM_EXECUTE_READ                            3
-#define MM_READWRITE                               4
-#define MM_WRITECOPY                               5
-#define MM_EXECUTE_READWRITE                       6
-#define MM_EXECUTE_WRITECOPY                       7
-#define MM_PROTECT_ACCESS                          7
-
-/* Protection field shift */
-#define MM_PROTECT_FIELD_SHIFT                     5
-
-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
-/* Memory manager page lists */
-typedef enum _MMPAGELISTS
-{
-   ZeroedPageList = 0,
-   FreePageList = 1,
-   StandbyPageList = 2,
-   ModifiedPageList = 3,
-   ModifiedReadOnlyPageList = 4,
-   BadPageList = 5,
-   ActiveAndValid = 6,
-   TransitionPage = 7
-} MMPAGELISTS, *PMMPAGELISTS;
-
-/* Page cache attributes */
-typedef enum _MMPFN_CACHE_ATTRIBUTE
-{
-    PfnNonCached,
-    PfnCached,
-    PfnWriteCombined,
-    PfnNotMapped
-} MMPFN_CACHE_ATTRIBUTE, *PMMPFN_CACHE_ATTRIBUTE;
-
-/* Memory Manager pool types */
-typedef enum _MMPOOL_TYPE
-{
-    NonPagedPool = 0,
-    PagedPool = 1,
-    NonPagedPoolMustSucceed = 2,
-    NonPagedPoolCacheAligned = 4,
-    PagedPoolCacheAligned = 5,
-    NonPagedPoolCacheAlignedMustSucceed = 6,
-    MaxPoolType = 7,
-    NonPagedPoolSession = 32,
-    PagedPoolSession = 33,
-    NonPagedPoolMustSucceedSession = 34,
-    NonPagedPoolCacheAlignedSession = 36,
-    PagedPoolCacheAlignedSession = 37,
-    NonPagedPoolCacheAlignedMustSucceedSession = 38
-} MMPOOL_TYPE, *PMMPOOL_TYPE;
-
-/* Page table pool types */
-typedef enum _MMSYSTEM_PTE_POOL_TYPE
-{
-    SystemPteSpace,
-    NonPagedPoolExpansion,
-    MaximumPtePoolTypes
-} MMSYSTEM_PTE_POOL_TYPE, *PMMSYSTEM_PTE_POOL_TYPE;
-
 /* Page map routines structure definition */
 typedef CONST STRUCT _CMMPAGEMAP_ROUTINES
 {
@@ -124,58 +30,6 @@ typedef struct _MMCOLOR_TABLES
    ULONG_PTR Count;
 } MMCOLOR_TABLES, *PMMCOLOR_TABLES;

-/* Free pool entry structure definition */
-typedef struct _MMFREE_POOL_ENTRY
-{
-    LIST_ENTRY List;
-    PFN_COUNT Size;
-    PMMFREE_POOL_ENTRY Owner;
-} MMFREE_POOL_ENTRY, *PMMFREE_POOL_ENTRY;
-
-/* Memory layout structure definition */
-typedef struct _MMMEMORY_LAYOUT
-{
-    PMMPFN PfnDatabase;
-    PFN_NUMBER PfnDatabaseSize;
-    PVOID SelfMapAddress;
-    PVOID HardwarePoolStart;
-    PVOID HardwarePoolEnd;
-    PVOID HyperSpaceStart;
-    PVOID HyperSpaceEnd;
-    PVOID LoaderMappingsStart;
-    PVOID LoaderMappingsEnd;
-    PFN_NUMBER LoaderMappingsSize;
-    PVOID NonCanonicalStart;
-    PVOID NonCanonicalEnd;
-    PVOID NonPagedPoolStart;
-    PVOID NonPagedPoolEnd;
-    PFN_NUMBER NonPagedPoolSize;
-    PVOID NonPagedExpansionPoolStart;
-    PVOID NonPagedExpansionPoolEnd;
-    PFN_NUMBER NonPagedExpansionPoolSize;
-    PVOID NonPagedSystemPoolStart;
-    PVOID NonPagedSystemPoolEnd;
-    PFN_NUMBER NonPagedSystemPoolSize;
-    PVOID PagedPoolStart;
-    PVOID PagedPoolEnd;
-    PFN_NUMBER PagedPoolSize;
-    PVOID ReservedSystemPoolStart;
-    PVOID ReservedSystemPoolEnd;
-    PVOID SessionSpaceStart;
-    PVOID SessionSpaceEnd;
-    PFN_NUMBER SessionSpaceSize;
-    PVOID SharedSystemPageStart;
-    PVOID SharedSystemPageEnd;
-    PVOID SystemCacheStart;
-    PVOID SystemCacheEnd;
-    PVOID SystemWorkingSetStart;
-    PVOID SystemWorkingSetEnd;
-    PVOID UserSpaceStart;
-    PVOID UserSpaceEnd;
-    PVOID PteSpaceStart;
-    PVOID PteSpaceEnd;
-} MMMEMORY_LAYOUT, *PMMMEMORY_LAYOUT;
-
 /* Page Frame Entry structure definition */
 typedef struct _MMPFNENTRY
 {
@@ -191,76 +45,4 @@ typedef struct _MMPFNENTRY
    USHORT ParityError:1;
 } MMPFNENTRY, *PMMPFNENTRY;

-/* Page Frame List structure definition */
-typedef struct _MMPFNLIST
-{
-    PFN_NUMBER Total;
-    MMPAGELISTS ListName;
-    PFN_NUMBER Flink;
-    PFN_NUMBER Blink;
-} MMPFNLIST, *PMMPFNLIST;
-
-/* Physical memory run structure definition */
-typedef struct _PHYSICAL_MEMORY_RUN
-{
-    PFN_NUMBER BasePage;
-    PFN_NUMBER PageCount;
-} PHYSICAL_MEMORY_RUN, *PPHYSICAL_MEMORY_RUN;
-
-/* Physical memory descriptor structure definition */
-typedef struct _PHYSICAL_MEMORY_DESCRIPTOR
-{
-    ULONG NumberOfRuns;
-    PFN_NUMBER NumberOfPages;
-    PHYSICAL_MEMORY_RUN Run[1];
-} PHYSICAL_MEMORY_DESCRIPTOR, *PPHYSICAL_MEMORY_DESCRIPTOR;
-
-/* Pool header structure definition */
-typedef struct _POOL_HEADER
-{
-    union
-    {
-        struct
-        {
-            USHORT PreviousSize:9;
-            USHORT PoolIndex:7;
-            USHORT BlockSize:9;
-            USHORT PoolType:7;
-        };
-        ULONG Long;
-    };
-    union
-    {
-        ULONG PoolTag;
-        PEPROCESS ProcessBilled;
-        struct
-        {
-            USHORT AllocatorBackTraceIndex;
-            USHORT PoolTagHash;
-        };
-    };
-} POOL_HEADER, *PPOOL_HEADER;
-
-/* Pool descriptor structure definition */
-typedef struct _POOL_TRACKING_BIG_ALLOCATIONS
-{
-    ULONG NumberOfPages;
-    PVOID QuotaObject;
-    ULONG Tag;
-    PVOID VirtualAddress;
-} POOL_TRACKING_BIG_ALLOCATIONS, *PPOOL_TRACKING_BIG_ALLOCATIONS;
-
-/* Pool tracking table structure definition */
-typedef struct _POOL_TRACKING_TABLE
-{
-    LONG NonPagedAllocations;
-    SIZE_T NonPagedBytes;
-    LONG NonPagedFrees;
-    LONG PagedAllocations;
-    SIZE_T PagedBytes;
-    LONG PagedFrees;
-    ULONG Tag;
-} POOL_TRACKING_TABLE, *PPOOL_TRACKING_TABLE;
-
-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_MMTYPES_H */
--- a/sdk/xtdk/potypes.h
+++ b/sdk/xtdk/potypes.h
@@ -14,9 +14,6 @@
 #include <ketypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Power Manager routine callbacks */
 typedef VOID (XTFASTCALL *PPROCESSOR_IDLE_FUNCTION)(IN PPROCESSOR_POWER_STATE PowerState);
 typedef XTSTATUS (XTFASTCALL *PSET_PROCESSOR_THROTTLE)(IN UCHAR Throttle);
@@ -91,5 +88,4 @@ typedef struct _PROCESSOR_POWER_STATE
    ULONG LastC3UserTime;
 } PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_POTYPES_H */
--- a/sdk/xtdk/pstypes.h
+++ b/sdk/xtdk/pstypes.h
@@ -13,9 +13,6 @@
 #include <ketypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Kernel's representation of a process object */
 typedef struct _EPROCESS
 {
@@ -30,5 +27,4 @@ typedef struct _ETHREAD
    UINT Reserved0;
 } ETHREAD, *PETHREAD;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_PSTYPES_H */
--- a/sdk/xtdk/rtlfuncs.h
+++ b/sdk/xtdk/rtlfuncs.h
@@ -15,9 +15,6 @@
 #include <rtltypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Runtime Library routines forward references */
 XTCLINK
 XTAPI
@@ -373,5 +370,4 @@ VOID
 RtlZeroMemory(OUT PVOID Destination,
              IN SIZE_T Length);

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_RTLFUNCS_H */
--- a/sdk/xtdk/rtltypes.h
+++ b/sdk/xtdk/rtltypes.h
@@ -49,14 +49,6 @@
 #define PFL_DIGIT_PRECISION             0x00002000
 #define PFL_THOUSANDS_GROUPING          0x00004000

-/* Cryptographic related definitions */
-#define SHA1_BLOCK_SIZE                 64
-#define SHA1_DIGEST_SIZE                20
-
-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Runtime Library routine callbacks */
 typedef XTSTATUS (*PWRITE_CHARACTER)(IN CHAR Character);
 typedef XTSTATUS (*PWRITE_WIDE_CHARACTER)(IN WCHAR Character);
@@ -103,13 +95,4 @@ typedef struct _RTL_PRINT_FORMAT_PROPERTIES
    LONG Flags;
 } RTL_PRINT_FORMAT_PROPERTIES, *PRTL_PRINT_FORMAT_PROPERTIES;

-/* Runtime Library SHA-1 context structure definition */
-typedef struct _RTL_SHA1_CONTEXT
-{
-    ULONG   State[5];
-    ULONG   Count[2];
-    UCHAR   Buffer[SHA1_BLOCK_SIZE];
-} RTL_SHA1_CONTEXT, *PRTL_SHA1_CONTEXT;
-
-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_RTLTYPES_H */
--- a/sdk/xtdk/xtbase.h
+++ b/sdk/xtdk/xtbase.h
@@ -14,9 +14,6 @@
 #include <xttypes.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Kernel affinity */
 typedef ULONG_PTR KAFFINITY, *PKAFFINITY;

@@ -32,9 +29,6 @@ typedef UCHAR KRUNLEVEL, *PKRUNLEVEL;
 /* Spin locks synchronization mechanism */
 typedef ULONG_PTR KSPIN_LOCK, *PKSPIN_LOCK;

-/* Page Frame Number count */
-typedef ULONG PFN_COUNT;
-
 /* Page Frame Number */
 typedef ULONG_PTR PFN_NUMBER, *PPFN_NUMBER;

@@ -111,5 +105,4 @@ typedef struct _DISPATCHER_HEADER
    LIST_ENTRY WaitListHead;
 } DISPATCHER_HEADER, *PDISPATCHER_HEADER;

-#endif /* __XTOS_ASSEMBLER_ */
 #endif /* __XTDK_XTBASE_H */
--- a/sdk/xtdk/xtcompat.h
+++ b/sdk/xtdk/xtcompat.h
@@ -10,15 +10,10 @@
 #define __XTDK_XTCOMPAT_H


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 #ifdef __cplusplus
    /* C++ definitions */
-    #define NULLPTR         nullptr
-    #define VIRTUAL         virtual
    #define XTCLINK         extern "C"
-    #define XTSYMBOL(Name)  __asm__(Name)
+    #define NULLPTR         nullptr

    /* C++ boolean type */
    typedef bool BOOLEAN, *PBOOLEAN;
@@ -29,10 +24,8 @@
    typedef wchar_t wchar;
 #else
    /* C definitions */
-    #define NULLPTR         ((void *)0)
-    #define VIRTUAL
    #define XTCLINK
-    #define XTSYMBOL(Name)
+    #define NULLPTR         ((void *)0)

    /* C boolean type */
    typedef enum _BOOLEAN
@@ -45,5 +38,4 @@
    typedef unsigned short wchar;
 #endif

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTCOMPAT_H */
--- a/sdk/xtdk/xtdebug.h
+++ b/sdk/xtdk/xtdebug.h
@@ -23,7 +23,7 @@
    #define DebugPrint(Format, ...)     DbgPrint(Format, __VA_ARGS__);
 #else
    #define DEBUG                       0
-    #define DebugPrint(Format, ...)     ((VOID)NULLPTR)
+    #define DebugPrint(Format, ...)     ((VOID)NULL)
 #endif

 #endif /* __XTDK_XTDEBUG_H */
--- a/sdk/xtdk/xtdefs.h
+++ b/sdk/xtdk/xtdefs.h
@@ -74,20 +74,12 @@
 /* Macro for calculating size of a field in the structure */
 #define FIELD_SIZE(Structure, Field)           (sizeof(((Structure *)0)->Field))

-/* Macros for calculating minimum and maximum of two values */
-#define MIN(A, B)                              (((A) < (B)) ? (A) : (B))
-#define MAX(A, B)                              (((A) > (B)) ? (A) : (B))
-
 /* Macro that page-aligns a virtual address */
 #define PAGE_ALIGN(VirtualAddress)             ((PVOID)((ULONG_PTR)VirtualAddress & ~MM_PAGE_MASK))

 /* Macro that returns offset of the virtual address */
 #define PAGE_OFFSET(VirtualAddress)            ((ULONG)((ULONG_PTR)VirtualAddress & MM_PAGE_MASK))

-/* Macros for bitwise rotating */
-#define ROTATE_LEFT(Value, Count)              ((Value << Count) | (Value >> (32 - Count)))
-#define ROTATE_RIGHT(Value, Count)             ((Value >> Count) | (Value << (32 - Count)))
-
 /* Macro for rounding down */
 #define ROUND_DOWN(Value, Alignment)           ((Value) & ~((Alignment) - 1))

@@ -111,7 +103,8 @@
 #define UNIQUE(Prefix)                         CONCATENATE(CONCATENATE(__UNIQUE_ID_, Prefix), __COUNTER__)

 /* Variadic ABI functions */
-#define VA_ARG(Marker, Type)                   ((sizeof(Type) < sizeof(UINT_PTR)) ? \
+typedef __builtin_va_list VA_LIST, *PVA_LIST;
+#define VA_ARG(Marker, Type)                   ((sizeof (Type) < sizeof(UINT_PTR)) ? \
                                               (Type)(__builtin_va_arg(Marker, UINT_PTR)) : \
                                               (Type)(__builtin_va_arg(Marker, Type)))
 #define VA_COPY(Dest, Start)                   __builtin_va_copy(Dest, Start)
--- a/sdk/xtdk/xtfont.h
+++ b/sdk/xtdk/xtfont.h
@@ -13,9 +13,6 @@
 #include <xtdefs.h>


-/* C/C++ specific code */
-#ifndef D__XTOS_ASSEMBLER__
-
 /* SSF2 font header */
 typedef struct _SSFN_FONT_HEADER
 {
@@ -3983,5 +3980,4 @@ UCHAR XtFbDefaultFont[] = {0x78, 0x74, 0x66, 0x6E, 0x3B, 0xE7, 0x00, 0x00, 0x03,
                           0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
                           0x82, 0x32, 0x4E, 0x46, 0x53};

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTFONT_H */
--- a/sdk/xtdk/xtfw.h
+++ b/sdk/xtdk/xtfw.h
@@ -19,10 +19,6 @@
 /* Version number of the current XTOS loader protocol */
 #define BOOT_PROTOCOL_VERSION                                   1

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Memory allocation structures */
 typedef enum _LOADER_MEMORY_TYPE
 {
@@ -111,7 +107,6 @@ typedef struct _KERNEL_INITIALIZATION_BLOCK
    ULONG BlockVersion;
    ULONG ProtocolVersion;
    PWCHAR KernelParameters;
-    PFN_NUMBER BootImageSize;
    LIST_ENTRY LoadOrderListHead;
    LIST_ENTRY MemoryDescriptorListHead;
    LIST_ENTRY BootDriverListHead;
@@ -120,5 +115,4 @@ typedef struct _KERNEL_INITIALIZATION_BLOCK
    FIRMWARE_INFORMATION_BLOCK FirmwareInformation;
 } KERNEL_INITIALIZATION_BLOCK, *PKERNEL_INITIALIZATION_BLOCK;

-#endif /* __XTOS_ASSEMBLER_ */
 #endif /* __XTDK_XTFW_H */
--- a/sdk/xtdk/xtglyph.h
+++ b/sdk/xtdk/xtglyph.h
@@ -12,9 +12,6 @@
 #include <xttypes.h>


-/* C/C++ specific code */
-#ifndef D__XTOS_ASSEMBLER__
-
 CHAR XTGLYPH_EXECTOS_LOGO[] =
 {
  0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x25, 0x23,
@@ -64,5 +61,4 @@ CHAR XTGLYPH_EXECTOS_LOGO[] =
  0x28, 0x0d, 0x0a
 };

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTGLYPH_H */
--- a/sdk/xtdk/xtimage.h
+++ b/sdk/xtdk/xtimage.h
@@ -202,10 +202,6 @@
 #define PECOFF_IMAGE_SCN_MEM_READ                          0x40000000
 #define PECOFF_IMAGE_SCN_MEM_WRITE                         0x80000000

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* PE/COFF image representation structure */
 typedef struct _PECOFF_IMAGE_CONTEXT
 {
@@ -642,5 +638,4 @@ typedef struct _PECOFF_IMAGE_RESOURCE_DATA_ENTRY
    ULONG Reserved;
 } PECOFF_IMAGE_RESOURCE_DATA_ENTRY, *PPECOFF_IMAGE_RESOURCE_DATA_ENTRY;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTIMAGE_H */
--- a/sdk/xtdk/xtkmapi.h
+++ b/sdk/xtdk/xtkmapi.h
@@ -50,7 +50,6 @@
 #include <hlfuncs.h>
 #include <kdfuncs.h>
 #include <kefuncs.h>
-#include <mmfuncs.h>
 #include <rtlfuncs.h>

 /* Architecture specific XT routines */
--- a/sdk/xtdk/xtstruct.h
+++ b/sdk/xtdk/xtstruct.h
@@ -12,9 +12,6 @@
 #include <xtdefs.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Enumeration lists forward references */
 typedef enum _ADJUST_REASON ADJUST_REASON, *PADJUST_REASON;
 typedef enum _EXCEPTION_DISPOSITION EXCEPTION_DISPOSITION, *PEXCEPTION_DISPOSITION;
@@ -47,15 +44,10 @@ typedef enum _KDPC_IMPORTANCE KDPC_IMPORTANCE, *PKDPC_IMPORTANCE;
 typedef enum _KEVENT_TYPE KEVENT_TYPE, *PKEVENT_TYPE;
 typedef enum _KOBJECTS KOBJECTS, *PKOBJECTS;
 typedef enum _KPROCESS_STATE KPROCESS_STATE, *PKPROCESS_STATE;
-typedef enum _KPROFILE_SOURCE KPROFILE_SOURCE, *PKPROFILE_SOURCE;
 typedef enum _KTHREAD_STATE KTHREAD_STATE, *PKTHREAD_STATE;
 typedef enum _KTIMER_TYPE KTIMER_TYPE, *PKTIMER_TYPE;
 typedef enum _KUBSAN_DATA_TYPE KUBSAN_DATA_TYPE, *PKUBSAN_DATA_TYPE;
 typedef enum _LOADER_MEMORY_TYPE LOADER_MEMORY_TYPE, *PLOADER_MEMORY_TYPE;
-typedef enum _MMPAGELISTS MMPAGELISTS, *PMMPAGELISTS;
-typedef enum _MMPFN_CACHE_ATTRIBUTE MMPFN_CACHE_ATTRIBUTE, *PMMPFN_CACHE_ATTRIBUTE;
-typedef enum _MMPOOL_TYPE MMPOOL_TYPE, *PMMPOOL_TYPE;
-typedef enum _MMSYSTEM_PTE_POOL_TYPE MMSYSTEM_PTE_POOL_TYPE, *PMMSYSTEM_PTE_POOL_TYPE;
 typedef enum _MODE MODE, *PMODE;
 typedef enum _RTL_VARIABLE_TYPE RTL_VARIABLE_TYPE, *PRTL_VARIABLE_TYPE;
 typedef enum _SYSTEM_FIRMWARE_TYPE SYSTEM_FIRMWARE_TYPE, *PSYSTEM_FIRMWARE_TYPE;
@@ -282,10 +274,7 @@ typedef struct _LOADER_INFORMATION_BLOCK LOADER_INFORMATION_BLOCK, *PLOADER_INFO
 typedef struct _LOADER_MEMORY_DESCRIPTOR LOADER_MEMORY_DESCRIPTOR, *PLOADER_MEMORY_DESCRIPTOR;
 typedef struct _M128 M128, *PM128;
 typedef struct _MMCOLOR_TABLES MMCOLOR_TABLES, *PMMCOLOR_TABLES;
-typedef struct _MMFREE_POOL_ENTRY MMFREE_POOL_ENTRY, *PMMFREE_POOL_ENTRY;
-typedef struct _MMMEMORY_LAYOUT MMMEMORY_LAYOUT, *PMMMEMORY_LAYOUT;
 typedef struct _MMPFNENTRY MMPFNENTRY, *PMMPFNENTRY;
-typedef struct _MMPFNLIST MMPFNLIST, *PMMPFNLIST;
 typedef struct _PCAT_FIRMWARE_INFORMATION PCAT_FIRMWARE_INFORMATION, *PPCAT_FIRMWARE_INFORMATION;
 typedef struct _PCI_BRIDGE_CONTROL_REGISTER PCI_BRIDGE_CONTROL_REGISTER, *PPCI_BRIDGE_CONTROL_REGISTER;
 typedef struct _PCI_COMMON_CONFIG PCI_COMMON_CONFIG, *PPCI_COMMON_CONFIG;
@@ -314,11 +303,6 @@ typedef struct _PECOFF_IMAGE_ROM_HEADER PECOFF_IMAGE_ROM_HEADER, *PPECOFF_IMAGE_
 typedef struct _PECOFF_IMAGE_ROM_OPTIONAL_HEADER PECOFF_IMAGE_ROM_OPTIONAL_HEADER, *PPECOFF_IMAGE_ROM_OPTIONAL_HEADER;
 typedef struct _PECOFF_IMAGE_SECTION_HEADER PECOFF_IMAGE_SECTION_HEADER, *PPECOFF_IMAGE_SECTION_HEADER;
 typedef struct _PECOFF_IMAGE_VXD_HEADER PECOFF_IMAGE_VXD_HEADER, *PPECOFF_IMAGE_VXD_HEADER;
-typedef struct _PHYSICAL_MEMORY_DESCRIPTOR PHYSICAL_MEMORY_DESCRIPTOR, *PPHYSICAL_MEMORY_DESCRIPTOR;
-typedef struct _PHYSICAL_MEMORY_RUN PHYSICAL_MEMORY_RUN, *PPHYSICAL_MEMORY_RUN;
-typedef struct _POOL_HEADER POOL_HEADER, *PPOOL_HEADER;
-typedef struct _POOL_TRACKING_BIG_ALLOCATIONS POOL_TRACKING_BIG_ALLOCATIONS, *PPOOL_TRACKING_BIG_ALLOCATIONS;
-typedef struct _POOL_TRACKING_TABLE POOL_TRACKING_TABLE, *PPOOL_TRACKING_TABLE;
 typedef struct _PROCESSOR_IDENTITY PROCESSOR_IDENTITY, *PPROCESSOR_IDENTITY;
 typedef struct _PROCESSOR_POWER_STATE PROCESSOR_POWER_STATE, *PPROCESSOR_POWER_STATE;
 typedef struct _RTL_BITMAP RTL_BITMAP, *PRTL_BITMAP;
@@ -367,5 +351,4 @@ typedef union _LARGE_INTEGER LARGE_INTEGER, *PLARGE_INTEGER;
 typedef union _SINGLE_LIST_HEADER SINGLE_LIST_HEADER, *PSINGLE_LIST_HEADER;
 typedef union _ULARGE_INTEGER ULARGE_INTEGER, *PULARGE_INTEGER;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTSTRUCT_H */
--- a/sdk/xtdk/xttypes.h
+++ b/sdk/xtdk/xttypes.h
@@ -13,9 +13,6 @@
 #include <xtcompat.h>


-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Standard C types */
 typedef unsigned char BYTE, *PBYTE, *LPBYTE;
 typedef char CHAR, *PCHAR, *LPCHAR;
@@ -153,9 +150,6 @@ typedef LPCWSTR PCTSTR, LPCTSTR;
 typedef LPUWSTR PUTSTR, LPUTSTR;
 typedef LPCUWSTR PCUTSTR, LPCUTSTR;

-/* Variadic ABI types */
-typedef __builtin_va_list VA_LIST, *PVA_LIST;
-
 /* 128-bit floats structure */
 typedef struct _FLOAT128
 {
@@ -293,5 +287,4 @@ typedef struct _UNICODE_STRING64
 } UNICODE_STRING64, *PUNICODE_STRING64;
 typedef const UNICODE_STRING64 *PCUNICODE_STRING64;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTTYPES_H */
--- a/sdk/xtdk/xtuefi.h
+++ b/sdk/xtdk/xtuefi.h
@@ -373,10 +373,6 @@
 #define EFI_CONFIG_TABLE_SMBIOS_TABLE_GUID                 {0xEB9D2D31, 0x2D88, 0x11D3, {0x9A, 0x16, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}}
 #define EFI_CONFIG_TABLE_SMBIOS3_TABLE_GUID                {0xF2FD1544, 0x9794, 0x4A2C, {0x99, 0x2E, 0xE5, 0xBB, 0xCf, 0x20, 0xE3, 0x94}}

-
-/* C/C++ specific code */
-#ifndef __XTOS_ASSEMBLER__
-
 /* Basic UEFI types */
 typedef PVOID EFI_EVENT, *PEFI_EVENT;
 typedef PVOID EFI_HANDLE, *PEFI_HANDLE;
@@ -2727,5 +2723,4 @@ typedef struct _EFI_PROCESSOR_INFORMATION
    EFI_PROCESSOR_PHYSICAL_LOCATION Location;
 } EFI_PROCESSOR_INFORMATION, *PEFI_PROCESSOR_INFORMATION;

-#endif /* __XTOS_ASSEMBLER__ */
 #endif /* __XTDK_XTUEFI_H */
--- a/boot/xtldr/CMakeLists.txt
+++ b/boot/xtldr/CMakeLists.txt
@@ -16,7 +16,6 @@ list(APPEND LIBXTLDR_SOURCE
 # Specify list of source code files
 list(APPEND XTLDR_SOURCE
    ${XTLDR_SOURCE_DIR}/arch/${ARCH}/memory.cc
-    ${XTLDR_SOURCE_DIR}/biosutil.cc
    ${XTLDR_SOURCE_DIR}/bootutil.cc
    ${XTLDR_SOURCE_DIR}/config.cc
    ${XTLDR_SOURCE_DIR}/console.cc
@@ -39,9 +38,6 @@ add_executable(xtldr ${XTLDR_SOURCE})
 # Add linker libraries
 target_link_libraries(xtldr libxtos)

-# Add linker options
-target_link_options(xtldr PRIVATE /ALIGN:512)
-
 # Set proper binary name and install target
 if(ARCH STREQUAL "i686")
 	set(BINARY_NAME "bootia32")
@@ -53,6 +49,5 @@ set_install_target(xtldr efi/boot)

 # Set loader entrypoint and subsystem
 set_entrypoint(xtldr "BlStartXtLoader")
-set_imagebase(xtldr ${BASEADDRESS_XTLDR})
 set_linker_map(xtldr TRUE)
 set_subsystem(xtldr efi_application)
--- a/boot/xtldr/README.md
+++ b/boot/xtldr/README.md
--- a/boot/xtldr/arch/amd64/memory.cc
+++ b/boot/xtldr/arch/amd64/memory.cc
@@ -28,12 +28,13 @@ EFI_STATUS
 Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
                     IN ULONG_PTR SelfMapAddress)
 {
-    PLIST_ENTRY ModulesList, ModulesListEntry;
+    PLIST_ENTRY ListEntry, ModulesList, ModulesListEntry;
+    PXTBL_MEMORY_MAPPING Mapping;
    PXTBL_MODULE_INFO ModuleInfo;
    EFI_PHYSICAL_ADDRESS Address;
+    PVOID LoaderBase;
    ULONGLONG LoaderSize;
    EFI_STATUS Status;
-    PVOID LoaderBase;

    /* Allocate pages for the Page Map */
    Status = AllocatePages(AllocateAnyPages, 1, &Address);
@@ -43,14 +44,6 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
        return Status;
    }

-    /* Add new memory mapping for the page map itself */
-    Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, Address, 1, LoaderMemoryData);
-    if(Status != STATUS_EFI_SUCCESS)
-    {
-        /* Memory mapping failure */
-        return Status;
-    }
-
    /* Assign and zero-fill memory used by page mappings */
    PageMap->PtePointer = (PVOID)(UINT_PTR)Address;
    RTL::Memory::ZeroMemory(PageMap->PtePointer, EFI_PAGE_SIZE);
@@ -64,7 +57,7 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
    }

    /* Map the trampoline code area */
-    Status = MapVirtualMemory(PageMap, MM_TRAMPOLINE_ADDRESS, MM_TRAMPOLINE_ADDRESS,
+    Status = MapVirtualMemory(PageMap, (PVOID)MM_TRAMPOLINE_ADDRESS,(PVOID)MM_TRAMPOLINE_ADDRESS,
                              1, LoaderFirmwareTemporary);
    if(Status != STATUS_EFI_SUCCESS)
    {
@@ -81,7 +74,7 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
        ModuleInfo = CONTAIN_RECORD(ModulesListEntry, XTBL_MODULE_INFO, Flink);

        /* Map module code */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)ModuleInfo->ModuleBase, (ULONGLONG)ModuleInfo->ModuleBase,
+        Status = MapVirtualMemory(PageMap, ModuleInfo->ModuleBase, ModuleInfo->ModuleBase,
                                  EFI_SIZE_TO_PAGES(ModuleInfo->ModuleSize), LoaderFirmwareTemporary);

        /* Check if mapping succeeded */
@@ -102,7 +95,7 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
    if(LoaderBase && LoaderSize)
    {
        /* Map boot loader code as well */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)LoaderBase, (ULONGLONG)LoaderBase,
+        Status = MapVirtualMemory(PageMap, LoaderBase, LoaderBase,
                                  EFI_SIZE_TO_PAGES(LoaderSize), LoaderFirmwareTemporary);
        if(Status != STATUS_EFI_SUCCESS)
        {
@@ -116,28 +109,6 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
        return STATUS_EFI_PROTOCOL_ERROR;
    }

-    /* Return success */
-    return STATUS_EFI_SUCCESS;
-}
-
-/**
- * Iterates through the memory map and physically maps all virtual addresses to page tables.
- *
- * @param PageMap
- *        Supplies a pointer to the page mapping structure.
- *
- * @return This routine returns a status code.
- *
- * @since XT 1.0
- */
-XTCDECL
-EFI_STATUS
-Memory::CommitPageMap(IN PXTBL_PAGE_MAPPING PageMap)
-{
-    PXTBL_MEMORY_MAPPING Mapping;
-    PLIST_ENTRY ListEntry;
-    EFI_STATUS Status;
-
    /* Iterate through and map all the mappings*/
    Debug::Print(L"Mapping and dumping EFI memory:\n");
    ListEntry = PageMap->MemoryMap.Flink;
@@ -222,7 +193,7 @@ Memory::GetNextPageTable(IN PXTBL_PAGE_MAPPING PageMap,
        }

        /* Add new memory mapping */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, Address, 1, LoaderMemoryData);
+        Status = MapVirtualMemory(PageMap, NULLPTR, (PVOID)(UINT_PTR)Address, 1, LoaderMemoryData);
        if(Status != STATUS_EFI_SUCCESS)
        {
            /* Memory mapping failure */
@@ -268,9 +239,9 @@ Memory::GetNextPageTable(IN PXTBL_PAGE_MAPPING PageMap,
 XTCDECL
 EFI_STATUS
 Memory::MapPage(IN PXTBL_PAGE_MAPPING PageMap,
-                IN ULONGLONG VirtualAddress,
-                IN ULONGLONG PhysicalAddress,
-                IN ULONGLONG NumberOfPages)
+                IN ULONG_PTR VirtualAddress,
+                IN ULONG_PTR PhysicalAddress,
+                IN ULONG NumberOfPages)
 {
    PVOID Pml1, Pml2, Pml3, Pml4, Pml5;
    SIZE_T Pml1Entry, Pml2Entry, Pml3Entry, Pml4Entry, Pml5Entry;
--- a/boot/xtldr/arch/i686/memory.cc
+++ b/boot/xtldr/arch/i686/memory.cc
@@ -25,12 +25,13 @@ EFI_STATUS
 Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
                     IN ULONG_PTR SelfMapAddress)
 {
+    PLIST_ENTRY ListEntry, ModulesList, ModulesListEntry;
    EFI_PHYSICAL_ADDRESS Address, DirectoryAddress;
-    PLIST_ENTRY ModulesList, ModulesListEntry;
    PXTBL_MODULE_INFO ModuleInfo;
+    PXTBL_MEMORY_MAPPING Mapping;
+    PVOID LoaderBase;
    ULONGLONG LoaderSize;
    EFI_STATUS Status;
-    PVOID LoaderBase;
    ULONG Index;

    /* Check the page map level to determine which paging structure to create */
@@ -44,14 +45,6 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
            return Status;
        }

-        /* Add new memory mapping for the page map itself */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, Address, 1, LoaderMemoryData);
-        if(Status != STATUS_EFI_SUCCESS)
-        {
-            /* Memory mapping failure */
-            return Status;
-        }
-
        /* Assign the allocated page to the page map and zero it out */
        PageMap->PtePointer = (PVOID)(UINT_PTR)Address;
        RTL::Memory::ZeroMemory(PageMap->PtePointer, EFI_PAGE_SIZE);
@@ -64,14 +57,6 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
            return Status;
        }

-        /* Add new memory mapping for the Page Directories (PDs) */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, DirectoryAddress, 4, LoaderMemoryData);
-        if(Status != STATUS_EFI_SUCCESS)
-        {
-            /* Memory mapping failure */
-            return Status;
-        }
-
        /* Zero-fill the allocated memory for the Page Directories */
        RTL::Memory::ZeroMemory((PVOID)DirectoryAddress, EFI_PAGE_SIZE * 4);

@@ -94,14 +79,6 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
            return Status;
        }

-        /* Add new memory mapping for the page map itself */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, Address, 1, LoaderMemoryData);
-        if(Status != STATUS_EFI_SUCCESS)
-        {
-            /* Memory mapping failure */
-            return Status;
-        }
-
        /* Assign the allocated page to the page map and zero it out */
        PageMap->PtePointer = (PVOID)(UINT_PTR)Address;
        RTL::Memory::ZeroMemory(PageMap->PtePointer, EFI_PAGE_SIZE);
@@ -116,7 +93,8 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
    }

    /* Map the trampoline code area */
-    Status = MapVirtualMemory(PageMap, MM_TRAMPOLINE_ADDRESS, MM_TRAMPOLINE_ADDRESS, 1, LoaderFirmwareTemporary);
+    Status = MapVirtualMemory(PageMap, (PVOID)MM_TRAMPOLINE_ADDRESS,(PVOID)MM_TRAMPOLINE_ADDRESS,
+                              1, LoaderFirmwareTemporary);
    if(Status != STATUS_EFI_SUCCESS)
    {
        /* Mapping trampoline code failed */
@@ -132,7 +110,7 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
        ModuleInfo = CONTAIN_RECORD(ModulesListEntry, XTBL_MODULE_INFO, Flink);

        /* Map module code */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)ModuleInfo->ModuleBase, (ULONGLONG)ModuleInfo->ModuleBase,
+        Status = MapVirtualMemory(PageMap, ModuleInfo->ModuleBase, ModuleInfo->ModuleBase,
                                  EFI_SIZE_TO_PAGES(ModuleInfo->ModuleSize), LoaderFirmwareTemporary);

        /* Check if mapping succeeded */
@@ -153,7 +131,7 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
    if(LoaderBase && LoaderSize)
    {
        /* Map boot loader code as well */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)LoaderBase, (ULONGLONG)LoaderBase,
+        Status = MapVirtualMemory(PageMap, LoaderBase, LoaderBase,
                                  EFI_SIZE_TO_PAGES(LoaderSize), LoaderFirmwareTemporary);
        if(Status != STATUS_EFI_SUCCESS)
        {
@@ -167,28 +145,6 @@ Memory::BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
        return STATUS_EFI_PROTOCOL_ERROR;
    }

-    /* Return success */
-    return STATUS_EFI_SUCCESS;
-}
-
-/**
- * Iterates through the memory map and physically maps all virtual addresses to page tables.
- *
- * @param PageMap
- *        Supplies a pointer to the page mapping structure.
- *
- * @return This routine returns a status code.
- *
- * @since XT 1.0
- */
-XTCDECL
-EFI_STATUS
-Memory::CommitPageMap(IN PXTBL_PAGE_MAPPING PageMap)
-{
-    PXTBL_MEMORY_MAPPING Mapping;
-    PLIST_ENTRY ListEntry;
-    EFI_STATUS Status;
-
    /* Iterate through and map all the mappings*/
    Debug::Print(L"Mapping and dumping EFI memory:\n");
    ListEntry = PageMap->MemoryMap.Flink;
@@ -201,9 +157,8 @@ Memory::CommitPageMap(IN PXTBL_PAGE_MAPPING PageMap)
        if(Mapping->VirtualAddress)
        {
            /* Dump memory mapping */
-            Debug::Print(L"   Type=%02lu, PhysicalBase=0x%.8llX, VirtualBase=0x%.8llX, Pages=%llu\n",
-                         Mapping->MemoryType, Mapping->PhysicalAddress,
-                         Mapping->VirtualAddress, Mapping->NumberOfPages);
+            Debug::Print(L"   Type=%02lu, PhysicalBase=%.8P, VirtualBase=%.8P, Pages=%llu\n", Mapping->MemoryType,
+                         Mapping->PhysicalAddress, Mapping->VirtualAddress, Mapping->NumberOfPages);

            /* Map memory */
            Status = MapPage(PageMap, (UINT_PTR)Mapping->VirtualAddress,
@@ -297,7 +252,7 @@ Memory::GetNextPageTable(IN PXTBL_PAGE_MAPPING PageMap,
        }

        /* Add new memory mapping */
-        Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, Address, 1, LoaderMemoryData);
+        Status = MapVirtualMemory(PageMap, NULLPTR, (PVOID)(UINT_PTR)Address, 1, LoaderMemoryData);
        if(Status != STATUS_EFI_SUCCESS)
        {
            /* Memory mapping failure */
@@ -358,11 +313,11 @@ Memory::GetNextPageTable(IN PXTBL_PAGE_MAPPING PageMap,
 XTCDECL
 EFI_STATUS
 Memory::MapPage(IN PXTBL_PAGE_MAPPING PageMap,
-                IN ULONGLONG VirtualAddress,
-                IN ULONGLONG PhysicalAddress,
-                IN ULONGLONG NumberOfPages)
+                IN ULONG_PTR VirtualAddress,
+                IN ULONG_PTR PhysicalAddress,
+                IN ULONG NumberOfPages)
 {
-    ULONGLONG PageFrameNumber;
+    SIZE_T PageFrameNumber;
    PVOID Pml1, Pml2, Pml3;
    SIZE_T Pml1Entry, Pml2Entry, Pml3Entry;
    PHARDWARE_LEGACY_PTE LegacyPmlTable;
--- a/boot/xtldr/bootutil.cc
+++ b/boot/xtldr/bootutil.cc
--- a/boot/xtldr/config.cc
+++ b/boot/xtldr/config.cc
--- a/boot/xtldr/console.cc
+++ b/boot/xtldr/console.cc
--- a/boot/xtldr/data.cc
+++ b/boot/xtldr/data.cc
@@ -10,18 +10,6 @@
 #include <xtldr.hh>


-/* Legacy BIOS cursor X position */
-USHORT BiosUtils::CursorX = 0;
-
-/* Legacy BIOS cursor Y position */
-USHORT BiosUtils::CursorY = 0;
-
-/* Legacy BIOS screen height */
-CONST USHORT BiosUtils::VgaHeight = 25;
-
-/* Legacy BIOS screen width */
-CONST USHORT BiosUtils::VgaWidth = 80;
-
 /* XT Boot Loader menu list */
 PLIST_ENTRY Configuration::BootMenuList = NULLPTR;

--- a/boot/xtldr/debug.cc
+++ b/boot/xtldr/debug.cc
--- a/boot/xtldr/efiutils.cc
+++ b/boot/xtldr/efiutils.cc
--- a/boot/xtldr/includes/libxtos.hh
+++ b/boot/xtldr/includes/libxtos.hh
--- a/boot/xtldr/includes/xtldr.hh
+++ b/boot/xtldr/includes/xtldr.hh
@@ -15,25 +15,6 @@
 #include <libxtos.hh>


-class BiosUtils
-{
-    private:
-        STATIC USHORT CursorX;
-        STATIC USHORT CursorY;
-        STATIC CONST USHORT VgaHeight;
-        STATIC CONST USHORT VgaWidth;
-
-    public:
-        STATIC XTCDECL VOID ClearScreen();
-        STATIC XTCDECL VOID Print(IN PCWSTR Format,
-                                  IN ...);
-        STATIC XTCDECL XTSTATUS PutChar(IN WCHAR Character);
-
-    private:
-        STATIC XTCDECL VOID ScrollScreen();
-        STATIC XTCDECL VOID UpdateCursor();
-};
-
 class BootUtils
 {
    public:
@@ -165,7 +146,6 @@ class Memory
                                               OUT PVOID *Memory);
        STATIC XTCDECL EFI_STATUS BuildPageMap(IN PXTBL_PAGE_MAPPING PageMap,
                                               IN ULONG_PTR SelfMapAddress);
-        STATIC XTCDECL EFI_STATUS CommitPageMap(IN PXTBL_PAGE_MAPPING PageMap);
        STATIC XTCDECL EFI_STATUS FreePages(IN ULONGLONG NumberOfPages,
                                            IN EFI_PHYSICAL_ADDRESS Memory);
        STATIC XTCDECL EFI_STATUS FreePool(IN PVOID Memory);
@@ -178,16 +158,15 @@ class Memory
                                              IN SHORT PageMapLevel,
                                              IN PAGE_SIZE PageSize);
        STATIC XTCDECL EFI_STATUS MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
-                                               IN OUT PVOID *BaseAddress,
-                                               IN BOOLEAN IdentityMapping,
+                                               IN OUT PVOID *MemoryMapAddress,
                                               IN PBL_GET_MEMTYPE_ROUTINE GetMemoryTypeRoutine);
        STATIC XTCDECL EFI_STATUS MapPage(IN PXTBL_PAGE_MAPPING PageMap,
-                                          IN ULONGLONG VirtualAddress,
-                                          IN ULONGLONG PhysicalAddress,
-                                          IN ULONGLONG NumberOfPages);
+                                          IN ULONG_PTR VirtualAddress,
+                                          IN ULONG_PTR PhysicalAddress,
+                                          IN ULONG NumberOfPages);
        STATIC XTCDECL EFI_STATUS MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
-                                                   IN ULONGLONG VirtualAddress,
-                                                   IN ULONGLONG PhysicalAddress,
+                                                   IN PVOID VirtualAddress,
+                                                   IN PVOID PhysicalAddress,
                                                   IN ULONGLONG NumberOfPages,
                                                   IN LOADER_MEMORY_TYPE MemoryType);
        STATIC XTCDECL PVOID PhysicalAddressToVirtual(IN PVOID PhysicalAddress,
--- a/boot/xtldr/library/modproto.cc
+++ b/boot/xtldr/library/modproto.cc
--- a/boot/xtldr/memory.cc
+++ b/boot/xtldr/memory.cc
@@ -314,12 +314,9 @@ Memory::InitializePageMap(OUT PXTBL_PAGE_MAPPING PageMap,
 * @param PageMap
 *        Supplies a pointer to the page mapping structure.
 *
- * @param BaseAddress
+ * @param MemoryMapAddress
 *        Supplies a virtual address, where EFI memory will be mapped.
 *
- * @param IdentityMapping
- *        Specifies whether EFI non-free memory should be mapped by identity or sequential mapping.
- *
 * @param GetMemoryTypeRoutine
 *        Supplies a pointer to the routine which will be used to match EFI memory type to the OS memory type.
 *
@@ -330,20 +327,19 @@ Memory::InitializePageMap(OUT PXTBL_PAGE_MAPPING PageMap,
 XTCDECL
 EFI_STATUS
 Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
-                     IN OUT PVOID *BaseAddress,
-                     IN BOOLEAN IdentityMapping,
+                     IN OUT PVOID *MemoryMapAddress,
                     IN PBL_GET_MEMTYPE_ROUTINE GetMemoryTypeRoutine)
 {
-    ULONGLONG MaxAddress, VirtualAddress;
    PEFI_MEMORY_DESCRIPTOR Descriptor;
    LOADER_MEMORY_TYPE MemoryType;
    PEFI_MEMORY_MAP MemoryMap;
    SIZE_T DescriptorCount;
+    PUCHAR VirtualAddress;
    EFI_STATUS Status;
    SIZE_T Index;

    /* Set virtual address as specified in argument */
-    VirtualAddress = (ULONGLONG)*BaseAddress;
+    VirtualAddress = (PUCHAR)*MemoryMapAddress;

    /* Check if custom memory type routine is specified */
    if(GetMemoryTypeRoutine == NULLPTR)
@@ -371,37 +367,8 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
    /* Iterate through all descriptors from the memory map */
    for(Index = 0; Index < DescriptorCount; Index++)
    {
-        /* Check page map level */
-        if(PageMap->PageMapLevel == 2)
-        {
-            /* Limit physical address to 4GB in legacy mode */
-            MaxAddress = 0xFFFFFFFF;
-        }
-        else if(PageMap->PageMapLevel == 3)
-        {
-            /* Limit physical address to 64GB in PAE mode */
-            MaxAddress = 0xFFFFFFFFFULL;
-        }
-
-        /* Check page map level */
-        if(PageMap->PageMapLevel == 2 || PageMap->PageMapLevel == 3)
-        {
-            /* Check if physical address starts beyond limit */
-            if(Descriptor->PhysicalStart >= MaxAddress)
-            {
-                /* Go to the next descriptor */
-                Descriptor = (PEFI_MEMORY_DESCRIPTOR)((PUCHAR)Descriptor + MemoryMap->DescriptorSize);
-                continue;
-            }
-
-            /* Check if memory descriptor exceeds the lowest physical page */
-            if(Descriptor->PhysicalStart + (Descriptor->NumberOfPages << EFI_PAGE_SHIFT) > MaxAddress)
-            {
-                /* Truncate memory descriptor to the lowest supported physical page */
-                Descriptor->NumberOfPages = (MaxAddress - Descriptor->PhysicalStart) >> EFI_PAGE_SHIFT;
-            }
-        }
-
+        /* Make sure descriptor does not start beyond lowest physical page */
+        if(Descriptor->PhysicalStart <= MAXUINT_PTR)
        {
            /* Skip EFI reserved memory */
            if(Descriptor->Type == EfiReservedMemoryType)
@@ -411,6 +378,25 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
                continue;
            }

+            /* Check if preparing page map level 2 (non-PAE i686) */
+            if(PageMap->PageMapLevel == 2)
+            {
+                /* Check if physical address starts beyond 4GB */
+                if(Descriptor->PhysicalStart > 0xFFFFFFFF)
+                {
+                    /* Go to the next descriptor */
+                    Descriptor = (PEFI_MEMORY_DESCRIPTOR)((PUCHAR)Descriptor + MemoryMap->DescriptorSize);
+                    continue;
+                }
+
+                /* Check if memory descriptor exceeds the lowest physical page */
+                if(Descriptor->PhysicalStart + (Descriptor->NumberOfPages << EFI_PAGE_SHIFT) > MAXULONG)
+                {
+                    /* Truncate memory descriptor to the 4GB */
+                    Descriptor->NumberOfPages = (((ULONGLONG)MAXULONG + 1) - Descriptor->PhysicalStart) >> EFI_PAGE_SHIFT;
+                }
+            }
+
            /* Convert EFI memory type into XTLDR memory type */
            MemoryType = GetMemoryTypeRoutine((EFI_MEMORY_TYPE)Descriptor->Type);

@@ -418,32 +404,22 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
            if(MemoryType == LoaderFirmwareTemporary)
            {
                /* Map EFI firmware code */
-                Status = MapVirtualMemory(PageMap, Descriptor->PhysicalStart,
-                                          Descriptor->PhysicalStart, Descriptor->NumberOfPages, MemoryType);
+                Status = MapVirtualMemory(PageMap, (PVOID)Descriptor->PhysicalStart,
+                                          (PVOID)Descriptor->PhysicalStart, Descriptor->NumberOfPages, MemoryType);
            }
            else if(MemoryType != LoaderFree)
            {
-                /* Check mapping strategy */
-                if(IdentityMapping)
-                {
-                    /* Add any non-free memory using identity mapping */
-                    Status = MapVirtualMemory(PageMap, Descriptor->PhysicalStart + KSEG0_BASE, Descriptor->PhysicalStart,
-                                              Descriptor->NumberOfPages, MemoryType);
-                }
-                else
-                {
-                    /* Add any non-free memory using sequential mapping */
-                    Status = MapVirtualMemory(PageMap, VirtualAddress, Descriptor->PhysicalStart,
-                                              Descriptor->NumberOfPages, MemoryType);
+                /* Add any non-free memory mapping */
+                Status = MapVirtualMemory(PageMap, VirtualAddress, (PVOID)Descriptor->PhysicalStart,
+                                          Descriptor->NumberOfPages, MemoryType);

-                    /* Update virtual address */
-                    VirtualAddress = VirtualAddress + (Descriptor->NumberOfPages * MM_PAGE_SIZE);
-                }
+                /* Calculate next valid virtual address */
+                VirtualAddress += Descriptor->NumberOfPages * EFI_PAGE_SIZE;
            }
            else
            {
                /* Map all other memory as loader free */
-                Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, Descriptor->PhysicalStart,
+                Status = MapVirtualMemory(PageMap, NULLPTR, (PVOID)Descriptor->PhysicalStart,
                                          Descriptor->NumberOfPages, LoaderFree);
            }

@@ -460,7 +436,7 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
    }

    /* Always map first page */
-    Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, 0, 1, LoaderFirmwarePermanent);
+    Status = MapVirtualMemory(PageMap, NULLPTR, (PVOID)0, 1, LoaderFirmwarePermanent);
    if(Status != STATUS_EFI_SUCCESS)
    {
        /* Mapping failed */
@@ -468,7 +444,7 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
    }

    /* Map BIOS ROM and VRAM */
-    Status = MapVirtualMemory(PageMap, (ULONGLONG)NULLPTR, 0xA0000, 0x60, LoaderFirmwarePermanent);
+    Status = MapVirtualMemory(PageMap, NULLPTR, (PVOID)0xA0000, 0x60, LoaderFirmwarePermanent);
    if(Status != STATUS_EFI_SUCCESS)
    {
        /* Mapping failed */
@@ -476,7 +452,7 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
    }

    /* Store next valid virtual address and return success */
-    *BaseAddress = (PVOID)VirtualAddress;
+    *MemoryMapAddress = VirtualAddress;
    return STATUS_EFI_SUCCESS;
 }

@@ -505,13 +481,13 @@ Memory::MapEfiMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
 XTCDECL
 EFI_STATUS
 Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
-                         IN ULONGLONG VirtualAddress,
-                         IN ULONGLONG PhysicalAddress,
+                         IN PVOID VirtualAddress,
+                         IN PVOID PhysicalAddress,
                         IN ULONGLONG NumberOfPages,
                         IN LOADER_MEMORY_TYPE MemoryType)
 {
    PXTBL_MEMORY_MAPPING Mapping1, Mapping2, Mapping3;
-    ULONGLONG PhysicalAddressEnd, PhysicalAddress2End;
+    PVOID PhysicalAddressEnd, PhysicalAddress2End;
    PLIST_ENTRY ListEntry, MappingListEntry;
    SIZE_T NumberOfMappedPages;
    EFI_STATUS Status;
@@ -531,7 +507,7 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
    Mapping1->MemoryType = MemoryType;

    /* Calculate the end of the physical address */
-    PhysicalAddressEnd = PhysicalAddress + (NumberOfPages * EFI_PAGE_SIZE) - 1;
+    PhysicalAddressEnd = (PVOID)((ULONG_PTR)PhysicalAddress + (NumberOfPages * EFI_PAGE_SIZE) - 1);

    /* Iterate through all the mappings already set to insert new mapping at the correct place */
    ListEntry = PageMap->MemoryMap.Flink;
@@ -539,7 +515,7 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
    {
        /* Take a mapping from the list and calculate its end of physical address */
        Mapping2 = CONTAIN_RECORD(ListEntry, XTBL_MEMORY_MAPPING, ListEntry);
-        PhysicalAddress2End = Mapping2->PhysicalAddress + (Mapping2->NumberOfPages * EFI_PAGE_SIZE) - 1;
+        PhysicalAddress2End = (PVOID)((ULONG_PTR)Mapping2->PhysicalAddress + (Mapping2->NumberOfPages * EFI_PAGE_SIZE) - 1);

        /* Check if new mapping is a subset of an existing mapping */
        if(Mapping1->PhysicalAddress >= Mapping2->PhysicalAddress && PhysicalAddressEnd <= PhysicalAddress2End)
@@ -547,8 +523,7 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
            /* Make sure it's memory type is the same */
            if(Mapping1->MemoryType == Mapping2->MemoryType)
            {
-                /* Free the unused mapping structure and return success */
-                FreePool(Mapping1);
+                /* It is already mapped */
                return STATUS_EFI_SUCCESS;
            }
        }
@@ -564,7 +539,7 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
            }

            /* Calculate number of pages for this mapping */
-            NumberOfMappedPages = (PhysicalAddress2End - PhysicalAddressEnd) / EFI_PAGE_SIZE;
+            NumberOfMappedPages = ((PUCHAR)PhysicalAddress2End - (PUCHAR)PhysicalAddressEnd) / EFI_PAGE_SIZE;
            if(NumberOfMappedPages > 0)
            {
                /* Pages associated to the mapping, allocate memory for it */
@@ -575,21 +550,18 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
                    return Status;
                }

-                /* Set mapping fields */
-                Mapping3->PhysicalAddress = PhysicalAddressEnd + 1;
-                Mapping3->VirtualAddress = (ULONGLONG)NULLPTR;
+                /* Set mapping fields and insert it on the top */
+                Mapping3->PhysicalAddress = (PUCHAR)PhysicalAddressEnd + 1;
+                Mapping3->VirtualAddress = NULLPTR;
                Mapping3->NumberOfPages = NumberOfMappedPages;
                Mapping3->MemoryType = Mapping2->MemoryType;
-
-                /* Insert new mapping in front of the list and increase page map size */
                RTL::LinkedList::InsertHeadList(&Mapping2->ListEntry, &Mapping3->ListEntry);
-                PageMap->MapSize++;
            }

            /* Calculate number of pages and the end of the physical address */
            Mapping2->NumberOfPages = ((PUCHAR)PhysicalAddressEnd + 1 -
                                       (PUCHAR)Mapping2->PhysicalAddress) / EFI_PAGE_SIZE;
-            PhysicalAddress2End = Mapping2->PhysicalAddress + (Mapping2->NumberOfPages * EFI_PAGE_SIZE) - 1;
+            PhysicalAddress2End = (PVOID)((ULONG_PTR)Mapping2->PhysicalAddress + (Mapping2->NumberOfPages * EFI_PAGE_SIZE) - 1);
        }

        /* Check if they overlap */
@@ -614,21 +586,18 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
                    return Status;
                }

-                /* Set mapping fields */
+                /* Set mapping fields and insert it on the top */
                Mapping3->PhysicalAddress = Mapping1->PhysicalAddress;
-                Mapping3->VirtualAddress = (ULONGLONG)NULLPTR;
+                Mapping3->VirtualAddress = NULLPTR;
                Mapping3->NumberOfPages = NumberOfMappedPages;
                Mapping3->MemoryType = Mapping2->MemoryType;
-
-                /* Insert new mapping in front of the list and increase page map size */
                RTL::LinkedList::InsertHeadList(&Mapping2->ListEntry, &Mapping3->ListEntry);
-                PageMap->MapSize++;
            }

            /* Calculate number of pages and the end of the physical address */
            Mapping2->NumberOfPages = ((PUCHAR)Mapping1->PhysicalAddress -
                                       (PUCHAR)Mapping2->PhysicalAddress) / EFI_PAGE_SIZE;
-            PhysicalAddress2End = Mapping2->PhysicalAddress + (Mapping2->NumberOfPages * EFI_PAGE_SIZE) - 1;
+            PhysicalAddress2End = (PVOID)((ULONG_PTR)Mapping2->PhysicalAddress + (Mapping2->NumberOfPages * EFI_PAGE_SIZE) - 1);
        }

        /* Check if mapping is really needed */
@@ -650,19 +619,15 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
            Status = FreePool(Mapping2);
            ListEntry = MappingListEntry;

-            /* Decrease page map size and go to the next mapping */
-            PageMap->MapSize--;
+            /* Go to the next mapping */
            continue;
        }

        /* Determine physical address order */
        if(Mapping2->PhysicalAddress > Mapping1->PhysicalAddress)
        {
-            /* Insert new mapping in front of the list and increase page map size */
+            /* Insert new mapping in front */
            RTL::LinkedList::InsertHeadList(Mapping2->ListEntry.Blink, &Mapping1->ListEntry);
-            PageMap->MapSize++;
-
-            /* Return success */
            return STATUS_EFI_SUCCESS;
        }

@@ -670,7 +635,7 @@ Memory::MapVirtualMemory(IN OUT PXTBL_PAGE_MAPPING PageMap,
        ListEntry = ListEntry->Flink;
    }

-    /* Insert new mapping to the tail of the list and increase page map size */
+    /* Insert new mapping to the list and increase page map size */
    RTL::LinkedList::InsertTailList(&PageMap->MemoryMap, &Mapping1->ListEntry);
    PageMap->MapSize++;

--- a/boot/xtldr/modules/CMakeLists.txt
+++ b/boot/xtldr/modules/CMakeLists.txt
--- a/boot/xtldr/modules/acpi/CMakeLists.txt
+++ b/boot/xtldr/modules/acpi/CMakeLists.txt
--- a/boot/xtldr/modules/acpi/acpi.cc
+++ b/boot/xtldr/modules/acpi/acpi.cc
--- a/boot/xtldr/modules/acpi/data.cc
+++ b/boot/xtldr/modules/acpi/data.cc
--- a/boot/xtldr/modules/acpi/includes/acpi.hh
+++ b/boot/xtldr/modules/acpi/includes/acpi.hh
--- a/boot/xtldr/modules/beep/CMakeLists.txt
+++ b/boot/xtldr/modules/beep/CMakeLists.txt
--- a/boot/xtldr/modules/beep/beep.cc
+++ b/boot/xtldr/modules/beep/beep.cc
--- a/boot/xtldr/modules/beep/data.cc
+++ b/boot/xtldr/modules/beep/data.cc
--- a/boot/xtldr/modules/beep/includes/beep.hh
+++ b/boot/xtldr/modules/beep/includes/beep.hh
--- a/boot/xtldr/modules/chainldr/CMakeLists.txt
+++ b/boot/xtldr/modules/chainldr/CMakeLists.txt
--- a/boot/xtldr/modules/chainldr/chainldr.cc
+++ b/boot/xtldr/modules/chainldr/chainldr.cc
--- a/boot/xtldr/modules/chainldr/data.cc
+++ b/boot/xtldr/modules/chainldr/data.cc
--- a/boot/xtldr/modules/chainldr/includes/chainldr.hh
+++ b/boot/xtldr/modules/chainldr/includes/chainldr.hh
--- a/Show More
+++ b/Show More