Use PowerShell module and improved xtchain ps1

build.sh

@@ -31,14 +31,9 @@ CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git"
 
 # LLVM Settings
 LLVMDIR="${SRCDIR}/llvm"
-LLVMTAG="llvmorg-21.1.3"
+LLVMTAG="llvmorg-21.1.1"
 LLVMVCS="https://github.com/llvm/llvm-project.git"
 
-# Mtools Settings
-MTOOLSDIR="${SRCDIR}/mtools"
-MTOOLSTAG="v4.0.49"
-MTOOLSVCS="https://github.com/xt-sys/mtools.git"
-
 # Ninja Settings
 NINJADIR="${SRCDIR}/ninja"
 NINJATAG="v1.13.1"
@@ -212,48 +207,6 @@ llvm_fetch()
     fi
 }
 
-# This function compiles and installs MTOOLS
-mtools_build()
-{
-    local CONFIGURE_PARAMETERS=""
-    local EXTENSION=""
-
-    # Clean old build if necessary
-    [ "${CLEAN_BUILD}" -eq 1 ] && rm -rf ${MTOOLSDIR}/build-${SYSTEM_NAME}
-
-    # Additional, target-specific configuration options
-    case "${SYSTEM_NAME}" in
-        Windows)
-            CONFIGURE_PARAMETERS="${CONFIGURE_PARAMETERS} --host=${SYSTEM_HOST}"
-            EXTENSION=".exe"
-            ;;
-    esac
-
-    # Build Mtools
-    echo ">>> Building MTOOLS ..."
-    mkdir -p ${MTOOLSDIR}/build-${SYSTEM_NAME}
-    cd ${MTOOLSDIR}/build-${SYSTEM_NAME}
-    ../configure ${CONFIGURE_PARAMETERS}
-    make -j ${BUILD_JOBS}
-    cp mtools${EXTENSION} ${BINDIR}/bin/
-    for TOOL in mcat mcd mcopy mdel mdir mformat minfo mlabel mmd mmove mpartition mrd mren mshowfat mtype mzip; do
-        cp mtools${EXTENSION} ${BINDIR}/bin/${TOOL}${EXTENSION}
-    done
-    cd ${WRKDIR}
-}
-
-# This function downloads MTOOLS from VCS
-mtools_fetch()
-{
-    if [ ! -d ${MTOOLSDIR} ]; then
-        echo ">>> Downloading MTOOLS ..."
-        git clone --depth 1 --branch ${MTOOLSTAG} ${MTOOLSVCS} ${MTOOLSDIR}
-        cd ${MTOOLSDIR}
-        apply_patches ${MTOOLSDIR##*/} ${MTOOLSTAG}
-        cd ${WRKDIR}
-    fi
-}
-
 # This function compiles and installs NINJA
 ninja_build()
 {
@@ -408,7 +361,7 @@ xtchain_build()
     echo ">>> Building XTchain tools ..."
     mkdir -p ${BINDIR}/bin
     mkdir -p ${BINDIR}/lib/xtchain
-    for EXEC in bin2c diskimg exetool xtcspecc; do
+    for EXEC in bin2c exetool xtcspecc; do
         if [ ! -e ${BINDIR}/bin/${EXEC} ]; then
             ${CCOMPILER} ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC}
         fi
@@ -526,10 +479,6 @@ xtchain_build
 wine_fetch
 wine_build
 
-# Download and build GNU Mtools
-mtools_fetch
-mtools_build
-
 if [ ${BUILD_MINIMAL} -eq 0 ]; then
     # Download and build LLVM
     llvm_fetch

patches/llvm/21.1.3/01-Fix-WaitForSingleObject-cast-on-MinGW.patch

@@ -1,13 +0,0 @@
-diff --git a/lldb/source/Host/windows/MainLoopWindows.cpp b/lldb/source/Host/windows/MainLoopWindows.cpp
-index c0b10797e..e971b8cfd 100644
---- a/lldb/source/Host/windows/MainLoopWindows.cpp
-+++ b/lldb/source/Host/windows/MainLoopWindows.cpp
-@@ -58,7 +58,7 @@ public:
-       // Keep trying to cancel ReadFile() until the thread exits.
-       do {
-         CancelIoEx(m_handle, /*lpOverlapped=*/NULL);
--      } while (WaitForSingleObject(m_monitor_thread.native_handle(), 1) ==
-+      } while (WaitForSingleObject((HANDLE)m_monitor_thread.native_handle(), 1) ==
-                WAIT_TIMEOUT);
-       m_monitor_thread.join();
-     }

scripts/xtchain.ps1

@@ -1,57 +1,156 @@
+#
 # PROJECT:     XTchain
 # LICENSE:     See the COPYING.md in the top level directory
 # FILE:        scripts/xtchain.ps1
 # DESCRIPTION: XTchain Entry Script
 # DEVELOPERS:  Aiken Harris <harraiken91@gmail.com>
+#
 
-# Get the absolute path to the XTchain
-$XTCDIR = Split-Path -Parent $MyInvocation.MyCommand.Definition
+[CmdletBinding()]
+param(
+    [Parameter(Position = 0)]
+    [string]$TargetArchitecture = "amd64",
+    
+    [Parameter(Position = 1)]
+    [string]$SourceDirectory = $PWD.Path
+)
 
-# Read the XTchain version
-$env:XTCVER = Get-Content "${XTCDIR}\Version"
-
-# Load the library (Make sure the xtclib.ps1 file is PowerShell compatible)
-. "${XTCDIR}\lib\xtchain\xtclib.ps1"
-
-# Set the target architecture
-$env:TARGET = $args[0]
-if (-not $env:TARGET) { $env:TARGET = "amd64" }
-
-# Save the source directory
-$SRCDIR = $args[1]
-if (-not $SRCDIR) { $SRCDIR = (Get-Location).Path }
-
-# Make sure the compiler flags are clean
-$env:HOST = $null
-$env:CFLAGS = $null
-$env:CXXFLAGS = $null
-$env:LDFLAGS = $null
-
-# Update PATH
-$env:PATH = "${XTCDIR}\bin;" + $env:PATH
-
-# Display banner
-version
-
-# Invoke shell with fancy prompt
-function global:prompt {
-    $PROMPT = " XT Toolchain "
-    $CWD = (Get-Location).Path
-    $CHEVRON = [char]0xE0B0
-    $SEGMENTS = @(
-        @{ TEXT = $PROMPT; BGCOLOR = "Blue"; FGCOLOR = "White" },
-        @{ TEXT = " $CWD ";     BGCOLOR = "DarkCyan";     FGCOLOR = "White" }
+# Initialize XTchain environment
+function Initialize-XTChain {
+    [CmdletBinding()]
+    param(
+        [string]$Architecture,
+        [string]$SourcePath
     )
-    for ($INDEX = 0; $INDEX -lt $SEGMENTS.Count; $INDEX++) {
-        $SEGMENT = $SEGMENTS[$INDEX]
-        $NEXTBG = if ($INDEX + 1 -lt $SEGMENTS.Count) { $SEGMENTS[$INDEX + 1].BGCOLOR } else { "Default" }
-        Write-Host $SEGMENT.TEXT -NoNewLine -ForegroundColor $SEGMENT.FGCOLOR -BackgroundColor $SEGMENT.BGCOLOR
-        if ($NEXTBG -ne "Default") {
-            Write-Host $CHEVRON -NoNewLine -ForegroundColor $SEGMENT.BGCOLOR -BackgroundColor $NEXTBG
-        } else {
-            Write-Host $CHEVRON -NoNewLine -ForegroundColor $SEGMENT.BGCOLOR
+    
+    # Get the absolute path to XTchain
+    $script:XTCDIR = (Get-Item -Path ".\").FullName
+    
+    # Read XTchain version
+    $versionFile = Join-Path $script:XTCDIR "Version"
+    if (Test-Path $versionFile) {
+        $env:XTCVER = Get-Content $versionFile -Raw | ForEach-Object { $_.Trim() }
+    } else {
+        Write-Warning "Version file not found at $versionFile"
+        $env:XTCVER = "Unknown"
+    }
+    
+    # Set XTchain directory environment variable
+    $env:XTCDIR = $script:XTCDIR
+    
+    # Import XTchain module
+    $modulePath = Join-Path $script:XTCDIR "lib\xtchain\xtclib.psm1"
+    if (Test-Path $modulePath) {
+        Import-Module $modulePath -Force -Global
+    } else {
+        Write-Error "XTchain module not found at $modulePath"
+        return $false
+    }
+    
+    # Set target architecture
+    $env:TARGET = $Architecture
+    
+    # Validate source directory
+    if (-not (Test-Path $SourcePath)) {
+        Write-Error "Source directory does not exist: $SourcePath"
+        return $false
+    }
+    
+    # Clean compiler environment variables
+    $env:HOST = $null
+    $env:CFLAGS = $null
+    $env:CXXFLAGS = $null
+    $env:LDFLAGS = $null
+    
+    # Update PATH to include XTchain binaries
+    $xtcBinPath = Join-Path $script:XTCDIR "bin"
+    if (Test-Path $xtcBinPath) {
+        $env:PATH = "$xtcBinPath;" + $env:PATH
+    } else {
+        Write-Warning "XTchain bin directory not found at $xtcBinPath"
+    }
+    
+    return $true
+}
+
+# Create fancy PowerLine-style prompt
+function Set-XTChainPrompt {
+    [CmdletBinding()]
+    param()
+    
+    function global:prompt {
+        try {
+            $promptText = " XT Toolchain "
+            $currentPath = (Get-Location).Path
+            $chevron = [char]0xE0B0
+            
+            # Define prompt segments
+            $segments = @(
+                @{ 
+                    Text = $promptText
+                    BackgroundColor = "Blue"
+                    ForegroundColor = "White"
+                },
+                @{ 
+                    Text = " $currentPath "
+                    BackgroundColor = "DarkCyan"
+                    ForegroundColor = "White"
+                }
+            )
+            
+            # Render segments
+            for ($index = 0; $index -lt $segments.Count; $index++) {
+                $segment = $segments[$index]
+                $nextBackground = if ($index + 1 -lt $segments.Count) { 
+                    $segments[$index + 1].BackgroundColor 
+                } else { 
+                    "Default" 
+                }
+                
+                # Write segment text
+                Write-Host $segment.Text -NoNewLine -ForegroundColor $segment.ForegroundColor -BackgroundColor $segment.BackgroundColor
+                
+                # Write separator
+                if ($nextBackground -ne "Default") {
+                    Write-Host $chevron -NoNewLine -ForegroundColor $segment.BackgroundColor -BackgroundColor $nextBackground
+                } else {
+                    Write-Host $chevron -NoNewLine -ForegroundColor $segment.BackgroundColor
+                }
+            }
+            
+            return " "
+        }
+        catch {
+            # Fallback to simple prompt if PowerLine fails
+            return "XTC> "
         }
     }
-    return " "
 }
-Set-Location -Path $SRCDIR
+
+# Main execution
+try {
+    Write-Host "Initializing XTchain environment..." -ForegroundColor Green
+    
+    if (-not (Initialize-XTChain -Architecture $TargetArchitecture -SourcePath $SourceDirectory)) {
+        Write-Error "Failed to initialize XTchain environment"
+        exit 1
+    }
+    
+    # Display version information
+    Show-XTCVersion
+    
+    # Set up the fancy prompt
+    Set-XTChainPrompt
+    
+    # Change to source directory
+    Set-Location -Path $SourceDirectory
+    
+    Write-Host "XTchain environment ready!" -ForegroundColor Green
+    Write-Host "Current directory: $(Get-Location)" -ForegroundColor Cyan
+    Write-Host "Target architecture: $env:TARGET" -ForegroundColor Cyan
+    Write-Host "Type 'Show-XTCHelp' or 'help' for available commands" -ForegroundColor Yellow
+}
+catch {
+    Write-Error "Failed to initialize XTchain: $_"
+    exit 1
+}

scripts/xtclib.ps1

@@ -1,143 +0,0 @@
-# PROJECT:     XTchain
-# LICENSE:     See the COPYING.md in the top level directory
-# FILE:        scripts/xtclib.ps1
-# DESCRIPTION: XTchain library
-# DEVELOPERS:  Aiken Harris <harraiken91@gmail.com>
-
-
-# Prints XTChain banner
-function banner {
-    param()
-    
-    $XTC_BANNER = "XT Toolchain v${Env:XTCVER} for Windows"
-
-    Write-Host "################################################################################"
-    Write-Host
-    Write-Host (' ' * [math]::Floor((80 - $XTC_BANNER.Length) / 2) + $XTC_BANNER) -ForegroundColor Yellow
-    Write-Host
-    Write-Host "################################################################################"
-    Write-Host
-}
-
-# Sets the target architecture
-function charch {
-    param (
-        [string]$arch
-    )
-
-    if ([string]::IsNullOrWhiteSpace($arch)) {
-        Write-Host "Syntax: charch [architecture]"
-        return
-    }
-    switch -Regex ($arch) {
-        "aarch64|arm64" {
-            $Env:TARGET = "aarch64"
-        }
-        "arm|armv7" {
-            $Env:TARGET = "armv7"
-        }
-        "i386|i486|i586|i686|x86" {
-            $Env:TARGET = "i686"
-        }
-        "amd64|x64|x86_64" {
-            $Env:TARGET = "amd64"
-        }
-        default {
-            $Env:TARGET = "UNKNOWN"
-        }
-    }
-    Write-Host "Target Architecture: $($Env:TARGET)"
-}
-
-# Sets the build type
-function chbuild {
-    param (
-        [string]$buildType
-    )
-
-    if ([string]::IsNullOrWhiteSpace($buildType)) {
-        Write-Host "Syntax: chbuild [DEBUG|RELEASE]"
-        return
-    }
-    switch -Regex ($buildType.ToUpper()) {
-        "RELEASE" {
-            $Env:BUILD_TYPE = "RELEASE"
-        }
-        default {
-            $Env:BUILD_TYPE = "DEBUG"
-        }
-    }
-    Write-Host "Target build type: $($Env:BUILD_TYPE)"
-}
-
-# Prints help
-function help {
-    banner
-    Write-Host "XTChain defines an internal list of commands:"
-    Write-Host " * banner          - prints XTChain banner"
-    Write-Host " * charch [arch]   - sets the target CPU architecture [aarch64/armv7/i686/amd64]"
-    Write-Host " * chbuild [type]  - sets build type [debug/release]"
-    Write-Host " * help            - prints this message"
-    Write-Host " * version         - prints XTChain and its components version"
-    Write-Host " * xbuild          - builds an application with a Ninja build system"
-}
-
-# Displays version banner
-function version {
-    param()
-
-    [bool]$XTCHAIN_EXTTOOLS = $false
-
-    if ((Test-Path "${Env:XTCDIR}/bin/clang") -and 
-        ((Get-Command clang).Source -eq "${Env:XTCDIR}/bin/clang") -and
-        ($Env:XTCVER -match "min")) {
-        $XTCHAIN_EXTTOOLS = $true
-        foreach ($TOOL in @("clang", "clang++", "cmake", "lld-link", "ninja")) {
-            if (!(Get-Command $TOOL -ErrorAction SilentlyContinue)) {
-                Write-Error "You are using minimal version of XTChain and '${TOOL}' has been not found in your system!"
-                Write-Error "Please install all required tools."
-                return
-            }
-        }
-    }
-
-    banner
-    Write-Host
-    Write-Host "LLVM/Clang Compiler: $(clang --version | Select-String -Pattern "version (\d+\.\d+\.\d+)"  | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command clang).Source))"
-    Write-Host "LLVM/LLD Linker: $(lld-link --version |  Select-String -Pattern "(\d+\.\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command lld-link).Source))"
-    Write-Host "Wine IDL Compiler: $(widl -V | Select-String -Pattern "version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command widl).Source))"
-    Write-Host "Wine Message Compiler: $(wmc -V | Select-String -Pattern "version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command wmc).Source))"
-    Write-Host "Wine Resource Compiler: $(wrc --version | Select-String -Pattern "version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command wrc).Source))"
-    Write-Host "XT SPEC Compiler: $(xtcspecc --help | Select-String -Pattern "Version (\d+\.\d+)" | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command xtcspecc).Source))"
-    Write-Host "CMake Build System: $(cmake --version | Select-String -Pattern "version (\d+\.\d+\.\d+)"  | ForEach-Object { $_.Matches.Groups[1].Value }) ($($(Get-Command cmake).Source))"
-    Write-Host "Ninja Build System: $(ninja --version) ($($(Get-Command ninja).Source))"
-    Write-Host
-
-    $BUILD_TYPE = if ($null -eq $env:BUILD_TYPE -or $env:BUILD_TYPE -eq '') { 'DEBUG' } else { $env:BUILD_TYPE }
-    $TARGET = if ($null -eq $env:TARGET -or $env:TARGET -eq '') { 'amd64' } else { $env:TARGET }
-    charch $TARGET
-    chbuild $BUILD_TYPE
-
-    Write-Host
-    Write-Host
-    Write-Host "For a list of all supported commands, type 'help'"
-    Write-Host "-------------------------------------------------"
-    Write-Host
-    Write-Host
-    Write-Host
-}
-
-# Builds application (wrapper to Ninja)
-function xbuild {
-    if (-not (Test-Path build.arch)) {
-        & ninja @args
-    } else {
-        $ARCH = Get-Content build.arch
-        if ($ARCH -ne $Env:TARGET) {
-            Write-Host "Build is configured for '$ARCH' while current target set to '$($Env:TARGET)'!"
-            Write-Host "Cannot continue until conflict is resolved ..."
-            return 1
-        }
-        & ninja @args
-    }
-}

scripts/xtclib.psm1

@@ -0,0 +1,248 @@
+#
+# MODULE:      XTchain
+# LICENSE:     See the COPYING.md in the top level directory
+# FILE:        xtclib.psm1
+# DESCRIPTION: XTchain PowerShell module
+# DEVELOPERS:  Aiken Harris <harraiken91@gmail.com>
+#
+
+# Module variables
+$script:XTCVersion = $env:XTCVER
+$script:XTCDirectory = $env:XTCDIR
+
+<#
+.SYNOPSIS
+    Prints XTChain banner
+.DESCRIPTION
+    Displays the XTChain version banner with formatting
+#>
+function Show-XTCBanner {
+    [CmdletBinding()]
+    param()
+    
+    $XTC_BANNER = "XT Toolchain v$script:XTCVersion for Windows"
+
+    Write-Host "################################################################################"
+    Write-Host
+    Write-Host (' ' * [math]::Floor((80 - $XTC_BANNER.Length) / 2) + $XTC_BANNER) -ForegroundColor Yellow
+    Write-Host
+    Write-Host "################################################################################"
+    Write-Host
+}
+
+<#
+.SYNOPSIS
+    Sets the target architecture
+.DESCRIPTION
+    Configures the TARGET environment variable based on the specified architecture
+.PARAMETER Architecture
+    The target architecture (aarch64, arm64, arm, armv7, i386, i486, i586, i686, x86, amd64, x64, x86_64)
+#>
+function Set-XTCArchitecture {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [string]$Architecture
+    )
+
+    switch -Regex ($Architecture.ToLower()) {
+        "aarch64|arm64" {
+            $env:TARGET = "aarch64"
+        }
+        "arm|armv7" {
+            $env:TARGET = "armv7"
+        }
+        "i386|i486|i586|i686|x86" {
+            $env:TARGET = "i686"
+        }
+        "amd64|x64|x86_64" {
+            $env:TARGET = "amd64"
+        }
+        default {
+            $env:TARGET = "UNKNOWN"
+            Write-Warning "Unknown architecture '$Architecture'. Set to UNKNOWN."
+        }
+    }
+    Write-Host "Target Architecture: $($env:TARGET)"
+}
+
+<#
+.SYNOPSIS
+    Sets the build type
+.DESCRIPTION
+    Configures the BUILD_TYPE environment variable
+.PARAMETER BuildType
+    The build type (DEBUG or RELEASE)
+#>
+function Set-XTCBuildType {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $true)]
+        [ValidateSet("DEBUG", "RELEASE")]
+        [string]$BuildType
+    )
+
+    $env:BUILD_TYPE = $BuildType.ToUpper()
+    Write-Host "Target build type: $($env:BUILD_TYPE)"
+}
+
+<#
+.SYNOPSIS
+    Shows XTChain help information
+.DESCRIPTION
+    Displays available XTChain commands and their usage
+#>
+function Show-XTCHelp {
+    [CmdletBinding()]
+    param()
+    
+    Show-XTCBanner
+    Write-Host "XTChain PowerShell Module Commands:"
+    Write-Host " * Show-XTCBanner           - prints XTChain banner"
+    Write-Host " * Set-XTCArchitecture      - sets the target CPU architecture"
+    Write-Host " * Set-XTCBuildType         - sets build type [DEBUG/RELEASE]"
+    Write-Host " * Show-XTCHelp             - prints this message"
+    Write-Host " * Show-XTCVersion          - prints XTChain and its components version"
+    Write-Host " * Invoke-XTCBuild          - builds an application with Ninja build system"
+    Write-Host
+    Write-Host "Legacy command aliases:"
+    Write-Host " * banner, charch, chbuild, help, version, xbuild"
+}
+
+<#
+.SYNOPSIS
+    Displays version information for XTChain components
+.DESCRIPTION
+    Shows version information for all XTChain tools and components
+#>
+function Show-XTCVersion {
+    [CmdletBinding()]
+    param()
+
+    # Check for minimal XTChain version with external tools
+    $XTCHAIN_EXTTOOLS = $false
+    if ((Test-Path "$script:XTCDirectory/bin/clang") -and 
+        ((Get-Command clang -ErrorAction SilentlyContinue).Source -eq "$script:XTCDirectory/bin/clang") -and
+        ($script:XTCVersion -match "min")) {
+        
+        $XTCHAIN_EXTTOOLS = $true
+        $requiredTools = @("clang", "clang++", "cmake", "lld-link", "ninja")
+        
+        foreach ($tool in $requiredTools) {
+            if (!(Get-Command $tool -ErrorAction SilentlyContinue)) {
+                Write-Error "You are using minimal version of XTChain and '$tool' has been not found in your system!"
+                Write-Error "Please install all required tools."
+                return
+            }
+        }
+    }
+
+    Show-XTCBanner
+    Write-Host
+
+    # Display tool versions
+    try {
+        $clangVersion = (clang --version | Select-String -Pattern "version (\d+\.\d+\.\d+)").Matches.Groups[1].Value
+        $clangPath = (Get-Command clang).Source
+        Write-Host "LLVM/Clang Compiler: $clangVersion ($clangPath)"
+    } catch { Write-Warning "Could not retrieve Clang version" }
+
+    try {
+        $lldVersion = (lld-link --version | Select-String -Pattern "(\d+\.\d+\.\d+)").Matches.Groups[1].Value
+        $lldPath = (Get-Command lld-link).Source
+        Write-Host "LLVM/LLD Linker: $lldVersion ($lldPath)"
+    } catch { Write-Warning "Could not retrieve LLD version" }
+
+    try {
+        $widlVersion = (widl -V | Select-String -Pattern "version (\d+\.\d+)").Matches.Groups[1].Value
+        $widlPath = (Get-Command widl).Source
+        Write-Host "Wine IDL Compiler: $widlVersion ($widlPath)"
+    } catch { Write-Warning "Could not retrieve WIDL version" }
+
+    try {
+        $wmcVersion = (wmc -V | Select-String -Pattern "version (\d+\.\d+)").Matches.Groups[1].Value
+        $wmcPath = (Get-Command wmc).Source
+        Write-Host "Wine Message Compiler: $wmcVersion ($wmcPath)"
+    } catch { Write-Warning "Could not retrieve WMC version" }
+
+    try {
+        $wrcVersion = (wrc --version | Select-String -Pattern "version (\d+\.\d+)").Matches.Groups[1].Value
+        $wrcPath = (Get-Command wrc).Source
+        Write-Host "Wine Resource Compiler: $wrcVersion ($wrcPath)"
+    } catch { Write-Warning "Could not retrieve WRC version" }
+
+    try {
+        $xtcspeccVersion = (xtcspecc --help | Select-String -Pattern "Version (\d+\.\d+)").Matches.Groups[1].Value
+        $xtcspeccPath = (Get-Command xtcspecc).Source
+        Write-Host "XT SPEC Compiler: $xtcspeccVersion ($xtcspeccPath)"
+    } catch { Write-Warning "Could not retrieve XTCSPECC version" }
+
+    try {
+        $cmakeVersion = (cmake --version | Select-String -Pattern "version (\d+\.\d+\.\d+)").Matches.Groups[1].Value
+        $cmakePath = (Get-Command cmake).Source
+        Write-Host "CMake Build System: $cmakeVersion ($cmakePath)"
+    } catch { Write-Warning "Could not retrieve CMake version" }
+
+    try {
+        $ninjaVersion = (ninja --version)
+        $ninjaPath = (Get-Command ninja).Source
+        Write-Host "Ninja Build System: $ninjaVersion ($ninjaPath)"
+    } catch { Write-Warning "Could not retrieve Ninja version" }
+
+    Write-Host
+
+    # Set default values and display current configuration
+    $BUILD_TYPE = if ([string]::IsNullOrEmpty($env:BUILD_TYPE)) { 'DEBUG' } else { $env:BUILD_TYPE }
+    $TARGET = if ([string]::IsNullOrEmpty($env:TARGET)) { 'amd64' } else { $env:TARGET }
+    
+    Set-XTCArchitecture -Architecture $TARGET
+    Set-XTCBuildType -BuildType $BUILD_TYPE
+
+    Write-Host
+    Write-Host
+    Write-Host "For a list of all supported commands, type 'Show-XTCHelp' or 'help'"
+    Write-Host "--------------------------------------------------------"
+    Write-Host
+}
+
+<#
+.SYNOPSIS
+    Builds application using Ninja build system
+.DESCRIPTION
+    Wrapper around ninja command with architecture validation
+.PARAMETER Arguments
+    Arguments to pass to ninja
+#>
+function Invoke-XTCBuild {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromRemainingArguments = $true)]
+        [string[]]$Arguments
+    )
+
+    if (Test-Path "build.arch") {
+        $buildArch = Get-Content "build.arch" -Raw
+        $buildArch = $buildArch.Trim()
+        
+        if ($buildArch -ne $env:TARGET) {
+            Write-Host "Build is configured for '$buildArch' while current target set to '$($env:TARGET)'!" -ForegroundColor Red
+            Write-Host "Cannot continue until conflict is resolved..." -ForegroundColor Red
+            return 1
+        }
+    }
+    
+    & ninja @Arguments
+    return $LASTEXITCODE
+}
+
+# Legacy function aliases for backwards compatibility
+Set-Alias -Name banner -Value Show-XTCBanner
+Set-Alias -Name charch -Value Set-XTCArchitecture
+Set-Alias -Name chbuild -Value Set-XTCBuildType
+Set-Alias -Name help -Value Show-XTCHelp
+Set-Alias -Name version -Value Show-XTCVersion
+Set-Alias -Name xbuild -Value Invoke-XTCBuild
+
+# Export functions and aliases
+Export-ModuleMember -Function Show-XTCBanner, Set-XTCArchitecture, Set-XTCBuildType, Show-XTCHelp, Show-XTCVersion, Invoke-XTCBuild
+Export-ModuleMember -Alias banner, charch, chbuild, help, version, xbuild

tools/diskimg.c

@@ -1,759 +0,0 @@
-/**
- * PROJECT:     XTchain
- * LICENSE:     See COPYING.md in the top level directory
- * FILE:        tools/diskimg.c
- * DESCRIPTION: Disk Image manipulation tool
- * DEVELOPERS:  Rafal Kupiec <belliash@codingworkshop.eu.org>
- *              Aiken Harris <harraiken91@gmail.com>
- */
-
-#include "xtchain.h"
-
-
-static RESERVED_SECTOR_INFO Fat32ReservedMap[] =
-{
-    {0, "Main VBR"},
-    {1, "FSInfo Sector"},
-    {6, "Backup VBR"},
-    {7, "Backup FSInfo Sector"},
-    {-1, NULL}
-};
-
-/* Forward references */
-static void CopyData(const char *Image, long Offset, const char *SourceDir, const char *Relative);
-static void CopyImageFile(const char *Image, long Offset, const char *SourceFile, const char *Relative);
-static long DetermineExtraSector(long sectors_to_write);
-long GetSectorFileSize(const char *FileName);
-int LoadSectors(const char *FileName, uint8_t *Buffer, int SectorCount);
-static void MakeDirectory(const char *Image, long Offset, const char *Relative);
-
-/* Copies a directory recursively to the image */
-static void CopyData(const char *Image, long Offset, const char *SourceDir, const char *Relative)
-{
-    char Path[2048];
-    struct dirent *Entry;
-    DIR *Directory;
-    struct stat Stat;
-    char new_rel[2048];
-
-    /* Create the directory in the image */
-    if(Relative[0] != '\0')
-    {
-        MakeDirectory(Image, Offset, Relative);
-    }
-
-    /* Open the source directory */
-    Directory = opendir(SourceDir);
-    if(!Directory)
-    {
-        /* Failed to open directory */
-        perror("Failed to open source directory");
-        return;
-    }
-
-    /* Read all entries in the directory */
-    while((Entry = readdir(Directory)))
-    {
-        /* Skip . and .. entries */
-        if(strcmp(Entry->d_name, ".") == 0 || strcmp(Entry->d_name, "..") == 0)
-        {
-            continue;
-        }
-
-        /* Build the full path to the entry */
-        snprintf(Path, sizeof(Path), "%s%c%s", SourceDir, PATH_SEP, Entry->d_name);
-
-        /* Stat the entry */
-        if(stat(Path, &Stat) == -1)
-        {
-            /* Failed to stat entry */
-            perror("Failed to stat file or directory");
-            continue;
-        }
-
-        /* Build the relative path to the entry */
-        if(Relative[0] != '\0')
-        {
-            snprintf(new_rel, sizeof(new_rel), "%s/%s", Relative, Entry->d_name);
-        }
-        else
-        {
-            snprintf(new_rel, sizeof(new_rel), "%s", Entry->d_name);
-        }
-
-        /* Copy the entry to the image */
-        if(S_ISDIR(Stat.st_mode))
-        {
-            /* Entry is a directory, copy it recursively */
-            CopyData(Image, Offset, Path, new_rel);
-        }
-        else if(S_ISREG(Stat.st_mode))
-        {
-            /* Entry is a file, copy it */
-            CopyImageFile(Image, Offset, Path, new_rel);
-        }
-    }
-
-    /* Close the directory */
-    closedir(Directory);
-}
-
-/* Copies a file to the image */
-static void CopyImageFile(const char *Image, long Offset, const char *SourceFile, const char *Relative)
-{
-    char Command[4096];
-
-    /* Copy the file to the image */
-    snprintf(Command, sizeof(Command), "mcopy -i \"%s@@%ld\" \"%s\" \"::/%s\"", Image, Offset, SourceFile, Relative);
-    if(system(Command) != 0)
-    {
-        /* Failed to copy file */
-        fprintf(stderr, "Faile to copy file '%s' to image\n", SourceFile);
-    }
-}
-
-/* Determines a safe sector to write extra VBR data to */
-static long DetermineExtraSector(long sectors_to_write)
-{
-    long Candidate;
-    long Conflict;
-    long Index;
-    long LastSector;
-
-    /* Start search from sector 1 (sector 0 is the main VBR) */
-    for(Candidate = 1; Candidate < 32; Candidate++)
-    {
-        /* Calculate the last sector to write */
-        LastSector = Candidate + sectors_to_write - 1;
-        Conflict = 0;
-
-        /* Check if it fits within the reserved region (32 sectors) */
-        if(LastSector >= 32)
-        {
-            /* The remaining space is not large enough */
-            break;
-        }
-
-        /* Check for conflicts with critical sectors */
-        for(Index = 0; Fat32ReservedMap[Index].SectorNumber != -1; Index++)
-        {
-            if(Candidate <= Fat32ReservedMap[Index].SectorNumber && LastSector >= Fat32ReservedMap[Index].SectorNumber)
-            {
-                /* Found a conflict */
-                Conflict = 1;
-                break;
-            }
-        }
-
-        /* Make sure there are no conflicts */
-        if(!Conflict)
-        {
-            /* Found a suitable slot */
-            return Candidate;
-        }
-    }
-
-    /* No suitable slot found */
-    return -1;
-}
-
-/* Gets the size of a file */
-long GetSectorFileSize(const char *FileName)
-{
-    FILE *File;
-    long Size;
-
-    /* Open the file in binary mode */
-    File = fopen(FileName, "rb");
-    if(!File)
-    {
-        /* Failed to open file */
-        perror("Failed to open file for size check");
-        return -1;
-    }
-
-    /* Get the file size */
-    fseek(File, 0, SEEK_END);
-    Size = ftell(File);
-
-    /* Close the file and return the size */
-    fclose(File);
-    return Size;
-}
-
-/* Loads one or more sectors from a file */
-int LoadSectors(const char *FileName, uint8_t *Buffer, int SectorCount)
-{
-    FILE *File;
-    long FileSize;
-    long BytesToRead = SectorCount * SECTOR_SIZE;
-
-    /* Get and validate file size */
-    FileSize = GetSectorFileSize(FileName);
-    if(FileSize < 0)
-    {
-        /* Failed to get file size */
-        perror("Failed to get file size");
-        return -1;
-    }
-    if(FileSize != BytesToRead)
-    {
-        fprintf(stderr, "Error: file '%s' must be exactly %ld bytes, but is %ld bytes.\n", FileName, BytesToRead, FileSize);
-        return -1;
-    }
-
-    /* Open the file in binary mode for reading */
-    File = fopen(FileName, "rb");
-    if(!File) {
-        /* Failed to open file */
-        perror("Failed to open sector file for reading");
-        return -1;
-    }
-
-    /* Read sectors to buffer */
-    if(fread(Buffer, 1, BytesToRead, File) != BytesToRead)
-    {
-        /* Failed to read sectors */
-        perror("Failed to read sectors from file");
-        fclose(File);
-        return -1;
-    }
-
-    /* Close the file */
-    fclose(File);
-    return 0;
-}
-
-/* Creates a directory in the image */
-static void MakeDirectory(const char *Image, long Offset, const char *Relative)
-{
-    char Command[4096];
-
-    /* Create the directory in the image */
-    snprintf(Command, sizeof(Command), "mmd -i \"%s@@%ld\" \"::/%s\"", Image, Offset, Relative);
-    system(Command);
-}
-
-/* Main function */
-int main(int argc, char **argv)
-{
-    FILE *File;
-    long Index;
-    long FatFormat = 32;
-    char FormatCommand[512];
-    long FormatPartition = 0;
-    long DiskSizeBytes = 0;
-    long DiskSizeMB = 0;
-    long MergedSize = 0;
-    long PreloaderSize = 0;
-    long SectorsToWrite = 0;
-    long VbrExtraSector = -1;
-    long VbrFileSize = -1;
-    long VbrTotalSectors = 0;
-    long VbrLastSector = 99;
-    char VbrInfo[128] = "";
-    MBR_PARTITION Partition = {0};
-    char Zero[SECTOR_SIZE] = {0};
-    uint8_t Mbr[SECTOR_SIZE] = {0};
-    uint8_t ImageVbr[SECTOR_SIZE * 2] = {0};
-    uint8_t *MergedData = NULL;
-    uint8_t *PreloaderData = NULL;
-    uint8_t *FullVbrData = NULL;
-    const char *FileName = NULL;
-    const char *MbrFile = NULL;
-    const char *PreloadFile = NULL;
-    const char *VbrFile = NULL;
-    const char *CopyDir = NULL;
-
-    /* Parse command line arguments */
-    for(Index = 1; Index < argc; Index++)
-    {
-        if(strcmp(argv[Index], "-c") == 0 && Index + 1 < argc)
-        {
-            /* Copy directory */
-            CopyDir = argv[++Index];
-        }
-        else if(strcmp(argv[Index], "-e") == 0 && Index + 1 < argc)
-        {
-            /* VBR extra data sector */
-            VbrExtraSector = atol(argv[++Index]);
-        }
-        else if(strcmp(argv[Index], "-f") == 0 && Index + 1 < argc)
-        {
-            /* Format partition */
-            FormatPartition = 1;
-            FatFormat = atoi(argv[++Index]);
-            if(FatFormat != 16 && FatFormat != 32)
-            {
-                fprintf(stderr, "Error: FAT format (-f) must be 16 or 32\n");
-                return 1;
-            }
-        }
-        else if(strcmp(argv[Index], "-m") == 0 && Index + 1 < argc)
-        {
-            /* MBR file */
-            MbrFile = argv[++Index];
-        }
-        else if(strcmp(argv[Index], "-o") == 0 && Index + 1 < argc)
-        {
-            /* Output file */
-            FileName = argv[++Index];
-        }
-        else if(strcmp(argv[Index], "-p") == 0 && Index + 1 < argc)
-        {
-            /* Preloader file */
-            PreloadFile = argv[++Index];
-        }
-        else if(strcmp(argv[Index], "-s") == 0 && Index + 1 < argc)
-        {
-            /* Disk size */
-            DiskSizeMB = atol(argv[++Index]);
-        }
-        else if(strcmp(argv[Index], "-v") == 0 && Index + 1 < argc)
-        {
-            /* VBR file */
-            VbrFile = argv[++Index];
-        }
-        else
-        {
-            /* Unknown argument */
-            fprintf(stderr, "Unknown argument: %s\n", argv[Index]);
-            return 1;
-        }
-    }
-
-    /* Check for required arguments */
-    if(DiskSizeMB <= 0 || FileName == NULL)
-    {
-        /* Missing required arguments, print usage */
-        fprintf(stderr, "Usage: %s -o <output.img> -s <size_MB> [-b <sector>] [-c <dir>] [-f 16|32] [-m <mbr.img>] [-p <preload.bin>] [-v <vbr.img>]\n", argv[0]);
-        return 1;
-    }
-
-    /* Validate preload usage */
-    if(PreloadFile && !VbrFile)
-    {
-        /* Preloader code specified without VBR */
-        fprintf(stderr, "Error: Option -p (PRELOADER code) requires -v (VBR code) to be specified as well.\n");
-        return 1;
-    }
-
-    /* Calculate disk size in bytes */
-    DiskSizeBytes = DiskSizeMB * 1024 * 1024;
-
-    /* Open the output file in binary mode */
-    File = fopen(FileName, "wb");
-    if(!File) {
-        /* Failed to open file */
-        perror("Failed to open disk image file");
-        return 1;
-    }
-
-    /* Write zeros to the disk image file */
-    for(Index = 0; Index < DiskSizeBytes / SECTOR_SIZE; Index++)
-    {
-        if(fwrite(Zero, 1, SECTOR_SIZE, File) != SECTOR_SIZE)
-        {
-            /* Failed to write to disk image file */
-            perror("Failed to write to disk image file");
-            fclose(File);
-            return 1;
-        }
-    }
-
-    /* Load MBR if provided */
-    if(MbrFile)
-    {
-        if(LoadSectors(MbrFile, Mbr, 1) != 0)
-        {
-            /* Failed to load MBR from file */
-            perror("Failed to load MBR from file");
-            fclose(File);
-            return 1;
-        }
-    }
-
-    /* Setup MBR partition as W95 FAT16 or FAT32 */
-    Partition.BootFlag = 0x80;
-    Partition.Type = (FatFormat == 16) ? 0x06 : 0x0B;
-    Partition.StartLBA = 2048;
-    Partition.Size = (DiskSizeBytes / SECTOR_SIZE) - Partition.StartLBA;
-
-    /* Write MBR */
-    memcpy(&Mbr[446], &Partition, sizeof(MBR_PARTITION));
-    Mbr[510] = 0x55;
-    Mbr[511] = 0xAA;
-
-    /* Write the MBR to the beginning of the disk image */
-    fseek(File, 0, SEEK_SET);
-    if(fwrite(Mbr, 1, SECTOR_SIZE, File) != SECTOR_SIZE)
-    {
-        /* Failed to write MBR to disk image */
-        perror("Failed to write MBR to disk image");
-        fclose(File);
-        return 1;
-    }
-
-    /* Check if we need to format the partition */
-    if(FormatPartition)
-    {
-        /* Close file before calling external formatter */
-        fclose(File);
-
-        /* Build mformat command */
-        if(FatFormat == 16)
-        {
-            /* Format partition as FAT16 */
-            snprintf(FormatCommand, sizeof(FormatCommand),
-                     "mformat -i %s@@%ld",
-                     FileName, (long)(Partition.StartLBA * SECTOR_SIZE));
-        }
-        else
-        {
-            /* Format partition as FAT32 */
-            snprintf(FormatCommand, sizeof(FormatCommand),
-                     "mformat -i %s@@%ld -F",
-                     FileName, (long)(Partition.StartLBA * SECTOR_SIZE));
-        }
-
-        /* Format the partition */
-        if(system(FormatCommand) != 0)
-        {
-            /* Failed to format partition */
-            perror("Failed to format partition");
-            return 1;
-        }
-
-        /* Reopen disk image */
-        File = fopen(FileName, "r+b");
-        if(!File) {
-            /* Failed to open file */
-            perror("Failed to reopen disk image");
-            return 1;
-        }
-
-        /* Read the VBR created by mformat */
-        fseek(File, Partition.StartLBA * SECTOR_SIZE, SEEK_SET);
-        if(fread(ImageVbr, 1, SECTOR_SIZE, File) != SECTOR_SIZE)
-        {
-            /* Failed to read VBR */
-            perror("Failed to read VBR from disk image");
-            fclose(File);
-            return 1;
-        }
-
-        /* Set the number of hidden sectors, as mformat sets it to 0 */
-        if(*(uint32_t*)&ImageVbr[0x1C] == 0)
-        {
-            memcpy(&ImageVbr[0x1C], &Partition.StartLBA, sizeof(uint32_t));
-        }
-
-        /* Check FAT format */
-        if(FatFormat == 32)
-        {
-            /* For FAT32, TotalSectors32 must be set */
-            *(uint16_t*)&ImageVbr[0x13] = 0;
-            if(*(uint32_t*)&ImageVbr[0x20] == 0)
-            {
-                /* Mformat did not set the field, update it */
-                memcpy(&ImageVbr[0x20], &Partition.Size, sizeof(uint32_t));
-            }
-        }
-        else
-        {
-            /* For FAT16, check if parition size exceeds 65535 sectors */
-            if(Partition.Size < 65536)
-            {
-                /* Partition smaller than 32MB (65536 sectors), use 16-bit field TotalSectors16 */
-                if(*(uint16_t*)&ImageVbr[0x13] == 0)
-                {
-                    /* Mformat did not set the field, update it */
-                    memcpy(&ImageVbr[0x13], &((uint16_t){Partition.Size}), sizeof(uint16_t));
-                }
-            }
-            else
-            {
-                /* Partition larger than 32MB (65536 sectors), use 32-bit field TotalSectors32 */
-                *(uint16_t*)&ImageVbr[0x13] = 0;
-                if(*(uint32_t*)&ImageVbr[0x20] == 0)
-                {
-                    /* Mformat did not set the field, update it */
-                    memcpy(&ImageVbr[0x20], &Partition.Size, sizeof(uint32_t));
-                }
-            }
-        }
-
-        /* Set DriveNumber to emulate hard disk */
-        ImageVbr[0x40] = 0x80;
-
-        /* Write the corrected VBR back to the disk image */
-        fseek(File, Partition.StartLBA * SECTOR_SIZE, SEEK_SET);
-        if(fwrite(ImageVbr, 1, SECTOR_SIZE, File) != SECTOR_SIZE)
-        {
-            /* Failed to write VBR */
-            perror("Failed to write VBR to disk image");
-            fclose(File);
-            return 1;
-        }
-    }
-
-    /* Write VBR to the start of the partition, if provided */
-    if(VbrFile)
-    {
-        VbrFileSize = GetSectorFileSize(VbrFile);
-        if(VbrFileSize < 0)
-        {
-            /* Unable to determine VBR file size */
-            perror("Could not get size of VBR file\n");
-            return 1;
-        }
-
-        /* Check if VBR file size is a multiple of sector size */
-        if(VbrFileSize % SECTOR_SIZE != 0)
-        {
-            /* Unable to determine VBR file size */
-            perror("VBR file size is not a multiple of sector size\n");
-            return 1;
-        }
-
-        /* Calculate number of VBR sectors */
-        VbrTotalSectors = VbrFileSize / SECTOR_SIZE;
-
-        /* Allocate memory for the entire VBR file */
-        FullVbrData = malloc(VbrFileSize);
-        if(!FullVbrData)
-        {
-            /* Memory allocation failed */
-            perror("Failed to allocate memory for VBR file\n");
-            return 1;
-        }
-
-        /* Read the entire VBR file into the buffer */
-        if(LoadSectors(VbrFile, FullVbrData, VbrTotalSectors) != 0)
-        {
-            /* Failed to load VBR from file */
-            perror("Failed to load VBR from file\n");
-            free(FullVbrData);
-            return 1;
-        }
-
-        /* Read the existing VBR from the formatted partition to get the correct BPB */
-        fseek(File, Partition.StartLBA * SECTOR_SIZE, SEEK_SET);
-        if(fread(ImageVbr, 1, SECTOR_SIZE, File) != SECTOR_SIZE)
-        {
-            /* Failed to read VBR from disk image */
-            perror("Failed to read BPB from disk image\n");
-            free(FullVbrData);
-            fclose(File);
-            return 1;
-        }
-
-        /* Copy the BPB from the image's VBR to VBR buffer */
-        if(FatFormat == 32)
-        {
-            /* For FAT32, BPB is larger (up to offset 89) */
-            memcpy(&FullVbrData[3], &ImageVbr[3], 87);
-        }
-        else
-        {
-            /* For FAT16, BPB is smaller (up to offset 61) */
-            memcpy(&FullVbrData[3], &ImageVbr[3], 59);
-        }
-
-        /* Write the first 512 bytes of the final, merged VBR to the start of the partition */
-        fseek(File, Partition.StartLBA * SECTOR_SIZE, SEEK_SET);
-        if(fwrite(FullVbrData, 1, SECTOR_SIZE, File) != SECTOR_SIZE)
-        {
-            /* Failed to write VBR to disk image */
-            perror("Failed to write VBR to disk image\n");
-            free(FullVbrData);
-            fclose(File);
-            return 1;
-        }
-
-        /* Handle extra VBR data if it exists */
-        if(FatFormat == 32)
-        {
-            /* Check if a preloader file was provided */
-            if(PreloadFile)
-            {
-                /* Get the size of the preloader file */
-                PreloaderSize = GetSectorFileSize(PreloadFile);
-                if(PreloaderSize < 0)
-                {
-                    /* Unable to determine preloader file size */
-                    perror("Could not get size of preloader file.\n");
-                    free(FullVbrData);
-                    return 1;
-                }
-
-                /* Check if preloader size is multiple of 512 bytes */
-                if(PreloaderSize % SECTOR_SIZE != 0)
-                {
-                    /* Preloader file size is not a multiple of 512 bytes */
-                    perror("Preloader file size is not a multiple of sector size\n");
-                    free(FullVbrData);
-                    return 1;
-                }
-
-                /* Allocate buffer for preloader */
-                PreloaderData = malloc((size_t)PreloaderSize);
-                if(!PreloaderData)
-                {
-                    /* Memory allocation failed */
-                    perror("Failed to allocate memory for preloader");
-                    free(FullVbrData);
-                    return 1;
-                }
-
-                /* Load preloader data */
-                if(LoadSectors(PreloadFile, PreloaderData, PreloaderSize / SECTOR_SIZE) != 0)
-                {
-                    /* Failed to load preloader data */
-                    perror("Failed to load Preloader code from file\n");
-                    free(FullVbrData);
-                    return 1;
-                }
-
-                /* Allocate new buffer for the first 512 bytes of VBR and preloader */
-                MergedSize = SECTOR_SIZE + PreloaderSize;
-                MergedData = malloc(MergedSize);
-                if(!MergedData)
-                {
-                    /* Memory allocation failed */
-                    perror("Failed to allocate memory for Preloader file\n");
-                    free(PreloaderData);
-                    free(FullVbrData);
-                    return 1;
-                }
-
-                /* Merge VBR and preloader data */
-                memcpy(MergedData, FullVbrData, SECTOR_SIZE);
-                memcpy(MergedData + SECTOR_SIZE, PreloaderData, PreloaderSize);
-
-                /* Free old buffers and replace with merged data */
-                free(FullVbrData);
-                free(PreloaderData);
-                FullVbrData = MergedData;
-
-                /* Update VBR sectors count */
-                VbrTotalSectors = (MergedSize + SECTOR_SIZE - 1) / SECTOR_SIZE;
-            }
-
-            /* Check if there is extra VBR data to write */
-            if(VbrTotalSectors > 1)
-            {
-                /* Check if extra sector has been provided by the user */
-                if(VbrExtraSector == -1)
-                {
-                    /* Determine a safe sector to write extra VBR data to */
-                    long sectors_to_write = VbrTotalSectors - 1;
-                    VbrExtraSector = DetermineExtraSector(sectors_to_write);
-                    if(VbrExtraSector == -1)
-                    {
-                        /* Failed to find a safe sector */
-                        fprintf(stderr, "Error: Could not automatically find a safe space in the FAT32 reserved region for %ld extra VBR sectors.\n",
-                                sectors_to_write);
-                        free(FullVbrData);
-                        return 1;
-                    }
-                }
-
-                /* Calculate number of sectors and last sector to write */
-                SectorsToWrite = VbrTotalSectors - 1;
-                VbrLastSector = VbrExtraSector + SectorsToWrite - 1;
-
-                /* Ensure VBR will not be writen outside the reserved region (32 sectors for FAT32) */
-                if(VbrLastSector >= 32)
-                {
-                    /* The remaining space is not large enough to fit the extra VBR data */
-                    fprintf(stderr, "Error: VBR file is too large. Writing to sector %ld would exceed the FAT32 reserved region (32 sectors).\n", VbrLastSector);
-                    free(FullVbrData);
-                    return 1;
-                }
-
-                /* Safety check: ensure we do not overwrite critical sectors */
-                for(Index = 0; Fat32ReservedMap[Index].SectorNumber != -1; Index++)
-                {
-                    /* Check if we are about to overwrite a critical sector */
-                    if(VbrExtraSector <= Fat32ReservedMap[Index].SectorNumber && VbrLastSector >= Fat32ReservedMap[Index].SectorNumber)
-                    {
-                        /* We are about to overwrite a critical sector */
-                        fprintf(stderr, "Error: Writing VBR extra data would overwrite critical sector %d (%s).\n",
-                                Fat32ReservedMap[Index].SectorNumber, Fat32ReservedMap[Index].Description);
-                        free(FullVbrData);
-                        return 1;
-                    }
-                }
-
-                /* Write the rest of the VBR data */
-                fseek(File, (Partition.StartLBA + VbrExtraSector) * SECTOR_SIZE, SEEK_SET);
-                if(fwrite(FullVbrData + SECTOR_SIZE, 1, SectorsToWrite * SECTOR_SIZE, File) != (size_t)(SectorsToWrite * SECTOR_SIZE))
-                {
-                    /* Failed to write extra VBR data to disk image */
-                    perror("Failed to write extra VBR data to disk image");
-                    free(FullVbrData);
-                    fclose(File);
-                    return 1;
-                }
-            }
-        }
-        else /* FatFormat == 16 */
-        {
-            /* Check if there is extra VBR data to write */
-            if(VbrTotalSectors > 1 || PreloadFile)
-            {
-                /* FAT16 only supports a 1-sector VBR */
-                fprintf(stderr, "Error: FAT16 does not support multi-sector VBR or preloader data.\n");
-                free(FullVbrData);
-                return 1;
-            }
-        }
-
-        /* Free allocated memory */
-        free(FullVbrData);
-    }
-
-    /* Close file */
-    fclose(File);
-
-    /* Copy files if requested */
-    if(CopyDir)
-    {
-        CopyData(FileName, (long)(Partition.StartLBA * SECTOR_SIZE), CopyDir, "");
-    }
-
-    /* Check if VBR was written */
-    if(VbrFile)
-    {
-        /* Compose VBR info string */
-        if(VbrExtraSector != -1)
-        {
-            if(PreloadFile)
-            {
-                /* Preloader written */
-                snprintf(VbrInfo, sizeof(VbrInfo), ", VBR written (preloader at sector %ld)", VbrExtraSector);
-            }
-            else
-            {
-                /* VBR with extra data */
-                snprintf(VbrInfo, sizeof(VbrInfo), ", VBR written (extra data at sector %ld)", VbrExtraSector);
-            }
-        }
-        else
-        {
-            /* Standard VBR */
-            snprintf(VbrInfo, sizeof(VbrInfo), ", VBR written");
-        }
-    }
-
-    /* Print success message */
-    printf("Successfully created disk image '%s' (%ld MB) with bootable W95 FAT-%ld partition%s%s%s.\n",
-           FileName,
-           DiskSizeMB,
-           FatFormat,
-           MbrFile ? ", MBR written" : "",
-           VbrInfo,
-           CopyDir ? ", files copied" : "");
-    return 0;
-}

tools/exetool.c

@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
     fread(&SubSystem, sizeof(unsigned short), 1, ExeFile);
 
     /* Seek back to the SubSystem field in the optional header */
-    fseek(ExeFile, -(long)sizeof(unsigned short), SEEK_CUR);
+    fseek(ExeFile, -sizeof(unsigned short), SEEK_CUR);
 
     /* Write the new SubSystem value */
     fwrite(&NewSubSystem->Identifier, sizeof(unsigned short), 1, ExeFile);

tools/xtchain.h

@@ -7,40 +7,12 @@
  *              Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <dirent.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
 
-
-#ifdef _WIN32
-#include <windows.h>
-#define PATH_SEP '\\'
-#else
-#define PATH_SEP '/'
-#endif
-
-#define SECTOR_SIZE     512
-#define _T(x)           x
-
-typedef struct MBR_PARTITION {
-    uint8_t BootFlag;       // 0x80 = bootable, 0x00 = non-boot
-    uint8_t StartCHS [3];   // CHS address
-    uint8_t Type;           // Partition type
-    uint8_t EndCHS[3];      // CHS address
-    uint32_t StartLBA;      // Start sector
-    uint32_t Size;          // Sectors count
-} MBR_PARTITION, *PMBR_PARTITION;
-
-typedef struct _RESERVED_SECTOR_INFO
-{
-    int SectorNumber;
-    const char* Description;
-} RESERVED_SECTOR_INFO, *PRESERVED_SECTOR_INFO;
+#define _T(x) x
 
 static
 inline
@@ -80,17 +52,17 @@ split_argv(const char *argv0,
            char **exe_ptr)
 {
     const char *sep = _tcsrchrs(argv0, '/', '\\');
-    const char *basename_ptr_const = argv0;
     char *dir = strdup(_T(""));
+    const char *basename = argv0;
 
     if(sep)
     {
         dir = strdup(argv0);
         dir[sep + 1 - argv0] = '\0';
-        basename_ptr_const = sep + 1;
+        basename = sep + 1;
     }
 
-    char *basename = strdup(basename_ptr_const);
+    basename = strdup(basename);
     char *period = strchr(basename, '.');
 
     if(period)
@@ -100,7 +72,7 @@ split_argv(const char *argv0,
 
     char *target = strdup(basename);
     char *dash = strrchr(target, '-');
-    char *exe = basename;
+    const char *exe = basename;
 
     if(dash)
     {

tools/xtcspecc.c

@@ -14,9 +14,10 @@
 
 #include "xtchain.h"
 
-
 #define XTCSPECC_VERSION "1.2"
 
+#define ARRAYSIZE(a) (sizeof(a) / sizeof((a)[0]))
+
 typedef struct _STRING
 {
     const char *buf;
@@ -76,12 +77,12 @@ enum
 
 enum
 {
-    CCONV_STDCALL,
-    CCONV_CDECL,
-    CCONV_FASTCALL,
-    CCONV_THISCALL,
-    CCONV_EXTERN,
-    CCONV_STUB,
+    CC_STDCALL,
+    CC_CDECL,
+    CC_FASTCALL,
+    CC_THISCALL,
+    CC_EXTERN,
+    CC_STUB,
 };
 
 enum
@@ -256,11 +257,11 @@ OutputLine_stub(FILE *file,
     int bRelay = 0;
     int bInPrototype = 0;
 
-    if(pexp->nCallingConvention != CCONV_STUB &&
+    if(pexp->nCallingConvention != CC_STUB &&
        (pexp->uFlags & FL_STUB) == 0)
     {
         /* Only relay trace stdcall C functions */
-        if(!gbTracing || (pexp->nCallingConvention != CCONV_STDCALL) ||
+        if(!gbTracing || (pexp->nCallingConvention != CC_STDCALL) ||
            (pexp->uFlags & FL_NORELAY) ||
            (pexp->strName.buf[0] == '?'))
         {
@@ -293,7 +294,7 @@ OutputLine_stub(FILE *file,
         }
 
         if((giArch == ARCH_X86) &&
-            pexp->nCallingConvention == CCONV_STDCALL)
+            pexp->nCallingConvention == CC_STDCALL)
         {
             fprintf(file, "__stdcall ");
         }
@@ -397,7 +398,7 @@ OutputLine_stub(FILE *file,
     }
     fprintf(file, ");\n");
 
-    if(pexp->nCallingConvention == CCONV_STUB)
+    if(pexp->nCallingConvention == CC_STUB)
     {
         fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName);
     }
@@ -509,8 +510,8 @@ PrintName(FILE *fileDest,
         fprintf(fileDest, "%.*s", nNameLength, pcName);
     }
     else if(fDeco &&
-            ((pexp->nCallingConvention == CCONV_STDCALL) ||
-             (pexp->nCallingConvention == CCONV_FASTCALL)))
+            ((pexp->nCallingConvention == CC_STDCALL) ||
+             (pexp->nCallingConvention == CC_FASTCALL)))
     {
         /* Scan for a dll forwarding dot */
         pcDot = ScanToken(pcName, '.');
@@ -535,9 +536,9 @@ PrintName(FILE *fileDest,
         else
         {
             /* Print the prefix, but skip it for stdcall */
-            if(pexp->nCallingConvention != CCONV_STDCALL)
+            if(pexp->nCallingConvention != CC_STDCALL)
             {
-                fprintf(fileDest, "%c", pexp->nCallingConvention == CCONV_FASTCALL ? '@' : '_');
+                fprintf(fileDest, "%c", pexp->nCallingConvention == CC_FASTCALL ? '@' : '_');
             }
 
             /* Print the name with trailing decoration */
@@ -580,8 +581,8 @@ OutputLine_def(FILE *fileDest,
             /* If the original name was decorated, use decoration in the forwarder as well */
             if((giArch == ARCH_X86) && ScanToken(pexp->strName.buf, '@') &&
                 !ScanToken(pexp->strTarget.buf, '@') &&
-                ((pexp->nCallingConvention == CCONV_STDCALL) ||
-                (pexp->nCallingConvention == CCONV_FASTCALL)) )
+                ((pexp->nCallingConvention == CC_STDCALL) ||
+                (pexp->nCallingConvention == CC_FASTCALL)) )
             {
                 PrintName(fileDest, pexp, &pexp->strTarget, 1);
             }
@@ -592,13 +593,13 @@ OutputLine_def(FILE *fileDest,
             }
         }
     }
-    else if(((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CCONV_STUB)) &&
+    else if(((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) &&
              (pexp->strName.buf[0] == '?'))
     {
         /* C++ stubs are forwarded to C stubs */
         fprintf(fileDest, "=stub_function%d", pexp->nNumber);
     }
-    else if(gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CCONV_STDCALL) &&
+    else if(gbTracing && ((pexp->uFlags & FL_NORELAY) == 0) && (pexp->nCallingConvention == CC_STDCALL) &&
             (pexp->strName.buf[0] != '?'))
     {
         /* Redirect it to the relay-tracing trampoline */
@@ -615,7 +616,7 @@ OutputLine_def(FILE *fileDest,
     {
         fprintf(fileDest, " PRIVATE");
     }
-    else if(pexp->nCallingConvention == CCONV_EXTERN)
+    else if(pexp->nCallingConvention == CC_EXTERN)
     {
         fprintf(fileDest, " DATA");
     }
@@ -797,28 +798,28 @@ ParseFile(char* pcStart,
         /* Now we should get the type */
         if(CompareToken(pc, "stdcall"))
         {
-            exp.nCallingConvention = CCONV_STDCALL;
+            exp.nCallingConvention = CC_STDCALL;
         }
         else if(CompareToken(pc, "cdecl") ||
                  CompareToken(pc, "varargs"))
         {
-            exp.nCallingConvention = CCONV_CDECL;
+            exp.nCallingConvention = CC_CDECL;
         }
         else if(CompareToken(pc, "fastcall"))
         {
-            exp.nCallingConvention = CCONV_FASTCALL;
+            exp.nCallingConvention = CC_FASTCALL;
         }
         else if(CompareToken(pc, "thiscall"))
         {
-            exp.nCallingConvention = CCONV_THISCALL;
+            exp.nCallingConvention = CC_THISCALL;
         }
         else if(CompareToken(pc, "extern"))
         {
-            exp.nCallingConvention = CCONV_EXTERN;
+            exp.nCallingConvention = CC_EXTERN;
         }
         else if(CompareToken(pc, "stub"))
         {
-            exp.nCallingConvention = CCONV_STUB;
+            exp.nCallingConvention = CC_STUB;
         }
         else
         {
@@ -985,8 +986,8 @@ ParseFile(char* pcStart,
 
         /* Handle parameters */
         exp.nStackBytes = 0;
-        if(exp.nCallingConvention != CCONV_EXTERN &&
-           exp.nCallingConvention != CCONV_STUB)
+        if(exp.nCallingConvention != CC_EXTERN &&
+           exp.nCallingConvention != CC_STUB)
         {
             /* Go to next token */
             if(!(pc = NextToken(pc)))
@@ -1068,7 +1069,7 @@ ParseFile(char* pcStart,
         }
 
         /* Handle special stub cases */
-        if(exp.nCallingConvention == CCONV_STUB)
+        if(exp.nCallingConvention == CC_STUB)
         {
             /* Check for c++ mangled name */
             if(pc[0] == '?')
@@ -1092,7 +1093,7 @@ ParseFile(char* pcStart,
                     }
                     exp.nStackBytes = atoi(p + 1);
                     exp.nArgCount =  exp.nStackBytes / 4;
-                    exp.nCallingConvention = CCONV_STDCALL;
+                    exp.nCallingConvention = CC_STDCALL;
                     exp.uFlags |= FL_STUB;
                     for(i = 0; i < exp.nArgCount; i++)
                     {