Move font data to a source file

2025-10-05 10:56:00 +02:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,10 +60,11 @@ 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                                 |
+|-------------|----------------------------------------------------------|
+| 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/firmware     | firmware enabling XTOS to boot on virtual machines           |
+| 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 +0,0 @@
-add_subdirectory(bootdata)
-add_subdirectory(bootsect)
-add_subdirectory(xtldr)
--- a/boot/bootsect/CMakeLists.txt
+++ b/boot/bootsect/CMakeLists.txt
@@ -1,8 +0,0 @@
-# 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
@@ -1,529 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            boot/bootsect/espboot.S
- * DESCRIPTION:     XT Boot Loader ESP boot code (FAT32)
- * DEVELOPERS:      Aiken Harris <harraiken91@gmail.com>
- */
-
-.text
-.code16
-
-
-.global Start
-Start:
-    /* Jump to the real start to omit the BPB (BIOS Parameter Block) */
-    jmp RealStart
-    nop
-
-/* BIOS Parameter Block */
-OsName:
-    .ascii "XTOS "
-OsVersion:
-    .ascii "1.0"
-BytesPerSector:
-    .word 512
-SectorsPerCluster:
-    .byte 2
-ReservedSectors:
-    .word 8
-FatCopies:
-    .byte 1
-RootDirEntries:
-    .word 1024
-TotalSectors:
-    .word 0
-MediaType:
-    .byte 0xF8
-SectorsPerFat:
-    .word 0
-SectorsPerTrack:
-    .word 17
-NumberOfHeads:
-    .word 0
-HiddenSectors:
-    .long 0
-TotalBigSectors:
-    .long 0x200000
-BigSectorsPerFat:
-    .long 0x1FE0
-ExtendedFlags:
-    .word 0
-FsVersion:
-    .word 0
-RootDirStartCluster:
-    .long 0
-FSInfoSector:
-    .word 0
-BackupBootSector:
-    .word 6
-Reserved:
-    .fill 12, 1, 0
-DriveNumber:
-    .byte 0x80
-CurrentHead:
-    .byte 0
-Signature:
-    .byte 0x29
-SerialNumber:
-    .long 0
-VolumeLabel:
-    .ascii "NO NAME    "
-FileSystem:
-    .ascii "FAT32   "
-
-RealStart:
-    /* Set segments and stack */
-    cli
-    cld
-    xorw %ax, %ax
-    movw %ax, %ds
-    movw %ax, %es
-    movw %ax, %ss
-    movw $0x7C00, %bp
-    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
-    call Print
-    jmp Reboot
-
-FsError:
-    /* Display FS error message and reboot */
-    movw $.MsgFsError, %si
-    call Print
-    jmp Reboot
-
-Print:
-    /* Simple routine to print messages */
-    lodsb
-    orb     %al, %al
-    jz      .DonePrint
-    movb    $0x0E, %ah
-    movw    $0x07, %bx
-    int     $0x10
-    jmp     Print
-.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"
-
-/* 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
@@ -1,154 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * 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
-.code16
-
-
-.global Start
-Start:
-    /* Set segments and stack */
-    cli
-    cld
-    xorw %ax, %ax
-    movw %ax, %ds
-    movw %ax, %es
-    movw %ax, %ss
-    movw $0x7C00, %bp
-    leaw -16(%bp), %sp
-    sti
-
-    /* Relocate MBR to 1FE0:7C00 */
-    movw $0x1FE0, %ax
-    movw %ax, %es
-    movw %bp, %si
-    movw %bp, %di
-    movw $256, %cx
-    rep movsw
-
-    /* Jump to the relocated MBR code */
-    jmp $0x1FE0, $RealStart
-
-RealStart:
-    /* Set segments */
-    movw %ax, %ds
-    movw %ax, %es
-    movw %ax, %ss
-
-    /* Print welcome message */
-    leaw .MsgXtosBoot, %si
-    call Print
-
-    /* Get BIOS boot drive and partition table offset */
-    lea 0x1BE(%bp), %si
-    movb %dl, .BootDrive
-    xorw %cx, %cx
-
-FindActivePartition:
-    /* Look for active partition */
-    movb (%si), %al
-    cmpb $0x80, %al
-    je PartitionFound
-    addw $16, %si
-    incw %cx
-    cmpw $4, %cx
-    jne FindActivePartition
-    jmp PartitionNotFound
-
-PartitionFound:
-    /* Save LBA start */
-    movl 8(%si), %eax
-    movl %eax, .LbaStart
-
-    /* Prepare Disk Address Packet (DAP) */
-    lea .Dap, %si
-    movb $0x10, 0(%si)
-    movb $0x00, 1(%si)
-    movw $1, 2(%si)
-    movw $0x7C00, 4(%si)
-    movw $0x0000, 6(%si)
-    movl .LbaStart, %eax
-    movl %eax, 8(%si)
-
-    /* Read Volume Boot Record (VBR) */
-    movb $0x42, %ah
-    movb .BootDrive, %dl
-    int $0x13
-    jc VbrReadFail
-
-    /* Verify VBR signature */
-    cmpw $0xAA55, (0x7C00 + 0x01FE)
-    jne InvalidSignature
-
-    /* Jump to the VBR code */
-    jmp $0x0000, $0x7C00
-
-InvalidSignature:
-    /* Invalid signature error */
-    leaw .MsgInvalidSignature, %si
-    call Print
-    jmp HaltSystem
-
-PartitionNotFound:
-    /* Active partition not found error */
-    leaw .MsgPartitionNotFound, %si
-    call Print
-    jmp HaltSystem
-
-VbrReadFail:
-    /* VBR read failed error */
-    leaw .MsgVbrReadFail, %si
-    call Print
-    jmp HaltSystem
-
-HaltSystem:
-    /* Disable interrupts and stop the CPU */
-    cli
-    hlt
-    jmp HaltSystem
-
-Print:
-    /* Simple routine to print messages */
-    lodsb
-    orb     %al, %al
-    jz      DonePrint
-    movb    $0x0E, %ah
-    movw    $0x07, %bx
-    int     $0x10
-    jmp     Print
-DonePrint:
-    retw
-
-.BootDrive:
-    /* Storage for the boot drive number */
-    .byte 0
-
-.Dap:
-    /* Storage for the Disk Address Packet (DAP) */
-    .fill 16, 1, 0
-
-.LbaStart:
-    /* Storage for the LBA start */
-    .long 0
-
-.MsgInvalidSignature:
-    .asciz "Invalid partition signature!"
-
-.MsgPartitionNotFound:
-    .asciz "Bootable partition not found!"
-
-.MsgVbrReadFail:
-    .asciz "VBR read failed!"
-
-.MsgXtosBoot:
-    .asciz "Starting XTOS boot loader...\r\n"
-
-/* Fill the rest of the MBR with zeros and add MBR signature at the end */
-.fill (510 - (. - Start)), 1, 0
-.word 0xAA55
--- 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/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
@@ -8,79 +8,41 @@ endif()
 # This target creates a disk image
 add_custom_target(diskimg
                  DEPENDS install
-                  COMMAND diskimg -c ${EXECTOS_BINARY_DIR}/output/binaries -f 32 -o ${EXECTOS_BINARY_DIR}/output/disk.img -s ${PROJECT_DISK_IMAGE_SIZE}
-                  -m ${EXECTOS_BINARY_DIR}/boot/bootsect/mbrboot.bin -v ${EXECTOS_BINARY_DIR}/boot/bootsect/espboot.bin
+                  COMMAND sh -c "dd if=/dev/zero of=${EXECTOS_BINARY_DIR}/output/disk.img bs=512 count=${PROJECT_DISK_IMAGE_BLOCKS} 2>/dev/null 1>/dev/null"
+                  COMMAND parted ${EXECTOS_BINARY_DIR}/output/disk.img -s -a minimal mklabel gpt
+                  COMMAND parted ${EXECTOS_BINARY_DIR}/output/disk.img -s -a minimal mkpart EFI FAT32 2048s ${PROJECT_PART_IMAGE_BLOCKS}s
+                  COMMAND parted ${EXECTOS_BINARY_DIR}/output/disk.img -s -a minimal toggle 1 boot
+                  COMMAND sh -c "dd if=/dev/zero of=${EXECTOS_BINARY_DIR}/output/part.img bs=512 count=${PROJECT_PART_IMAGE_BLOCKS} 2>/dev/null 1>/dev/null"
+                  COMMAND mformat -i ${EXECTOS_BINARY_DIR}/output/part.img -h32 -t32 -n64 -L32
+                  COMMAND sh -c "mcopy -s -i ${EXECTOS_BINARY_DIR}/output/part.img ${EXECTOS_BINARY_DIR}/output/binaries/* ::"
+                  COMMAND sh -c "dd if=${EXECTOS_BINARY_DIR}/output/part.img of=${EXECTOS_BINARY_DIR}/output/disk.img bs=512 count=${PROJECT_PART_IMAGE_BLOCKS} seek=2048 conv=notrunc 2>/dev/null 1>/dev/null"
+                  COMMAND rm ${EXECTOS_BINARY_DIR}/output/part.img
                  VERBATIM)

-find_program(BOCHS_EMULATOR bochs)
-if(BOCHS_EMULATOR)
-    # This target starts up a BOCHS+BIOS virtual machine
-    add_custom_target(bochsvm
+# This target starts up a BOCHS+OVMF virtual machine
+add_custom_target(bochsvm
                  DEPENDS diskimg
                  COMMAND bochs -f ../sdk/firmware/bochsrc_${ARCH}.cfg -q -unlock
                  VERBATIM USES_TERMINAL)
-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
+# This target starts up a QEMU+OVMF virtual machine using KVM accelerator
+add_custom_target(testkvm
                  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
+                  COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-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
+                                          -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)
-    elseif(CMAKE_HOST_WIN32)
-        # This target starts up a QEMU+OVMF virtual machine using WHPX accelerator
-        add_custom_target(testefiwhpx
+
+# This target starts up a QEMU+OVMF virtual machine using TCG accelerator
+add_custom_target(testtcg
                  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
+                  COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-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
+                                          -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)
-    endif()
-
-    # 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
-                                              -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)
-        # 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()
-
-    # This target starts up a QEMU+SEABIOS virtual machine using TCG accelerator
-    add_custom_target(testtcg
-                      DEPENDS diskimg
-                      COMMAND ${QEMU_COMMAND} -name "ExectOS-${ARCH}-BIOS-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
-                                              -hda ${EXECTOS_BINARY_DIR}/output/disk.img
-                                              -boot menu=on -d int -no-reboot -no-shutdown -serial stdio
-                      VERBATIM USES_TERMINAL)
-endif()
--- a/sdk/cmake/functions.cmake
+++ b/sdk/cmake/functions.cmake
@@ -64,18 +64,11 @@ 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}
@@ -94,13 +87,18 @@ function(compile_bootsector NAME SOURCE BASEADDR ENTRYPOINT)
    )
 endfunction()

-# This function sets the the qemu disk image size (in MiB)
-function(set_disk_image_size SIZE)
-	MATH(EXPR DISK_BLOCKS ${SIZE}*1024*1024/512)
-	MATH(EXPR PART_BLOCKS ${DISK_BLOCKS}-2048)
-	set(PROJECT_DISK_IMAGE_SIZE ${SIZE} CACHE INTERNAL "PROJECT_DISK_IMAGE_SIZE")
-	set(PROJECT_DISK_IMAGE_BLOCKS ${DISK_BLOCKS} CACHE INTERNAL "PROJECT_DISK_IMAGE_BLOCKS")
-	set(PROJECT_PART_IMAGE_BLOCKS ${PART_BLOCKS} CACHE INTERNAL "PROJECT_PART_IMAGE_BLOCKS")
+# This function sets a property for specified module
+function(set_module_property MODULE PROPERTY FLAGS)
+    if(NOT ${ARGC} EQUAL 3)
+        message(FATAL_ERROR "Invalid number of arguments passwd to add_module_property() function")
+    endif()
+    get_target_property(VAL ${MODULE} ${PROPERTY})
+    if(VAL)
+        set(VAL "${VAL} ${FLAGS}")
+    else()
+        set(VAL "${FLAGS}")
+    endif()
+    set_property(TARGET ${MODULE} PROPERTY ${PROPERTY} ${VAL})
 endfunction()

 # This function installs specified directory recursively under destination directory
@@ -119,20 +117,6 @@ function(set_install_target TARGET DESTINATION)
    install(TARGETS ${TARGET} DESTINATION ${EXECTOS_BINARY_DIR}/output/binaries/${DESTINATION})
 endfunction()

-# This function sets a property for specified module
-function(set_module_property MODULE PROPERTY FLAGS)
-    if(NOT ${ARGC} EQUAL 3)
-        message(FATAL_ERROR "Invalid number of arguments passwd to add_module_property() function")
-    endif()
-    get_target_property(VAL ${MODULE} ${PROPERTY})
-    if(VAL)
-        set(VAL "${VAL} ${FLAGS}")
-    else()
-        set(VAL "${FLAGS}")
-    endif()
-    set_property(TARGET ${MODULE} PROPERTY ${PROPERTY} ${VAL})
-endfunction()
-
 function(set_sdk_target FILENAME DESTINATION)
    install(DIRECTORY ${FILENAME} DESTINATION ${EXECTOS_BINARY_DIR}/output/sdk/${DESTINATION})
 endfunction()
@@ -146,3 +130,11 @@ function(set_specfile SPECFILE EXPORTNAME)
    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.def ${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.c
                       COMMAND ${CMAKE_SPEC_COMPILER} -a=${ARCH} -n=${EXPORTNAME} -d=${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${FILENAME}.c ${CMAKE_CURRENT_SOURCE_DIR}/${SPECFILE})
 endfunction()
+
+# This function sets the the qemu disk image size (in MiB)
+function(set_disk_image_size SIZE)
+	MATH(EXPR DISK_BLOCKS ${SIZE}*1024*1024/512)
+	MATH(EXPR PART_BLOCKS ${DISK_BLOCKS}-2048)
+	set(PROJECT_DISK_IMAGE_BLOCKS ${DISK_BLOCKS} CACHE INTERNAL "PROJECT_DISK_IMAGE_BLOCKS")
+	set(PROJECT_PART_IMAGE_BLOCKS ${PART_BLOCKS} CACHE INTERNAL "PROJECT_PART_IMAGE_BLOCKS")
+endfunction()
--- a/sdk/firmware/bochsrc_amd64.cfg
+++ b/sdk/firmware/bochsrc_amd64.cfg
@@ -3,9 +3,9 @@ plugin_ctrl: usb_xhci=false, serial=true, e1000=false, extfpuirq=true, parallel=
 config_interface: textconfig
 display_library: x
 memory: host=64, guest=64
-romimage: file="../sdk/firmware/rombios.bin", address=0x00000000, options=none
+romimage: file="../sdk/firmware/ovmf_pure_amd64.fd", address=0x00000000, options=none
 vgaromimage: file="../sdk/firmware/vgabios.bin"
-boot: disk
+boot: floppy
 floppy_bootsig_check: disabled=0
 floppya: type=1_44
 # no floppyb
@@ -27,7 +27,11 @@ optramimage3: file=none
 optramimage4: file=none
 pci: enabled=1, chipset=i440fx, slot1=cirrus, slot2=none, slot3=none, slot4=none, slot5=none
 vga: extension=cirrus, update_freq=5, realtime=1, ddc=builtin
-cpu: count=1:1:1, ips=400000000, quantum=16, model=corei7_sandy_bridge_2600k, reset_on_triple_fault=0, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
+cpu: count=1:1:1, ips=400000000, quantum=16, model=bx_generic, reset_on_triple_fault=0, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
+cpuid: level=6, stepping=3, model=3, family=6, vendor_string="GenuineIntel", brand_string="              Intel(R) Pentium(R) 4 CPU        "
+cpuid: mmx=true, apic=xapic, simd=sse4_2, sse4a=false, misaligned_sse=false, sep=true
+cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, x86_64=true
+cpuid: 1g_pages=false, pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true
 print_timestamps: enabled=0
 port_e9_hack: enabled=0
 private_colormap: enabled=0
--- a/sdk/firmware/bochsrc_i686.cfg
+++ b/sdk/firmware/bochsrc_i686.cfg
@@ -3,9 +3,9 @@ plugin_ctrl: usb_xhci=false, serial=true, e1000=false, extfpuirq=true, parallel=
 config_interface: textconfig
 display_library: x
 memory: host=64, guest=64
-romimage: file="../sdk/firmware/rombios.bin", address=0x00000000, options=none
+romimage: file="../sdk/firmware/ovmf_pure_i686.fd", address=0x00000000, options=none
 vgaromimage: file="../sdk/firmware/vgabios.bin"
-boot: disk
+boot: floppy
 floppy_bootsig_check: disabled=0
 floppya: type=1_44
 # no floppyb
@@ -27,7 +27,11 @@ optramimage3: file=none
 optramimage4: file=none
 pci: enabled=1, chipset=i440fx, slot1=cirrus, slot2=none, slot3=none, slot4=none, slot5=none
 vga: extension=cirrus, update_freq=5, realtime=1, ddc=builtin
-cpu: count=1:1:1, ips=400000000, quantum=16, model=corei7_sandy_bridge_2600k, reset_on_triple_fault=0, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
+cpu: count=1:1:1, ips=400000000, quantum=16, model=bx_generic, reset_on_triple_fault=0, cpuid_limit_winnt=0, ignore_bad_msrs=1, mwait_is_nop=0
+cpuid: level=6, stepping=3, model=3, family=6, vendor_string="GenuineIntel", brand_string="              Intel(R) Pentium(R) 4 CPU        "
+cpuid: mmx=true, apic=xapic, simd=sse4_2, sse4a=false, misaligned_sse=false, sep=true
+cpuid: movbe=false, adx=false, aes=false, sha=false, xsave=false, xsaveopt=false, x86_64=true
+cpuid: 1g_pages=false, pcid=false, fsgsbase=false, smep=false, smap=false, mwait=true
 print_timestamps: enabled=0
 port_e9_hack: enabled=0
 private_colormap: enabled=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_pure_amd64.fd
+++ b/sdk/firmware/ovmf_pure_amd64.fd
--- a/sdk/firmware/ovmf_pure_i686.fd
+++ b/sdk/firmware/ovmf_pure_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/firmware/rombios.bin
+++ b/sdk/firmware/rombios.bin
--- a/sdk/xtdk/amd64/ketypes.h
+++ b/sdk/xtdk/amd64/ketypes.h
@@ -272,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 OffsetMiddle;
    ULONG OffsetHigh;
    ULONG Reserved1;
--- a/sdk/xtdk/i686/ketypes.h
+++ b/sdk/xtdk/i686/ketypes.h
@@ -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
@@ -278,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 ExtendedOffset;
 } KIDTENTRY, *PKIDTENTRY;

--- a/sdk/xtdk/ketypes.h
+++ b/sdk/xtdk/ketypes.h
@@ -150,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;

--- a/sdk/xtdk/rtltypes.h
+++ b/sdk/xtdk/rtltypes.h
@@ -49,10 +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
-
 /* Runtime Library routine callbacks */
 typedef XTSTATUS (*PWRITE_CHARACTER)(IN CHAR Character);
 typedef XTSTATUS (*PWRITE_WIDE_CHARACTER)(IN WCHAR Character);
@@ -99,12 +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 /* __XTDK_RTLTYPES_H */
--- a/sdk/xtdk/xtcompat.h
+++ b/sdk/xtdk/xtcompat.h
@@ -12,9 +12,8 @@

 #ifdef __cplusplus
    /* C++ definitions */
-    #define NULLPTR         nullptr
-    #define VIRTUAL         virtual
    #define XTCLINK         extern "C"
+    #define NULLPTR         nullptr

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

    /* C boolean type */
    typedef enum _BOOLEAN
--- a/sdk/xtdk/xtdefs.h
+++ b/sdk/xtdk/xtdefs.h
@@ -80,10 +80,6 @@
 /* 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))

@@ -108,7 +104,7 @@

 /* Variadic ABI functions */
 typedef __builtin_va_list VA_LIST, *PVA_LIST;
-#define VA_ARG(Marker, Type)                   ((sizeof(Type) < sizeof(UINT_PTR)) ? \
+#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
--- 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
--- a/boot/xtldr/arch/i686/memory.cc
+++ b/boot/xtldr/arch/i686/memory.cc
--- a/boot/xtldr/bootutil.cc
+++ b/boot/xtldr/bootutil.cc
--- a/boot/xtldr/config.cc
+++ b/boot/xtldr/config.cc
@@ -622,7 +622,7 @@ Configuration::ParseConfigFile(IN CONST PCHAR RawConfig,
            SectionName = InputData;

            /* Find end of the section name */
-            while(*InputData != ']' && *InputData != '\0' && *InputData != '\r' && *InputData != '\n')
+            while(*InputData != ']' && *InputData != '\0' && *InputData != '\n')
            {
                /* Advance to the next character */
                InputData++;
@@ -672,7 +672,7 @@ Configuration::ParseConfigFile(IN CONST PCHAR RawConfig,
            Key = InputData;

            /* Find end of the key */
-            while(*InputData != '=' && *InputData != '\0' && *InputData != '\r' && *InputData != '\n')
+            while(*InputData != '=' && *InputData != '\0' && *InputData != '\n')
            {
                /* Advance to the next character */
                InputData++;
@@ -700,7 +700,7 @@ Configuration::ParseConfigFile(IN CONST PCHAR RawConfig,
            Value = InputData;

            /* Find end of the value */
-            while(*InputData != '\0' && *InputData != '\r' && *InputData != '\n')
+            while(*InputData != '\0' && *InputData != '\n')
            {
                /* Advance to the next character */
                InputData++;
--- 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:
--- a/boot/xtldr/library/modproto.cc
+++ b/boot/xtldr/library/modproto.cc
--- a/boot/xtldr/memory.cc
+++ b/boot/xtldr/memory.cc
--- 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/boot/xtldr/modules/dummy/CMakeLists.txt
+++ b/boot/xtldr/modules/dummy/CMakeLists.txt
--- a/boot/xtldr/modules/dummy/data.cc
+++ b/boot/xtldr/modules/dummy/data.cc
--- a/boot/xtldr/modules/dummy/dummy.cc
+++ b/boot/xtldr/modules/dummy/dummy.cc
--- a/boot/xtldr/modules/dummy/includes/dummy.hh
+++ b/boot/xtldr/modules/dummy/includes/dummy.hh
--- a/boot/xtldr/modules/framebuf/CMakeLists.txt
+++ b/boot/xtldr/modules/framebuf/CMakeLists.txt
--- a/boot/xtldr/modules/framebuf/data.cc
+++ b/boot/xtldr/modules/framebuf/data.cc
--- a/boot/xtldr/modules/framebuf/framebuf.cc
+++ b/boot/xtldr/modules/framebuf/framebuf.cc
--- a/boot/xtldr/modules/framebuf/includes/framebuf.hh
+++ b/boot/xtldr/modules/framebuf/includes/framebuf.hh
--- a/boot/xtldr/modules/pecoff/CMakeLists.txt
+++ b/boot/xtldr/modules/pecoff/CMakeLists.txt
--- a/boot/xtldr/modules/pecoff/data.cc
+++ b/boot/xtldr/modules/pecoff/data.cc
--- a/boot/xtldr/modules/pecoff/includes/pecoff.hh
+++ b/boot/xtldr/modules/pecoff/includes/pecoff.hh
--- a/boot/xtldr/modules/pecoff/pecoff.cc
+++ b/boot/xtldr/modules/pecoff/pecoff.cc
--- a/boot/xtldr/modules/xtos_o/CMakeLists.txt
+++ b/boot/xtldr/modules/xtos_o/CMakeLists.txt
--- a/boot/xtldr/modules/xtos_o/amd64/memory.cc
+++ b/boot/xtldr/modules/xtos_o/amd64/memory.cc
--- a/boot/xtldr/modules/xtos_o/data.cc
+++ b/boot/xtldr/modules/xtos_o/data.cc
--- a/boot/xtldr/modules/xtos_o/i686/memory.cc
+++ b/boot/xtldr/modules/xtos_o/i686/memory.cc
--- a/boot/xtldr/modules/xtos_o/includes/xtos.hh
+++ b/boot/xtldr/modules/xtos_o/includes/xtos.hh
--- a/boot/xtldr/modules/xtos_o/xtos.cc
+++ b/boot/xtldr/modules/xtos_o/xtos.cc
@@ -414,6 +414,7 @@ Xtos::InitializeLoaderBlock(IN PXTBL_PAGE_MAPPING PageMap,
 {
    PKERNEL_INITIALIZATION_BLOCK LoaderBlock;
    EFI_PHYSICAL_ADDRESS Address;
+    // PVOID RuntimeServices;
    EFI_STATUS Status;
    UINT BlockPages;
    UINT ParametersSize;
@@ -444,10 +445,20 @@ Xtos::InitializeLoaderBlock(IN PXTBL_PAGE_MAPPING PageMap,
    /* Set LoaderInformation block properties */
    LoaderBlock->LoaderInformation.DbgPrint = (PVOID)XtLdrProtocol->Debug.Print;

+    /* Attempt to find virtual address of the EFI Runtime Services */
+    // Status = XtLdrProtocol->GetVirtualAddress(MemoryMappings, &EfiSystemTable->RuntimeServices->Hdr, &RuntimeServices);
+    // if(Status == STATUS_EFI_SUCCESS)
+    // {
        /* Set FirmwareInformation block properties */
        LoaderBlock->FirmwareInformation.FirmwareType = SystemFirmwareEfi;
-    // LoaderBlock->FirmwareInformation.EfiFirmware.EfiVersion = EfiSystemTable->Hdr.Revision;
+        LoaderBlock->FirmwareInformation.EfiFirmware.EfiVersion = 0; //EfiSystemTable->Hdr.Revision;
        LoaderBlock->FirmwareInformation.EfiFirmware.EfiRuntimeServices = NULLPTR;
+    // }
+    // else
+    // {
+    //     /* Set invalid firmware type to indicate that kernel cannot rely on FirmwareInformation block */
+    //     LoaderBlock->FirmwareInformation.FirmwareType = SystemFirmwareInvalid;
+    // }

    /* Copy parameters to kernel initialization block */
    LoaderBlock->KernelParameters = (PWCHAR)((UINT_PTR)*VirtualAddress + sizeof(KERNEL_INITIALIZATION_BLOCK));
@@ -652,7 +663,7 @@ Xtos::RunBootSequence(IN PEFI_FILE_HANDLE BootDir,
    /* Add kernel image memory mapping */
    Status = XtLdrProtocol->Memory.MapVirtualMemory(&PageMap, ImageContext->VirtualAddress,
                                                    ImageContext->PhysicalAddress, ImageContext->ImagePages,
-                                                    LoaderSystemCode);
+                                                    LoaderExceptionBlock); // 0 is LoaderExceptionBlock?! Should be LoaderSystemCode?
    if(Status != STATUS_EFI_SUCCESS)
    {
        return Status;
--- a/boot/xtldr/protocol.cc
+++ b/boot/xtldr/protocol.cc
--- a/boot/xtldr/shell.cc
+++ b/boot/xtldr/shell.cc
--- a/boot/xtldr/textui.cc
+++ b/boot/xtldr/textui.cc
--- a/boot/xtldr/volume.cc
+++ b/boot/xtldr/volume.cc
--- a/boot/xtldr/xtldr.cc
+++ b/boot/xtldr/xtldr.cc
@@ -236,15 +236,6 @@ BlStartXtLoader(IN EFI_HANDLE ImageHandle,
    PWCHAR Modules;
    EFI_STATUS Status;

-    /* Check if system is EFI-based and provided parameters are valid */
-    if(ImageHandle == NULLPTR || SystemTable == NULLPTR)
-    {
-        /* Invalid parameters, print error message using BIOS calls and hang */
-        BiosUtils::ClearScreen();
-        BiosUtils::Print(L"XTLDR requires EFI-based system!");
-        for(;;);
-    }
-
    /* Initialize XTLDR and */
    XtLoader::InitializeBootLoader(ImageHandle, SystemTable);

--- a/xtoskrnl/CMakeLists.txt
+++ b/xtoskrnl/CMakeLists.txt
@@ -20,7 +20,6 @@ list(APPEND XTOSKRNL_SOURCE
    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/cpu.cc
    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/pic.cc
    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/ioport.cc
-    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/irq.cc
    ${XTOSKRNL_SOURCE_DIR}/hl/${ARCH}/runlevel.cc
    ${XTOSKRNL_SOURCE_DIR}/hl/acpi.cc
    ${XTOSKRNL_SOURCE_DIR}/hl/cport.cc
@@ -32,6 +31,7 @@ list(APPEND XTOSKRNL_SOURCE
    ${XTOSKRNL_SOURCE_DIR}/kd/data.cc
    ${XTOSKRNL_SOURCE_DIR}/kd/dbgio.cc
    ${XTOSKRNL_SOURCE_DIR}/kd/exports.cc
+    ${XTOSKRNL_SOURCE_DIR}/ke/${ARCH}/irq.cc
    ${XTOSKRNL_SOURCE_DIR}/ke/${ARCH}/krnlinit.cc
    ${XTOSKRNL_SOURCE_DIR}/ke/${ARCH}/kthread.cc
    ${XTOSKRNL_SOURCE_DIR}/ke/${ARCH}/proc.cc
@@ -71,8 +71,6 @@ list(APPEND XTOSKRNL_SOURCE
    ${XTOSKRNL_SOURCE_DIR}/rtl/llist.cc
    ${XTOSKRNL_SOURCE_DIR}/rtl/math.cc
    ${XTOSKRNL_SOURCE_DIR}/rtl/memory.cc
-    ${XTOSKRNL_SOURCE_DIR}/rtl/sha1.cc
-    ${XTOSKRNL_SOURCE_DIR}/rtl/slist.cc
    ${XTOSKRNL_SOURCE_DIR}/rtl/string.cc
    ${XTOSKRNL_SOURCE_DIR}/rtl/widestr.cc)

--- a/xtoskrnl/ar/amd64/archsup.S
+++ b/xtoskrnl/ar/amd64/archsup.S
@@ -13,31 +13,22 @@


 /**
- * Creates a trap or interrupt handler for the specified vector.
+ * Creates a trap handler for the specified vector.
 *
 * @param Vector
- *        Supplies a trap/interrupt vector number.
- *
- * @param Type
- *        Specifies whether the handler is designed to handle an interrupt or a trap.
+ *        Supplies a trap vector number.
 *
 * @return This macro does not return any value.
 *
 * @since XT 1.0
 */
-.macro ArCreateTrapHandler Vector Type
-.global Ar\Type\Vector
-Ar\Type\Vector:
-    /* Check handler type */
-    .ifc \Type,Trap
-        /* Push fake error code for non-error vector traps */
+.macro ArCreateTrapHandler Vector
+.global ArTrap\Vector
+ArTrap\Vector:
+    /* Push fake error code for non-error vectors */
    .if \Vector != 8 && \Vector != 10 && \Vector != 11 && \Vector != 12 && \Vector != 13 && \Vector != 14 && \Vector != 17 && \Vector != 30
        push $0
    .endif
-    .else
-        /* Push fake error code for interrupts */
-        push $0
-    .endif

    /* Push vector number */
    push $\Vector
@@ -113,39 +104,24 @@ Ar\Type\Vector:
    /* Test previous mode and swap GS if needed */
    movl $0, TrapPreviousMode(%rbp)
    mov %cs, %ax
-    and $3, %al
+    and $1, %al
    mov %al, TrapPreviousMode(%rbp)
-    jz KernelMode\Type\Vector
+    jz KernelMode$\Vector
    swapgs
-    jmp UserMode\Type\Vector

-KernelMode\Type\Vector:
-    /* Save kernel stack pointer (SS:RSP) */
-    movl %ss, %eax
-    mov %eax, TrapSegSs(%rbp)
-    lea TRAP_FRAME_SIZE(%rbp), %rax
-    mov %rax, TrapRsp(%rbp)
-
-UserMode\Type\Vector:
-    /* Push Frame Pointer and clear direction flag */
+KernelMode$\Vector:
+    /* Push Frame Pointer, clear direction flag and pass to trap dispatcher */
    mov %rsp, %rcx
    cld
-
-    .ifc \Type,Trap
-        /* Pass to the trap dispatcher */
    call ArDispatchTrap
-    .else
-        /* Pass to the interrupt dispatcher */
-        call ArDispatchTrap
-    .endif

    /* Test previous mode and swapgs if needed */
    testb $1, TrapPreviousMode(%rbp)
-    jz KernelModeReturn\Type\Vector
+    jz KernelModeReturn$\Vector
    cli
    swapgs

-KernelModeReturn\Type\Vector:
+KernelModeReturn$\Vector:
    /* Restore XMM registers */
    movdqa TrapXmm0(%rbp), %xmm0
    movdqa TrapXmm1(%rbp), %xmm1
@@ -197,28 +173,9 @@ KernelModeReturn\Type\Vector:
    iretq
 .endm

-/* Populate common interrupt and trap handlers */
+/* Populate common trap handlers */
 .irp i,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
    .irp j,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        ArCreateTrapHandler 0x\i\j Interrupt
-        ArCreateTrapHandler 0x\i\j Trap
-    .endr
-.endr
-
-/* Define array of pointers to the interrupt handlers */
-.global ArInterruptEntry
-ArInterruptEntry:
-.irp i,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-    .irp j,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        .quad ArInterrupt0x\i\j
-    .endr
-.endr
-
-/* Define array of pointers to the trap handlers */
-.global ArTrapEntry
-ArTrapEntry:
-.irp i,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-    .irp j,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        .quad ArTrap0x\i\j
+        ArCreateTrapHandler 0x\i\j
    .endr
 .endr
--- a/xtoskrnl/ar/amd64/procsup.cc
+++ b/xtoskrnl/ar/amd64/procsup.cc
@@ -249,35 +249,34 @@ AR::ProcSup::InitializeIdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
    for(Vector = 0; Vector < IDT_ENTRIES; Vector++)
    {
        /* Set the IDT to handle unexpected interrupts */
-        SetIdtGate(ProcessorBlock->IdtBase, Vector, (PVOID)ArInterruptEntry[Vector], KGDT_R0_CODE,
-                   KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_INTERRUPT_GATE);
+        SetIdtGate(ProcessorBlock->IdtBase, Vector, (PVOID)ArTrap0xFF, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
    }

    /* Setup IDT handlers for known interrupts and traps */
-    SetIdtGate(ProcessorBlock->IdtBase, 0x00, (PVOID)ArTrapEntry[0x00], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x01, (PVOID)ArTrapEntry[0x01], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x02, (PVOID)ArTrapEntry[0x02], KGDT_R0_CODE, KIDT_IST_PANIC, KIDT_ACCESS_RING0, AMD64_INTERRUPT_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x03, (PVOID)ArTrapEntry[0x03], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x04, (PVOID)ArTrapEntry[0x04], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x05, (PVOID)ArTrapEntry[0x05], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x06, (PVOID)ArTrapEntry[0x06], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x07, (PVOID)ArTrapEntry[0x07], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x08, (PVOID)ArTrapEntry[0x08], KGDT_R0_CODE, KIDT_IST_PANIC, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x09, (PVOID)ArTrapEntry[0x09], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0A, (PVOID)ArTrapEntry[0x0A], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0B, (PVOID)ArTrapEntry[0x0B], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0C, (PVOID)ArTrapEntry[0x0C], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0D, (PVOID)ArTrapEntry[0x0D], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0E, (PVOID)ArTrapEntry[0x0E], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x10, (PVOID)ArTrapEntry[0x10], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x11, (PVOID)ArTrapEntry[0x11], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x12, (PVOID)ArTrapEntry[0x12], KGDT_R0_CODE, KIDT_IST_MCA, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x13, (PVOID)ArTrapEntry[0x13], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x1F, (PVOID)ArTrapEntry[0x1F], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_INTERRUPT_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2C, (PVOID)ArTrapEntry[0x2C], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2D, (PVOID)ArTrapEntry[0x2D], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3, AMD64_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2F, (PVOID)ArTrapEntry[0x2F], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_INTERRUPT_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0xE1, (PVOID)ArTrapEntry[0xE1], KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0, AMD64_INTERRUPT_GATE);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x00, (PVOID)ArTrap0x00, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x01, (PVOID)ArTrap0x01, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x02, (PVOID)ArTrap0x02, KGDT_R0_CODE, KIDT_IST_PANIC, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x03, (PVOID)ArTrap0x03, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x04, (PVOID)ArTrap0x04, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x05, (PVOID)ArTrap0x05, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x06, (PVOID)ArTrap0x06, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x07, (PVOID)ArTrap0x07, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x08, (PVOID)ArTrap0x08, KGDT_R0_CODE, KIDT_IST_PANIC, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x09, (PVOID)ArTrap0x09, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0A, (PVOID)ArTrap0x0A, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0B, (PVOID)ArTrap0x0B, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0C, (PVOID)ArTrap0x0C, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0D, (PVOID)ArTrap0x0D, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0E, (PVOID)ArTrap0x0E, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x10, (PVOID)ArTrap0x10, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x11, (PVOID)ArTrap0x11, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x12, (PVOID)ArTrap0x12, KGDT_R0_CODE, KIDT_IST_MCA, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x13, (PVOID)ArTrap0x13, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x1F, (PVOID)ArTrap0x1F, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2C, (PVOID)ArTrap0x2C, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2D, (PVOID)ArTrap0x2D, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2F, (PVOID)ArTrap0x2F, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0xE1, (PVOID)ArTrap0xE1, KGDT_R0_CODE, KIDT_IST_RESERVED, KIDT_ACCESS_RING0);
 }

 /**
@@ -637,9 +636,6 @@ AR::ProcSup::SetGdtEntryBase(IN PKGDTENTRY Gdt,
 * @param Access
 *        Supplies the gate access rights.
 *
- * @param Type
- *        Supplies the gate type.
- *
 * @return This routine does not return any value.
 *
 * @since XT 1.0
@@ -651,22 +647,15 @@ AR::ProcSup::SetIdtGate(IN PKIDTENTRY Idt,
                        IN PVOID Handler,
                        IN USHORT Selector,
                        IN USHORT Ist,
-                        IN USHORT Dpl,
-                        IN USHORT Type)
+                        IN USHORT Access)
 {
-    /* Set the handler's address */
+    /* Setup the gate */
    Idt[Vector].OffsetLow = ((ULONG_PTR)Handler & 0xFFFF);
    Idt[Vector].OffsetMiddle = (((ULONG_PTR)Handler >> 16) & 0xFFFF);
    Idt[Vector].OffsetHigh = (ULONG_PTR)Handler >> 32;
-
-    /* Set the code segment selector */
-    Idt[Vector].Selector = Selector;
-
-    /* Initialize the gate's attributes and flags */
-    Idt[Vector].Access = 0;
-    Idt[Vector].Dpl = Dpl;
+    Idt[Vector].Dpl = Access;
    Idt[Vector].IstIndex = Ist;
    Idt[Vector].Present = 1;
-    Idt[Vector].Reserved1 = 0;
-    Idt[Vector].Type = Type;
+    Idt[Vector].Selector = Selector;
+    Idt[Vector].Type = 0xE;
 }
--- a/xtoskrnl/ar/i686/archsup.S
+++ b/xtoskrnl/ar/i686/archsup.S
@@ -13,31 +13,22 @@


 /**
- * Creates a trap or interrupt handler for the specified vector.
+ * This macro creates a trap handler for the specified vector.
 *
 * @param Vector
- *        Supplies a trap/interrupt vector number.
- *
- * @param Type
- *        Specifies whether the handler is designed to handle an interrupt or a trap.
+ *        Supplies a trap vector number.
 *
 * @return This macro does not return any value.
 *
 * @since XT 1.0
 */
-.macro ArCreateTrapHandler Vector Type
-.global _Ar\Type\Vector
-_Ar\Type\Vector:
-    /* Check handler type */
-    .ifc \Type,Trap
-        /* Push fake error code for non-error vector traps */
+.macro ArCreateTrapHandler Vector
+.global _ArTrap\Vector
+_ArTrap\Vector:
+    /* Push fake error code for non-error vectors */
    .if \Vector != 8 && \Vector != 10 && \Vector != 11 && \Vector != 12 && \Vector != 13 && \Vector != 14 && \Vector != 17 && \Vector != 30
        push $0
    .endif
-    .else
-        /* Push fake error code for interrupts */
-        push $0
-    .endif

    /* Push vector number */
    push $\Vector
@@ -84,47 +75,31 @@ _Ar\Type\Vector:
    /* Test previous mode and swap GS if needed */
    movl $0, TrapPreviousMode(%ebp)
    mov %cs, %ax
-    and $3, %al
+    and $1, %al
    mov %al, TrapPreviousMode(%ebp)
-    jz KernelMode\Type\Vector
+    jz KernelMode$\Vector
    swapgs
-    jmp UserMode\Type\Vector

-KernelMode\Type\Vector:
-    /* Save kernel stack pointer (SS:ESP) */
-    movl %ss, %eax
-    mov %eax, TrapSegSs(%ebp)
-    lea TrapEsp(%ebp), %eax
-    mov %eax, TrapEsp(%ebp)
-
-UserMode\Type\Vector:
-    /* Push Frame Pointer and clear direction flag */
+KernelMode$\Vector:
+    /* Push Frame Pointer, clear direction flag and pass to trap dispatcher */
    push %esp
    cld
-
-    .ifc \Type,Trap
-        /* Pass to the trap dispatcher */
    call _ArDispatchTrap
-    .else
-        /* Pass to the interrupt dispatcher */
-        call _ArDispatchTrap
-    .endif

    /* Clean up the stack */
    add $4, %esp

    /* Test previous mode and swapgs if needed */
    testb $1, TrapPreviousMode(%ebp)
-    jz KernelModeReturn\Type\Vector
+    jz KernelModeReturn$\Vector
    cli
    swapgs

-KernelModeReturn\Type\Vector:
+KernelModeReturn$\Vector:
    /* Restore segment selectors */
    mov TrapSegDs(%ebp), %ds
    mov TrapSegEs(%ebp), %es
    mov TrapSegFs(%ebp), %fs
-    mov TrapSegGs(%ebp), %gs

    /* Free stack space */
    add $(TRAP_FRAME_SIZE - TRAP_REGISTERS_SIZE), %esp
@@ -143,28 +118,9 @@ KernelModeReturn\Type\Vector:
    iretl
 .endm

-/* Populate common interrupt and trap handlers */
+/* Populate common trap handlers */
 .irp i,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
    .irp j,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        ArCreateTrapHandler 0x\i\j Interrupt
-        ArCreateTrapHandler 0x\i\j Trap
-    .endr
-.endr
-
-/* Define array of pointers to the interrupt handlers */
-.global _ArInterruptEntry
-_ArInterruptEntry:
-.irp i,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-    .irp j,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        .long _ArInterrupt0x\i\j
-    .endr
-.endr
-
-/* Define array of pointers to the trap handlers */
-.global _ArTrapEntry
-_ArTrapEntry:
-.irp i,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-    .irp j,0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        .long _ArTrap0x\i\j
+        ArCreateTrapHandler 0x\i\j
    .endr
 .endr
--- a/xtoskrnl/ar/i686/procsup.cc
+++ b/xtoskrnl/ar/i686/procsup.cc
@@ -242,35 +242,34 @@ AR::ProcSup::InitializeIdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
    for(Vector = 0; Vector < IDT_ENTRIES; Vector++)
    {
        /* Set the IDT to handle unexpected interrupts */
-        SetIdtGate(ProcessorBlock->IdtBase, Vector, (PVOID)ArInterruptEntry[Vector],
-                   KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_INTERRUPT_GATE);
+        SetIdtGate(ProcessorBlock->IdtBase, Vector, (PVOID)ArTrap0xFF, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
    }

    /* Setup IDT handlers for known interrupts and traps */
-    SetIdtGate(ProcessorBlock->IdtBase, 0x00, (PVOID)ArTrapEntry[0x00], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x01, (PVOID)ArTrapEntry[0x01], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x02, (PVOID)ArTrapEntry[0x02], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_INTERRUPT_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x03, (PVOID)ArTrapEntry[0x03], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x04, (PVOID)ArTrapEntry[0x04], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x05, (PVOID)ArTrapEntry[0x05], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x06, (PVOID)ArTrapEntry[0x06], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x07, (PVOID)ArTrapEntry[0x07], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x08, (PVOID)ArTrapEntry[0x08], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x09, (PVOID)ArTrapEntry[0x09], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0A, (PVOID)ArTrapEntry[0x0A], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0B, (PVOID)ArTrapEntry[0x0B], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0C, (PVOID)ArTrapEntry[0x0C], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0D, (PVOID)ArTrapEntry[0x0D], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x0E, (PVOID)ArTrapEntry[0x0E], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x10, (PVOID)ArTrapEntry[0x10], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x11, (PVOID)ArTrapEntry[0x11], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x12, (PVOID)ArTrapEntry[0x12], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x13, (PVOID)ArTrapEntry[0x13], KGDT_R0_CODE, 0, KIDT_ACCESS_RING0, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2A, (PVOID)ArTrapEntry[0x2A], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2B, (PVOID)ArTrapEntry[0x2B], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2C, (PVOID)ArTrapEntry[0x2C], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2D, (PVOID)ArTrapEntry[0x2D], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
-    SetIdtGate(ProcessorBlock->IdtBase, 0x2E, (PVOID)ArTrapEntry[0x2E], KGDT_R0_CODE, 0, KIDT_ACCESS_RING3, I686_TRAP_GATE);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x00, (PVOID)ArTrap0x00, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x01, (PVOID)ArTrap0x01, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x02, (PVOID)ArTrap0x02, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x03, (PVOID)ArTrap0x03, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x04, (PVOID)ArTrap0x04, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x05, (PVOID)ArTrap0x05, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x06, (PVOID)ArTrap0x06, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x07, (PVOID)ArTrap0x07, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x08, (PVOID)ArTrap0x08, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x09, (PVOID)ArTrap0x09, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0A, (PVOID)ArTrap0x0A, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0B, (PVOID)ArTrap0x0B, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0C, (PVOID)ArTrap0x0C, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0D, (PVOID)ArTrap0x0D, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x0E, (PVOID)ArTrap0x0E, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x10, (PVOID)ArTrap0x10, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x11, (PVOID)ArTrap0x11, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x12, (PVOID)ArTrap0x12, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x13, (PVOID)ArTrap0x13, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING0);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2A, (PVOID)ArTrap0x2A, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2B, (PVOID)ArTrap0x2B, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2C, (PVOID)ArTrap0x2C, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2D, (PVOID)ArTrap0x2D, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
+    SetIdtGate(ProcessorBlock->IdtBase, 0x2E, (PVOID)ArTrap0x2E, KGDT_R0_CODE, 0, KIDT_INTERRUPT | KIDT_ACCESS_RING3);
 }

 /**
@@ -507,7 +506,7 @@ AR::ProcSup::SetDoubleFaultTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
    Tss->CR3 = CpuFunc::ReadControlRegister(3);
    Tss->Esp = (ULONG_PTR)KernelFaultStack;
    Tss->Esp0 = (ULONG_PTR)KernelFaultStack;
-    Tss->Eip = PtrToUlong(ArTrapEntry[0x08]);
+    Tss->Eip = PtrToUlong(ArTrap0x08);
    Tss->Cs = KGDT_R0_CODE;
    Tss->Ds = KGDT_R3_DATA | RPL_MASK;
    Tss->Es = KGDT_R3_DATA | RPL_MASK;
@@ -657,9 +656,6 @@ AR::ProcSup::SetGdtEntryBase(IN PKGDTENTRY Gdt,
 * @param Access
 *        Supplies the gate access rights.
 *
- * @param Type
- *        Supplies the gate type.
- *
 * @return This routine does not return any value.
 *
 * @since XT 1.0
@@ -671,21 +667,13 @@ AR::ProcSup::SetIdtGate(IN PKIDTENTRY Idt,
                        IN PVOID Handler,
                        IN USHORT Selector,
                        IN USHORT Ist,
-                        IN USHORT Dpl,
-                        IN USHORT Type)
+                        IN USHORT Access)
 {
-    /* Set the handler's address */
+    /* Setup the gate */
    Idt[Vector].Offset = (USHORT)((ULONG)Handler & 0xFFFF);
    Idt[Vector].ExtendedOffset = (USHORT)((ULONG)Handler >> 16);
-
-    /* Set the code segment selector */
+    Idt[Vector].Access = 0x8000 | (Access << 8);
    Idt[Vector].Selector = Selector;
-
-    /* Initialize the gate's attributes and flags */
-    Idt[Vector].Access = 0;
-    Idt[Vector].Dpl = Dpl;
-    Idt[Vector].Present = 1;
-    Idt[Vector].Type = Type;
 }

 /**
@@ -721,7 +709,7 @@ AR::ProcSup::SetNonMaskableInterruptTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock
    Tss->CR3 = CpuFunc::ReadControlRegister(3);
    Tss->Esp = (ULONG_PTR)KernelFaultStack;
    Tss->Esp0 = (ULONG_PTR)KernelFaultStack;
-    Tss->Eip = PtrToUlong(ArTrapEntry[0x02]);
+    Tss->Eip = PtrToUlong(ArTrap0x02);
    Tss->Cs = KGDT_R0_CODE;
    Tss->Ds = KGDT_R3_DATA | RPL_MASK;
    Tss->Es = KGDT_R3_DATA | RPL_MASK;
--- a/xtoskrnl/hl/fbdevfont.cc
+++ b/xtoskrnl/hl/fbdevfont.cc
--- a/xtoskrnl/hl/x86/pic.cc
+++ b/xtoskrnl/hl/x86/pic.cc
@@ -9,41 +9,6 @@
 #include <xtos.hh>


-/**
- * Checks whether the APIC is supported by the processor.
- *
- * @return This routine returns TRUE if APIC is supported, or FALSE otherwise.
- *
- * @since XT 1.0
- */
-XTAPI
-BOOLEAN
-HL::Pic::CheckApicSupport(VOID)
-{
-    CPUID_REGISTERS CpuRegisters;
-
-    /* Prepare CPUID registers */
-    CpuRegisters.Leaf = CPUID_GET_STANDARD1_FEATURES;
-    CpuRegisters.SubLeaf = 0;
-    CpuRegisters.Eax = 0;
-    CpuRegisters.Ebx = 0;
-    CpuRegisters.Ecx = 0;
-    CpuRegisters.Edx = 0;
-
-    /* Get CPUID */
-    AR::CpuFunc::CpuId(&CpuRegisters);
-
-    /* Check APIC status from the CPUID results */
-    if(!(CpuRegisters.Edx & CPUID_FEATURES_EDX_APIC))
-    {
-        /* APIC is not supported */
-        return FALSE;
-    }
-
-    /* APIC is supported */
-    return TRUE;
-}
-
 /**
 * Checks whether the x2APIC extension is supported by the processor.
 *
@@ -159,14 +124,6 @@ HL::Pic::InitializeApic(VOID)
    APIC_LVT_REGISTER LvtRegister;
    ULONG CpuNumber;

-    /* Check APIC support */
-    if(!CheckApicSupport())
-    {
-        /* APIC is not supported, raise kernel panic */
-        DebugPrint(L"FATAL ERROR: Local APIC not present.\n");
-        KE::Crash::Panic(0x5D, CPUID_GET_STANDARD1_FEATURES, 0x0, 0x0, CPUID_FEATURES_EDX_APIC);
-    }
-
    /* Determine APIC mode (xAPIC compatibility or x2APIC) */
    if(CheckX2ApicSupport())
    {
@@ -249,8 +206,8 @@ HL::Pic::InitializeApic(VOID)
    WriteApicRegister(APIC_LINT1, LvtRegister.Long);

    /* Register interrupt handlers */
-    HL::Irq::SetInterruptHandler(APIC_VECTOR_SPURIOUS, (PVOID)HandleApicSpuriousService);
-    HL::Irq::SetInterruptHandler(PIC1_VECTOR_SPURIOUS, (PVOID)HandlePicSpuriousService);
+    KE::Irq::SetInterruptHandler(APIC_VECTOR_SPURIOUS, (PVOID)HandleApicSpuriousService);
+    KE::Irq::SetInterruptHandler(PIC1_VECTOR_SPURIOUS, (PVOID)HandlePicSpuriousService);

    /* Clear any pre-existing errors */
    WriteApicRegister(APIC_ESR, 0);
--- a/xtoskrnl/includes/ar/amd64/asmsup.h
+++ b/xtoskrnl/includes/ar/amd64/asmsup.h
@@ -56,8 +56,6 @@
 #define TrapSegEs                               330
 #define TrapSegFs                               332
 #define TrapSegGs                               334
-#define TrapRsp                                 496
-#define TrapSegSs                               504

 /* KTRAP_FRAME length related definitions */
 #define TRAP_FRAME_SIZE                         512
--- a/xtoskrnl/includes/ar/amd64/assembly.hh
+++ b/xtoskrnl/includes/ar/amd64/assembly.hh
@@ -15,14 +15,9 @@
 /* TrampolineEnableXpa end address to calculate trampoline size */
 XTCLINK PVOID ArEnableExtendedPhysicalAddressingEnd[];

-/* External array of pointers to the interrupt handlers */
-XTCLINK ULONG_PTR ArInterruptEntry[256];
-
 /* TrampolineApStartup end address to calculate trampoline size */
 XTCLINK PVOID ArStartApplicationProcessorEnd[];

-/* External array of pointers to the trap handlers */
-XTCLINK ULONG_PTR ArTrapEntry[256];

 /* Forward reference for assembler code */
 XTCLINK
@@ -35,4 +30,129 @@ XTCDECL
 VOID
 ArStartApplicationProcessor(VOID);

+XTCLINK
+XTCDECL
+VOID
+ArTrap0x00(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x01(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x02(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x03(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x04(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x05(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x06(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x07(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x08(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x09(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0A(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0B(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0C(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0D(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0E(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x10(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x11(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x12(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x13(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x1F(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2C(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2D(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2F(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0xE1(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0xFF(VOID);
+
 #endif /* __XTOSKRNL_AR_ASSEMBLY_HH */
--- a/xtoskrnl/includes/ar/amd64/procsup.hh
+++ b/xtoskrnl/includes/ar/amd64/procsup.hh
@@ -31,13 +31,6 @@ namespace AR
                                                       OUT PVOID *TrampolineCode,
                                                       OUT PULONG_PTR TrampolineSize);
            STATIC XTAPI VOID InitializeProcessor(IN PVOID ProcessorStructures);
-            STATIC XTAPI VOID SetIdtGate(IN PKIDTENTRY Idt,
-                                         IN USHORT Vector,
-                                         IN PVOID Handler,
-                                         IN USHORT Selector,
-                                         IN USHORT Ist,
-                                         IN USHORT Dpl,
-                                         IN USHORT Type);

        private:
            STATIC XTAPI VOID IdentifyProcessor(VOID);
@@ -69,6 +62,12 @@ namespace AR
            STATIC XTAPI VOID SetGdtEntryBase(IN PKGDTENTRY Gdt,
                                              IN USHORT Selector,
                                              IN ULONG_PTR Base);
+            STATIC XTAPI VOID SetIdtGate(IN PKIDTENTRY Idt,
+                                         IN USHORT Vector,
+                                         IN PVOID Handler,
+                                         IN USHORT Selector,
+                                         IN USHORT Ist,
+                                         IN USHORT Access);
    };
 }

--- a/xtoskrnl/includes/ar/i686/asmsup.h
+++ b/xtoskrnl/includes/ar/i686/asmsup.h
@@ -24,11 +24,9 @@
 #define TrapSegEs                               38
 #define TrapSegFs                               40
 #define TrapSegGs                               42
-#define TrapEsp                                 92
-#define TrapSegSs                               96

 /* KTRAP_FRAME length related definitions */
 #define TRAP_FRAME_SIZE                         100
 #define TRAP_REGISTERS_SIZE                     56

-#endif /* __XTOSKRNL_I686_ASMSUP_H */
+#endif /* __XTOSKRNL_AMD64_ASMSUP_H */
--- a/xtoskrnl/includes/ar/i686/assembly.hh
+++ b/xtoskrnl/includes/ar/i686/assembly.hh
@@ -12,14 +12,9 @@
 #include <xtos.hh>


-/* External array of pointers to the interrupt handlers */
-XTCLINK ULONG_PTR ArInterruptEntry[256];
-
 /* TrampolineApStartup end address to calculate trampoline size */
 XTCLINK PVOID ArStartApplicationProcessorEnd[];

-/* External array of pointers to the trap handlers */
-XTCLINK ULONG_PTR ArTrapEntry[256];

 /* Forward reference for assembler code */
 XTCLINK
@@ -27,4 +22,130 @@ XTCDECL
 VOID
 ArStartApplicationProcessor(VOID);

+XTCLINK
+XTCDECL
+VOID
+ArTrap0x00(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x01(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x02(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x03(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x04(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x05(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x06(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x07(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x08(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x09(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0A(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0B(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0C(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0D(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x0E(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x10(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x11(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x12(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x13(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2A(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2B(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2C(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2D(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0x2E(VOID);
+
+XTCLINK
+XTCDECL
+VOID
+ArTrap0xFF(VOID);
+
+
 #endif /* __XTOSKRNL_AR_ASSEMBLY_HH */
--- a/xtoskrnl/includes/ar/i686/procsup.hh
+++ b/xtoskrnl/includes/ar/i686/procsup.hh
@@ -34,13 +34,6 @@ namespace AR
                                                       OUT PVOID *TrampolineCode,
                                                       OUT PULONG_PTR TrampolineSize);
            STATIC XTAPI VOID InitializeProcessor(IN PVOID ProcessorStructures);
-            STATIC XTAPI VOID SetIdtGate(IN PKIDTENTRY Idt,
-                                         IN USHORT Vector,
-                                         IN PVOID Handler,
-                                         IN USHORT Selector,
-                                         IN USHORT Ist,
-                                         IN USHORT Dpl,
-                                         IN USHORT Type);

        private:
            STATIC XTAPI VOID IdentifyProcessor(VOID);
@@ -74,6 +67,12 @@ namespace AR
            STATIC XTAPI VOID SetGdtEntryBase(IN PKGDTENTRY Gdt,
                                              IN USHORT Selector,
                                              IN ULONG_PTR Base);
+            STATIC XTAPI VOID SetIdtGate(IN PKIDTENTRY Idt,
+                                         IN USHORT Vector,
+                                         IN PVOID Handler,
+                                         IN USHORT Selector,
+                                         IN USHORT Ist,
+                                         IN USHORT Access);
            STATIC XTAPI VOID SetNonMaskableInterruptTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
                                                              IN PVOID KernelFaultStack);

--- a/xtoskrnl/includes/hl.hh
+++ b/xtoskrnl/includes/hl.hh
@@ -18,7 +18,6 @@
 #include <hl/init.hh>
 #include <hl/ioport.hh>
 #include <hl/ioreg.hh>
-#include <hl/irq.hh>
 #include <hl/pic.hh>
 #include <hl/runlevel.hh>

--- a/Meer weergeven
+++ b/Meer weergeven