update

Author: litecreator

.github/workflows/ci.yml

@@ -0,0 +1,53 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        # Repo must contain both xdv-os and dust (e.g. dustlang monorepo)
+
+      - name: Install NASM
+        run: sudo apt-get update && sudo apt-get install -y nasm
+
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Build dust compiler
+        run: |
+          if [ -d dust ]; then
+            cd dust && cargo build --release 2>/dev/null || cargo build
+          else
+            echo "No dust/ in repo; assuming dust is on PATH or will be built by build.sh"
+          fi
+
+      - name: Build xdv-os (dust + NASM)
+        run: |
+          chmod +x xdv-os/src/build.sh
+          ./xdv-os/src/build.sh
+
+      - name: Verify disk image
+        run: |
+          [ -f xdv-os/src/xdv-os.img ] || exit 1
+          ls -la xdv-os/src/xdv-os.img
+          xxd -s 510 xdv-os/src/xdv-os.img -l 2
+
+      - name: Verify components
+        run: |
+          [ -d xdv-os/xdv-boot ] && [ -d xdv-os/xdv-kernel ] && [ -d xdv-os/xdv-runtime ] && \
+          [ -d xdv-os/xdv-shell ] && [ -d xdv-os/xdv-xdvfs ] || exit 1
+          echo "All components present"
+
+      - name: Upload xdv-os.img
+        uses: actions/upload-artifact@v4
+        with:
+          name: xdv-os-img
+          path: xdv-os/src/xdv-os.img

README.md

@@ -1,156 +1,34 @@
 # xdv-os
 
-Complete XDV Operating System - Bootable for VirtualBox
+XDV Operating System integration workspace.
 
-xdv-os is an operating system built with the **Dust Programming Language (DPL)** toolchain. The kernel is **compiled from DPL** using the **dust** compiler; the build loads and validates **xdv-kernel**, **xdv-runtime**, **xdv-shell**, **xdv-boot**, **xdv-xdvfs**, **dustlib**, **dustlib_k**, and **dust_runtime**. The bootable image is produced by: `dust obj kernel_entry.ds --bare-metal` (kernel) plus a minimal MBR in assembly (required by the BIOS).
+## Build
 
-## Overview
+Windows:
 
-xdv-os combines all XDV components into a fully functional operating system that boots in VirtualBox:
-
-- **xdv-boot** - Bootloader (MBR, GDT, IDT, Paging, Disk I/O, XDVFS mount, Kernel load)
-- **xdv-kernel** - 13-sector kernel
-- **xdv-xdvfs** - Native file system
-- **xdv-runtime** - User space runtime
-- **xdv-shell** - Command line shell
-
-## Quick Start
-
-### Build on Linux/Mac
-```bash
-cd src
-chmod +x build.sh
-./build.sh
-```
-
-### Build on Windows
 ```cmd
-cd src
+cd xdv-os\src
 build.bat
 ```
 
-### Run in VirtualBox
-1. Download `xdv-os.img` from CI artifacts
-2. Open VirtualBox
-3. Create new VM: Type=Other, Version=64-bit
-4. Set RAM to 64MB
-5. Add xdv-os.img as hard disk (or use vmkfdimg for live CD)
-6. Start VM
-
-## Boot Process
-
-```
-BIOS -> MBR (0x7C00) -> Load kernel to 0x10000 -> Protected mode -> DPL kernel (VGA output, then halt)
-```
-
-1. **BIOS** loads MBR at 0x7C00
-2. **Boot sector** (assembly) loads the DPL-built kernel from sector 2 to 0x10000, enables protected mode, jumps to kernel
-3. **Kernel** (from `dust obj kernel_entry.ds --bare-metal`) runs at 0x10000: prints boot messages to VGA, then halts
-
-## Expected Boot Output (VirtualBox)
-
-When the OS boots in VirtualBox you should see (then the system halts):
-
-```
-XDV Kernel starting...
-Initializing XDV Kernel v0.2.0
-Build date: 2026-02-12
-Booting on K-Domain (x64/Intel/AMD)
-K-Domain (x64): ONLINE
-XDV: Probing for Q-Domain hardware...
-XDV: Q-Domain hardware not detected - disabled
-XDV: Probing for Phi-Domain hardware...
-XDV: Phi-Domain hardware not detected - disabled
-XDV Kernel: Initializing process management
-Entering kernel main loop
-```
-
-## Memory Layout
+Linux/macOS:
 
+```bash
+cd xdv-os/src
+./build.sh
 ```
-0x00000 - 0x9FFFF   : Real mode memory
-0x07C00             : Boot sector load address
-0x10000 (64KB)      : Kernel load address (0x1000:0)
-0xB8000             : VGA text memory
-0x90000             : Stack
-```
-
-## Components
-
-### xdv-boot
-- MBR boot sector
-- Stage 1 loader
-- GDT, IDT
-- Paging setup
-- Disk I/O
-- Kernel loading
-
-### xdv-kernel (13 sectors)
-1. xdv_boot - Boot integration
-2. xdv_memory - Memory management
-3. xdv_cpu - CPU control
-4. xdv_drivers - Hardware drivers
-5. xdv_kernel - Core kernel
-6. xdv_dal - Device Abstraction Layer
-7. xdv_qdomain - Q-Domain support (stubbed)
-8. xdv_phidomain - Φ-Domain support (stubbed)
-9. xdv_cds - Core Data Structures
-10. xdv_umf - User Mode Facilities
-11. xdv_hypervisor - Hypervisor support
-12. xdv_sdbm - Simple Database Manager
-13. xdv_odt - Object Dispatch Table
-
-### xdv-xdvfs
-- Superblock, Inodes, Block allocation
-- Directory operations
-- File operations (K-domain only)
-
-### xdv-runtime
-- I/O, Memory, String, Process
-- Scheduler, FS interface, Console, Init
-
-### xdv-shell
-- Lexer, Parser, Executor
-- Builtins: cd, ls, cat, mkdir, rm, echo, ps, help, exit
-- Tab completion
-
-## Architecture
-
-K-Domain only (classical x86-64 hardware). Q/Φ domains stubbed.
-
-## Directory Structure
-
-```
-xdv-os/
-├── State.toml
-├── src/
-│   ├── boot_sector.asm   # MBR (loads kernel, switches to protected mode)
-│   ├── kernel_entry.ds   # DPL kernel entry (dust obj --bare-metal -> kernel.bin)
-│   ├── build.sh          # Linux/Mac build (dust + NASM -> xdv-os.img)
-│   └── build.bat         # Windows build
-├── xdv-boot/
-├── xdv-kernel/
-├── xdv-xdvfs/
-├── xdv-runtime/
-├── xdv-shell/
-└── .github/workflows/
-    └── ci.yml            # Builds xdv-os.img with dust
-```
-
-## Build (dust + NASM)
-
-The build uses the **dust** compiler and validates all DPL components:
 
-1. **dust** compiler: built from repo root `dust/` if not in PATH
-2. **dust check** on: dustlib, dustlib_k, dust_runtime, xdv-boot, xdv-kernel, xdv-runtime, xdv-shell, xdv-xdvfs
-3. **dust obj** `kernel_entry.ds` **--bare-metal** → `kernel.bin` (32-bit code, VGA output)
-4. **NASM** assembles `boot_sector.asm` → MBR
-5. Image: 1 MB disk with MBR + kernel at sector 2
+## Artifacts
 
-## CI Build
+The build now emits partitioned 64MB disk images:
 
-GitHub Actions: build dust, run full build (dust obj + NASM), produce `xdv-os.img` artifact.
+- `xdv-os/src/xdv-os-mbr-64m.img` - BIOS/MBR boot image.
+- `xdv-os/src/xdv-os-uefi-64m.img` - GPT image with ESP and xdvfs partition.
+- `xdv-os/src/xdv-os.img` - compatibility alias to the MBR image.
 
-## Version
+## Image Contents
 
-0.2.0
+- `xdv-boot` boot path metadata and BIOS stage machine code.
+- `xdv-kernel` + `xdv-runtime` combined bare-metal kernel binary.
+- `xdvfs` superblock and layout markers.
+- preload payload with `xdv-core`, `xdv-edx`, and `xdv-shell`.

src/boot_sector.asm

@@ -1,9 +1,16 @@
-; XDV OS boot sector (MBR style).
-; Loads kernel from sector 2, enters protected mode, jumps to 0x10000.
+; XDV OS boot sector (MBR style, partition-aware).
+; Loads the kernel from the active partition:
+;   absolute_lba = partition_start_lba + KERNEL_REL_LBA
+; Then enters protected mode and jumps to 0x10000.
 
 [ORG 0x7C00]
 [BITS 16]
 
+KERNEL_REL_LBA  equ 32
+KERNEL_SECTORS  equ 128
+KERNEL_LOAD_SEG equ 0x1000
+KERNEL_LOAD_OFF equ 0x0000
+
     jmp short start
     nop
 
@@ -16,23 +23,41 @@ start:
     mov sp, 0x7C00
     mov [boot_drive], dl
 
-    ; Reset disk.
-    xor ah, ah
+    ; Require INT13 extensions for LBA reads.
+    mov ah, 0x41
+    mov bx, 0x55AA
+    mov dl, [boot_drive]
     int 0x13
     jc disk_error
+    cmp bx, 0xAA55
+    jne disk_error
+    test cx, 0x0001
+    jz disk_error
 
-    ; Read kernel from CHS 0/0/3 into 0x1000:0000 (physical 0x10000).
-    ; build.{bat,sh} writes kernel.bin at LBA 2 (offset 1024), which is sector 3 in CHS.
-    ; 8 sectors is enough for current kernel.bin and stays in track.
-    mov ax, 0x1000
-    mov es, ax
-    xor bx, bx
-    mov ah, 0x02
-    mov al, 0x08
-    mov ch, 0x00
-    mov cl, 0x03
-    mov dh, 0x00
+    ; Prefer active partition; fallback to partition entry 0.
+    mov si, partition_table
+    mov cx, 4
+.find_active:
+    cmp byte [si], 0x80
+    je .active_found
+    add si, 16
+    loop .find_active
+    mov si, partition_table
+
+.active_found:
+    ; Partition start LBA is +8 in a 16-byte MBR partition entry.
+    mov eax, [si + 8]
+    add eax, KERNEL_REL_LBA
+    mov [dap_lba_low], eax
+    mov dword [dap_lba_high], 0
+
+    mov word [dap_count], KERNEL_SECTORS
+    mov word [dap_offset], KERNEL_LOAD_OFF
+    mov word [dap_segment], KERNEL_LOAD_SEG
+
+    mov si, disk_address_packet
     mov dl, [boot_drive]
+    mov ah, 0x42
     int 0x13
     jc disk_error
 
@@ -67,7 +92,23 @@ print16:
     ret
 
 boot_drive db 0x80
-err_msg db 'BOOTERR', 0
+
+; INT13 extended read packet (16 bytes).
+disk_address_packet:
+    db 0x10
+    db 0x00
+dap_count:
+    dw 0
+dap_offset:
+    dw 0
+dap_segment:
+    dw 0
+dap_lba_low:
+    dd 0
+dap_lba_high:
+    dd 0
+
+err_msg db 'XDVBOOT ERR', 0
 
 ; Protected mode descriptors.
 gdt:
@@ -95,5 +136,6 @@ protected_mode_entry:
 [BITS 16]
 ; MBR sector layout: boot code (0..445), partition table (446..509), signature.
 times 446 - ($ - $$) db 0
+partition_table:
 times 64 db 0
 dw 0xAA55

src/boot_sector.bin

@@ -3,7 +3,11 @@ REM xdv-os build pipeline:
 REM - validates one compileable integration entry per required subsystem
 REM - builds a bare-metal kernel binary from a composed source bundle:
 REM   xdv-runtime/src/runtime_bridge.ds + xdv-kernel/sector/xdv_kernel/src/kernel.ds
-REM - assembles MBR boot sector and packs xdv-os.img
+REM - assembles MBR boot sector
+REM - generates partitioned 64MB images:
+REM     xdv-os-mbr-64m.img (MBR)
+REM     xdv-os-uefi-64m.img (GPT/ESP + xdvfs)
+REM   and xdv-os.img as alias to the MBR artifact
 
 goto :main
 
@@ -68,6 +72,8 @@ if not defined DUST_CMD (
 )
 
 echo [1/4] Validating required subsystem entrypoints...
+call :check_file "%REPO_ROOT%\xdv-boot\src\boot_mbr.ds" || exit /b 1
+call :check_file "%REPO_ROOT%\xdv-boot\src\boot_uefi.ds" || exit /b 1
 call :check_file "%REPO_ROOT%\xdv-boot\src\boot_stage1.ds" || exit /b 1
 call :check_file "%KERNEL_SRC%" || exit /b 1
 call :check_file "%REPO_ROOT%\xdv-xdvfs\src\xdvfs_mount.ds" || exit /b 1
@@ -131,28 +137,24 @@ if %ERRORLEVEL% neq 0 (
     exit /b 1
 )
 
-echo [4/4] Creating disk image...
-powershell -NoProfile -Command ^
-  "$img = New-Object byte[] 1048576; " ^
-  "$boot = [System.IO.File]::ReadAllBytes('boot_sector.bin'); " ^
-  "$kern = [System.IO.File]::ReadAllBytes('kernel.bin'); " ^
-  "[Array]::Copy($boot, 0, $img, 0, $boot.Length); " ^
-  "[Array]::Copy($kern, 0, $img, 1024, $kern.Length); " ^
-  "[System.IO.File]::WriteAllBytes('xdv-os.img', $img)"
+echo [4/4] Creating 64MB partitioned images...
+powershell -NoProfile -ExecutionPolicy Bypass -File build_images.ps1 ^
+  -BootSectorPath "boot_sector.bin" ^
+  -KernelPath "kernel.bin" ^
+  -RepoRoot "%REPO_ROOT%" ^
+  -OutputDir "%~dp0." ^
+  -ImageSizeMB 64
 if %ERRORLEVEL% neq 0 (
-    echo ERROR: Failed to create image
+    echo ERROR: Failed to create partitioned images
     exit /b 1
 )
 
-REM Set boot flag and partition type
-powershell -NoProfile -Command ^
-  "$f = [System.IO.File]::Open('xdv-os.img', [System.IO.FileMode]::Open, [System.IO.FileAccess]::ReadWrite, [System.IO.FileShare]::None); " ^
-  "$f.Seek(446, [System.IO.SeekOrigin]::Begin); $f.WriteByte(0x80); " ^
-  "$f.Seek(450, [System.IO.SeekOrigin]::Begin); $f.WriteByte(0x83); $f.Close()"
-
 echo.
 echo === Build complete ===
-echo   Output: %~dp0xdv-os.img
-echo   Run in VirtualBox: Other/64-bit, 64MB RAM, attach xdv-os.img as disk.
+echo   Output (MBR):  %~dp0xdv-os-mbr-64m.img
+echo   Output (UEFI): %~dp0xdv-os-uefi-64m.img
+echo   Alias:         %~dp0xdv-os.img
+echo   VirtualBox BIOS: attach xdv-os-mbr-64m.img (or xdv-os.img)
+echo   VirtualBox UEFI: enable EFI and attach xdv-os-uefi-64m.img
 echo.
 exit /b 0