configure.ps1: Fix path handling and improve reliability

- Use $PSScriptRoot for reliable source directory detection - Use Join-Path for proper path construction - Validate BUILD_TYPE against Debug/Release - Fix CMake argument quoting - Use Write-Error for error messages
Fix multi-sector read using CHS mode
2025-10-10 16:26:28 +02:00 · 2025-10-10 15:10:42 +02:00 · 2025-10-10 11:00:11 +02:00 · 2025-10-10 10:35:17 +02:00 · 2025-10-09 17:35:03 +02:00
7 changed files with 62 additions and 47 deletions
--- a/boot/bootsect/espboot.S
+++ b/boot/bootsect/espboot.S
@@ -151,7 +151,7 @@ ReadSectors:

 ReadCHS:
    /* Read sectors using CHS */
-    popal
+    pushw %cx
    pushal
    xorl %edx, %edx
    movzwl SectorsPerTrack - Start(%bp), %ecx
@@ -169,8 +169,9 @@ ReadCHS:
    orb %ah, %cl
    movw $0x0201, %ax
    int $0x13
-    jc DiskError
    popal
+    popw %cx
+    jc DiskError
    incl %eax
    movw %es, %dx
    addw $0x20, %dx
--- a/configure.ps1
+++ b/configure.ps1
@@ -4,48 +4,41 @@
 # DESCRIPTION: Project configuration script for preparing the build environment
 # DEVELOPERS:  Aiken Harris <harraiken91@gmail.com>

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

-# Set target architecture
-if ($env:TARGET) {
-    $ARCH = $env:TARGET
-} else {
-    $ARCH = "amd64"
-}
+# Set target architecture defaulting to amd64
+$ARCH = if ($env:TARGET) { $env:TARGET } else { "amd64" }

-# Set target build type
-if (-not $env:BUILD_TYPE) {
-    $env:BUILD_TYPE = "DEBUG"
-}
+# 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 = (Get-Location).Path
-$EXECTOS_BINARY_DIR = "build-$($ARCH)-$($env:BUILD_TYPE.ToLower())"
+$EXECTOS_SOURCE_DIR = $PSScriptRoot
+$EXECTOS_BINARY_DIR = Join-Path $EXECTOS_SOURCE_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"
+# 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-Location -Path $EXECTOS_BINARY_DIR
 }

+Set-Location $EXECTOS_BINARY_DIR
+
 # Delete old cache
-Remove-Item -Path "CMakeCache.txt" -ErrorAction SilentlyContinue
-Remove-Item -Path "host-tools/CMakeCache.txt" -ErrorAction SilentlyContinue
+Remove-Item "CMakeCache.txt", "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-Host "Configure script failed."
+    Write-Error "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/emulation.cmake
+++ b/sdk/cmake/emulation.cmake
@@ -23,36 +23,57 @@ endif()

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

    # This target starts up a QEMU+OVMF virtual machine using 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
-                                              -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
+                                              -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:whpx",mem-merge=off,vmport=off -enable-kvm -cpu host,-hypervisor,+topoext
+                          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
--- a/sdk/firmware/ovmf_code_i686.fd
+++ b/sdk/firmware/ovmf_code_i686.fd
--- a/sdk/firmware/ovmf_code_amd64.fd
+++ b/sdk/firmware/ovmf_code_amd64.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
Author	SHA1	Message	Date
Pedro Valadés	b74c31f17c	configure.ps1: Fix path handling and improve reliability - Use $PSScriptRoot for reliable source directory detection - Use Join-Path for proper path construction - Validate BUILD_TYPE against Debug/Release - Fix CMake argument quoting - Use Write-Error for error messages	2025-10-10 16:26:28 +02:00
Aiken Harris	56a1a811b9	Fix multi-sector read using CHS mode	2025-10-10 15:10:42 +02:00
Aiken Harris	32bacdd228	Unify OVMF firmware and add WHPX targets	2025-10-10 11:00:11 +02:00
Aiken Harris	2d4c82cd29	Add initial WHPX support	2025-10-10 10:35:17 +02:00
Pedro Valadés	e5611d8081	Add support for WHPX accelerator on Windows and introduce OVMF Pure EFI firmware	2025-10-09 17:35:03 +02:00