Merge branch 'master' into network-loopback

.gitignore

@@ -1,6 +1,18 @@
 *.BIN
+*.bin
 *.ZXE
 *.MAP
 src/Boot/
-docs/Boot/
+*.ELF
-ZealOS-*.iso
+*.elf
+*.sys
+*.SYS
+src/EFI/
+build/limine
+build/ovmf
+*.iso
+*.raw
+*.hdd
+*.o
+*.d
+zealbooter/limine.h

README.md

@@ -16,6 +16,7 @@ Features in development include:
   - [32-bit color VBE graphics](https://github.com/TempleProgramming/HolyGL)
   - Fully-functional AHCI support
   - Network card drivers and a networking stack
+  - UEFI booting via [BSD2-licensed Limine bootloader](https://github.com/limine-bootloader/limine) and [Public Domain ZealBooter prekernel](/zealbooter/zealbooter.c)
 
 [Changes include](https://zeal-operating-system.github.io/Doc/ChangeLog.DD.html):
   - 60 FPS
@@ -51,7 +52,7 @@ In July of 2021, ZealOS was forked from ZenithOS.
 
 ## Screenshots
 
-Network Report, UDP Chat Application and AutoComplete, with Stars wallpaper
+Network Report, Gopher Client, FTP Client, GrDir, and AutoComplete, with Stars wallpaper
 
 ![](/screenshots/screenshot3.png)
 

build/build-iso.ps1

@@ -49,29 +49,33 @@ function Unmount-TempDisk
 
 Write-Output "Making temp vdisk, running auto-install..."
 
-qemu-img create -f vhdx $TMPDISK 512M
+qemu-img create -f vhdx $TMPDISK 1024M
 fsutil sparse setflag $TMPDISK 0
 fsutil sparse queryflag $TMPDISK 
 qemu-system-x86_64 -machine q35,accel=whpx,kernel-irqchip=off -drive format=vhdx,file=$TMPDISK -m 2G -rtc base=localtime -cdrom AUTO.ISO -device isa-debug-exit
 
+Write-Output "Copying all src/ code into vdisk Tmp/OSBuild/ ..."
+
 Remove-Item "..\src\Home\Registry.ZC" -errorAction SilentlyContinue
 Remove-Item "..\src\Home\MakeHome.ZC" -errorAction SilentlyContinue
+Remove-Item "..\src\Boot\Kernel.ZXE" -errorAction SilentlyContinue
 Mount-TempDisk
-
+New-Item -Path "${QEMULETTER}:\Tmp\" -Name "OSBuild" -ItemType "directory"
-Copy-Item -Path "..\src\*" -Destination "${QEMULETTER}:\" -Recurse -Force
+Copy-Item -Path "..\src\*" -Destination "${QEMULETTER}:\Tmp\OSBuild\" -Recurse -Force
 Unmount-TempDisk
 
-Write-Output "Generating ISO..."
+Write-Output "Rebuilding kernel headers, kernel, OS, and building Distro ISO ..."
+
 qemu-system-x86_64 -machine q35,accel=whpx,kernel-irqchip=off -drive format=vhdx,file=$TMPDISK -m 2G -rtc base=localtime -device isa-debug-exit
+
 Write-Output "Extracting ISO from vdisk..."
+
 Remove-Item "ZealOS-*.iso" -errorAction SilentlyContinue
 Mount-TempDisk
-
+$ZEALISO = "ZealOS-PublicDomain-BIOS-" + (Get-Date -Format "yyyy-MM-dd-HH_mm_ss").toString() + ".iso"
-$ZEALISO = "ZealOS-" + (Get-Date -Format "yyyy-MM-dd-HH_mm_ss").toString() + ".iso"
+Copy-Item "${QEMULETTER}:\Tmp\MyDistro.ISO.C" -Destination $ZEALISO 
-
-Copy-Item "${QEMULETTER}:\Tmp\MyDistro.ISO.C" -Destination $ZEALISO
 Unmount-TempDisk
 
 Remove-Item $TMPDISK
 Write-Output "Finished."
-Get-ChildItem "ZealOS*.iso"
+Get-ChildItem "ZealOS*.iso"

build/build-iso.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Build Distro ISO using AUTO.ISO minimal auto-install as bootstrap to merge codebase, recompile system, and export ISO
+# Build OS using AUTO.ISO minimal auto-install as bootstrap to merge codebase, recompile system, attempt build limine UEFI hybrid ISO
 
 # make sure we are in the correct directory
 SCRIPT_DIR=$(realpath "$(dirname "$0")")
@@ -16,7 +16,11 @@ fi
 # Uncomment if you use doas instead of sudo
 #alias sudo=doas 
 
+# Set this true if you want to test ISOs in QEMU after building.
+TESTING=false
+
 TMPDIR="/tmp/zealtmp"
+TMPISODIR="$TMPDIR/iso"
 TMPDISK="$TMPDIR/ZealOS.raw"
 TMPMOUNT="$TMPDIR/mnt"
 
@@ -34,29 +38,116 @@ umount_tempdisk() {
 }
 
 [ ! -d $TMPMOUNT ] && mkdir -p $TMPMOUNT
+[ ! -d $TMPISODIR ] && mkdir -p $TMPISODIR
 
-echo "Making temp vdisk, running auto-install..."
+set -e
-qemu-img create -f raw $TMPDISK 192M
+echo "Building ZealBooter..."
-qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -cdrom AUTO.ISO -device isa-debug-exit
+( cd ../zealbooter && make distclean all || echo "ERROR: ZealBooter build failed !")
+set +e
 
-echo "Mounting vdisk and copying src/..."
+echo "Making temp vdisk, running auto-install ..."
+qemu-img create -f raw $TMPDISK 1024M
+qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -cdrom AUTO.ISO -device isa-debug-exit
+
+echo "Copying all src/ code into vdisk Tmp/OSBuild/ ..."
 rm ../src/Home/Registry.ZC 2> /dev/null
 rm ../src/Home/MakeHome.ZC 2> /dev/null
+rm ../src/Boot/Kernel.ZXE 2> /dev/null
 mount_tempdisk
-sudo cp -r ../src/* $TMPMOUNT
+sudo mkdir $TMPMOUNT/Tmp/OSBuild/
+sudo cp -r ../src/* $TMPMOUNT/Tmp/OSBuild
 umount_tempdisk
 
-echo "Generating ISO..."
+echo "Rebuilding kernel headers, kernel, OS, and building Distro ISO ..."
-qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -device isa-debug-exit
+qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -device isa-debug-exit
+
+LIMINE_BINARY_BRANCH="v4.x-branch-binary"
+
+if [ -d "limine" ]
+then
+	cd limine
+	git remote set-branches origin $LIMINE_BINARY_BRANCH
+	git fetch
+	git remote set-head origin $LIMINE_BINARY_BRANCH
+	git switch $LIMINE_BINARY_BRANCH
+	git pull
+	rm limine-deploy
+	rm limine-version
+
+	cd ..
+fi
+if [ ! -d "limine" ]; then
+    git clone https://github.com/limine-bootloader/limine.git --branch=$LIMINE_BINARY_BRANCH --depth=1
+fi
+make -C limine
+
+touch limine/Limine-HDD.HH
+echo "/*\$WW,1\$" > limine/Limine-HDD.HH
+cat limine/LICENSE.md >> limine/Limine-HDD.HH
+echo "*/\$WW,0\$" >> limine/Limine-HDD.HH
+cat limine/limine-hdd.h >> limine/Limine-HDD.HH
+sed -i 's/const uint8_t/U8/g' limine/Limine-HDD.HH
+sed -i "s/\[\]/\[$(grep -o "0x" ./limine/limine-hdd.h | wc -l)\]/g" limine/Limine-HDD.HH
 
-echo "Extracting ISO from vdisk..."
-rm ./ZealOS-*.iso 2> /dev/null # comment this line if you want lingering old ISOs
 mount_tempdisk
-cp $TMPMOUNT/Tmp/MyDistro.ISO.C ./ZealOS-$(date +%Y-%m-%d-%H_%M_%S).iso 
+echo "Extracting MyDistro ISO from vdisk ..."
+cp $TMPMOUNT/Tmp/MyDistro.ISO.C ./ZealOS-MyDistro.iso
+sudo rm $TMPMOUNT/Tmp/MyDistro.ISO.C 2> /dev/null
+echo "Setting up temp ISO directory contents for use with limine xorriso command ..."
+sudo cp -rf $TMPMOUNT/* $TMPISODIR
+sudo rm $TMPISODIR/Boot/OldMBR.BIN 2> /dev/null
+sudo rm $TMPISODIR/Boot/BootMHD2.BIN 2> /dev/null
+sudo mkdir -p $TMPISODIR/EFI/BOOT
+sudo cp limine/Limine-HDD.HH $TMPISODIR/Boot/Limine-HDD.HH
+sudo cp limine/BOOTX64.EFI $TMPISODIR/EFI/BOOT/BOOTX64.EFI
+sudo cp limine/limine-cd-efi.bin $TMPISODIR/Boot/Limine-CD-EFI.BIN
+sudo cp limine/limine-cd.bin $TMPISODIR/Boot/Limine-CD.BIN
+sudo cp limine/limine.sys $TMPISODIR/Boot/Limine.SYS
+sudo cp ../zealbooter/zealbooter.elf $TMPISODIR/Boot/ZealBooter.ELF
+sudo cp ../zealbooter/Limine.CFG $TMPISODIR/Boot/Limine.CFG
+echo "Copying DVDKernel.ZXE over ISO Boot/Kernel.ZXE ..."
+sudo mv $TMPMOUNT/Tmp/DVDKernel.ZXE $TMPISODIR/Boot/Kernel.ZXE
+sudo rm $TMPISODIR/Tmp/DVDKernel.ZXE 2> /dev/null
 umount_tempdisk
 
-echo "Deleting temp folder..."
+xorriso -joliet "on" -rockridge "on" -as mkisofs -b Boot/Limine-CD.BIN \
-rm -rf $TMPDIR
+        -no-emul-boot -boot-load-size 4 -boot-info-table \
+        --efi-boot Boot/Limine-CD-EFI.BIN \
+        -efi-boot-part --efi-boot-image --protective-msdos-label \
+        $TMPISODIR -o ZealOS-limine.iso
+
+./limine/limine-deploy ZealOS-limine.iso
+
+if [ "$TESTING" = true ]; then
+	if [ ! -d "ovmf" ]; then
+	    echo "Downloading OVMF..."
+	    mkdir ovmf
+	    cd ovmf
+	    curl -o OVMF-X64.zip https://efi.akeo.ie/OVMF/OVMF-X64.zip
+	    7z x OVMF-X64.zip
+	    cd ..
+	fi
+	echo "Testing limine-zealbooter-xorriso isohybrid boot in UEFI mode ..."
+	qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -bios ovmf/OVMF.fd -smp 4 -cdrom ZealOS-limine.iso
+	echo "Testing limine-zealbooter-xorriso isohybrid boot in BIOS mode ..."
+	qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -smp 4 -cdrom ZealOS-limine.iso
+	echo "Testing native ZealC MyDistro legacy ISO in BIOS mode ..."
+	qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -smp 4 -cdrom ZealOS-MyDistro.iso
+fi
+
+# comment these 2 lines if you want lingering old Distro ISOs
+rm ./ZealOS-PublicDomain-BIOS-*.iso 2> /dev/null
+rm ./ZealOS-BSD2-UEFI-*.iso 2> /dev/null
+
+mv ./ZealOS-MyDistro.iso ./ZealOS-PublicDomain-BIOS-$(date +%Y-%m-%d-%H_%M_%S).iso
+mv ./ZealOS-limine.iso ./ZealOS-BSD2-UEFI-$(date +%Y-%m-%d-%H_%M_%S).iso
+
+echo "Deleting temp folder ..."
+sudo rm -rf $TMPDIR
+sudo rm -rf $TMPISODIR
 echo "Finished."
-ls -lh ZealOS-*.iso
+echo
-
+echo "ISOs built:"
+ls | grep ZealOS-P
+ls | grep ZealOS-B
+echo

src/Demo/AcctExample/TOS/TOSConfig.ZC

@@ -52,8 +52,8 @@ U0 TOSInit()
 #define CONFIG_OPTS 		"MountAHCIAuto\nCT\n"
 #define CONFIG_DEBUG_OPTS	"MountAHCIAuto\nCTHeapInit\n130\nMemInit\n131\nVarInit\n132\n\n"
 #define CONFIG_DEBUGZ_OPTS	"MountAHCIAuto\nCTHeapInit\n0\nMemInit\n0\nVarInit\n0\n\n"
-#define TOS_CONFIG			"\n" CONFIG_RAM_DRIVES CONFIG_DVD_DRIVES CONFIG_HARD_DRIVES "\n1024\n768\n" CONFIG_DISK_CACHE CONFIG_OPTS
+#define TOS_CONFIG			"\n" CONFIG_RAM_DRIVES CONFIG_DVD_DRIVES CONFIG_HARD_DRIVES "\n" CONFIG_DISK_CACHE CONFIG_OPTS
-#define TOS_DVD_CONFIG		"TB\n0x20000\nT \n\n1024\n768\n\nMountAHCIAuto\nCT\n"
+#define TOS_DVD_CONFIG		"TB\n0x20000\nT\n\n\nMountAHCIAuto\nCT\n"
 
 #define TOS_DVD_DEBUG_CONFIG "A" CONFIG_DEBUG_DISTRO\
 							 "B\nScale2Mem(2048,0x40000)\n\n\n"\

src/Doc/ChangeLog.DD

@@ -1,4 +1,35 @@
 $WW,1$$FG,5$$TX+CX,"ChangeLog"$$FG$
+$IV,1$----11/02/22 20:26:55----$IV,0$
+* Raised version number to 2.00.
+* Updated the $LK,"Charter",A="FI:::/Doc/Charter.DD"$ to allow non-Public-Domain MBR/UEFI bootloaders, as long as the Public Domain ZealOS HDD/DVD Boot Loaders are included, offered, and functional. The Charter upholds that all operating system code must still be 100% public domain. Updated $LK+PU,"Credits",A="FI:::/Doc/Credits.DD"$, $LK+PU,"FAQ",A="FI:::/Doc/FAQ.DD"$, $LK+PU,"Features.DD",A="FI:::/Doc/Features.DD"$, $LK+PU,"Welcome.DD",A="FI:::/Doc/Welcome.DD"$.
+* Added 128-bit signature to $LK+PU,"KStart32",A="FF:::/Kernel/KStart32.ZC,JMP @@02"$ to allow for booting the ZealOS Kernel.ZXE from 32-bit mode via a prekernel booted from any other bootloader. The signature is jumped over with JMP if booted from the Public Domain ZealOS Boot Loaders to KStart16 to KStart32.
+* Created external Public Domain "ZealBooter" prekernel written in C, for use with booting Kernel.ZXE from other bootloaders, primarily targeting Limine. ZealBooter compiles to an ELF file that Limine boots into and passes boot-time information to, which ZealBooter then uses to boot into and pass information to the Kernel.ZXE kernel header.
+* Implemented Limine bootloader install prompt to $LK+PU,"OSInstall",A="FI:::/Misc/OSInstall.ZC"$. Created $LK+PU,"LimineCFGMake and LimineMHDIns",A="FI:::/System/Boot/LimineMHDIns.ZC"$ to allow for installing Limine to MBR, and for generating the Limine.CFG file required. 
+* Added ";*.CFG*" to $LK+PU,"FILEMASK_TXT",A="MN:FILEMASK_TXT"$
+* Added Kernel header fields $LK+PU,"SYS_FRAMEBUFFER_ADDR",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_ADDR"$, $LK+PU,"SYS_FRAMEBUFFER_WIDTH",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_WIDTH"$, $LK+PU,"SYS_FRAMEBUFFER_HEIGHT",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_HEIGHT"$, $LK+PU,"SYS_FRAMEBUFFER_PITCH",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_PITCH"$, $LK+PU,"SYS_FRAMEBUFFER_BPP",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_BPP"$, $LK+PU,"SYS_SMBIOS_ENTRY",A="FF:::/Kernel/KStart16.ZC,SYS_SMBIOS_ENTRY"$, $LK+PU,"SYS_DISK_UUID",A="FF:::/Kernel/KStart16.ZC,SYS_DISK_UUID"$, $LK+PU,"SYS_BOOT_STACK",A="FF:::/Kernel/KStart16.ZC,SYS_BOOT_STACK"$, $LK+PU,"SYS_IS_UEFI_BOOTED",A="FF:::/Kernel/KStart16.ZC,SYS_IS_UEFI_BOOTED"$, $LK+PU,"SYS_FRAMEBUFFER_LIST",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_LIST"$.
+	- Updated $LK+PU,"CKernel",A="MN:CKernel"$ class struct to match $LK+PU,"SYS_KERNEL",A="MN:SYS_KERNEL"$ changes by adding fields: sys_framebuffer_addr, sys_framebuffer_width, sys_framebuffer_height, sys_framebuffer_pitch, sys_framebuffer_bpp, sys_smbios_entry, sys_disk_uuid, sys_boot_stack, sys_is_uefi_booted, sys_framebuffer_list.
+	- Added externs for these to $LK+PU,"KernelB.HH",A="FF:::/Kernel/KernelB.HH,Framebuffer"$.
+	- Removed externs for sys_vbe_info, sys_vbe_final_mode, sys_vbe_mode_num, sys_vbe_modes. Changed all code previously using sys_vbe_mode to $MA-X+PU,"instead use framebuffer externs",LM="Find(\"sys_framebuffer_\", \"::/\");View;"$.
+	- Moved SYS_VBE_INFO and SYS_VBE_FINAL_MODE_NUM out of the Kernel header, renamed to $LK+PU,"VBE_INFO",A="FF:::/Kernel/KStart16.ZC,VBE_INFO"$ and $LK+PU,"VBE_FINAL_MODE_NUM",A="FF:::/Kernel/KStart16.ZC,VBE_FINAL_MODE_NUM"$.
+	- Replaced SYS_VBE_MODES with $LK+PU,"SYS_FRAMEBUFFER_LIST",A="FF:::/Kernel/KStart16.ZC,SYS_FRAMEBUFFER_LIST"$, changed KStart16 $LK+PU,"VBE Mode iteration",A="FF:::/Kernel/KStart16.ZC,height[DX]"$ to put VBE Mode values into this list.
+	- Removed SYS_VBE_FINAL_MODE.
+	- Removed compile-time StreamPrint-ed SCREEN_WIDTH and SCREEN_HEIGHT with $LK+PU,"REQUESTED_SCREEN_WIDTH",A="FF:::/Kernel/KStart16.ZC,REQUESTED_SCREEN_WIDTH"$ and $LK+PU,"REQUESTED_SCREEN_HEIGHT",A="FF:::/Kernel/KStart16.ZC,REQUESTED_SCREEN_HEIGHT"$, and removed resolution In() strings from all DoDistro related files and define values. By default, ZealOS will always try to look for and use a VBE mode with 1024x768 screen resolution. These can be changed to request a different screen resolution from the VBE Mode list returned from the BIOS. The Kernel must still be recompiled with $LK+PU,"BootHDIns",A="MN:BootHDIns"$ to make changes to these variables take effect.
+	- Removed MAX_VBE_MODE and MAX_SCREEN_HEIGHT, replaced with $LK+PU,"VBE_STD_MODE_NUM",A="FF:::/Kernel/KStart16.ZC,VBE_STD_MODE_NUM"$ which gets set to the VBE mode that has a 1024x768 resolution, to use as a fallback mode if the requested resolution isn't available.
+	- Changed $LK+PU,"KStart32 temp stack",A="FF:::/Kernel/KStart32.ZC,SYS_BOOT_STACK"$ to use new $LK+PU,"SYS_BOOT_STACK",A="FF:::/Kernel/KStart16.ZC,SYS_BOOT_STACK"$ kernel header variable, rather than hardcoded constant value. Default value is $LK+PU,"BOOT_RAM_LIMIT",A="MN:BOOT_RAM_LIMIT"$, same as what it was previously hardcoded to.
+	- Changed $LK+PU,"KStart64 boot stack PUSH",A="FF:::/Kernel/KStart64.ZC,SYS_BOOT_STACK"$ from hardcoded value to use value stored in new $LK+PU,"SYS_BOOT_STACK",A="FF:::/Kernel/KStart16.ZC,SYS_BOOT_STACK"$ header field.
+* Alter $LK+PU,"VideoRep",A="MN:VideoRep"$ to use new externs, removed lines reporting information no longer acquired by the kernel; added aspect ratio calculation and reporting.
+* Raised $LK+PU,"MEM_E820_ENTRIES_NUM",A="MN:MEM_E820_ENTRIES_NUM"$ from 48 to 256.
+* Replaced CVBEModeShort with $LK+PU,"CVideoInfo",A="MN:CVideoInfo"$.
+* Implemented $LK+PU,"PCIBt",A="MN:PCIBt"$, $LK+PU,"PCIBts",A="MN:PCIBts"$, $LK+PU,"PCIBtr",A="MN:PCIBtr"$ due to bare-metal testing of PCI drivers demonstrating undefined behaviour when accessing memory-mapped IO areas using the standard API $LK+PU,"Bt",A="MN:Bt"$, $LK+PU,"Bts",A="MN:Bts"$, $LK+PU,"Btr",A="MN:Btr"$. Replaced all Bt/Bts/Btr calls with PCIBt/PCIBts/PCIBtr in AHCI code, as well as all networking drivers and auxiliary code accessing AHCI memory-mapped variables. Added externs for new PCI bit test functions to $LK+PU,"KernelC.HH",A="FF:::/Kernel/KernelC.HH,PCIBt("$.
+* Changed $LK+PU,"gr.continuous_scroll",A="FF:::/System/Gr/GrGlobals.ZC,continuous_scroll"$ to TRUE in $LK+PU,"HomeLocalize",A="FI:::/Home/HomeLocalize.ZC"$.
+* Add simple progress indicator to $LK+PU,"CopySingle",A="FF:::/Kernel/BlkDev/DiskCopy.ZC,jiffies > time"$ that progress as a percentage every 2 seconds.
+* Replace SYS_FONT_PTR VGA ROM 16-bit mode aux font retrieval with $LK+PU,"FontAux",A="FI:::/Kernel/FontAux.ZC"$.
+* Lowered $LK+PU,"PTR_STARS_NUM",A="MN:PTR_STARS_NUM"$ from 4 to 3.
+* Moved $LK+PU,"PCILookUpSingle",A="MN:PCILookUpSingle"$ out of System/DevInfo.ZC to new file $LK+PU,"System/PCILookUpSingle.ZC",A="FI:::/System/PCILookUpSingle.ZC"$. Added including this file to $LK+PU,"MakeSystem",A="FF:::/System/MakeSystem.ZC,PCILook"$. This change makes it simpler to change and update the PCI device list text file parsing behaviour for modern PCI device lists.
+* Removed VGAM_GRAPHICS, text.vga_alias, and all code/documentation referencing them or legacy VGA graphics.  MiniGrLib now needs a complete rewrite.
+* Added $LK+PU,"DF_KEEP_FLAGS",A="MN:DF_KEEP_FLAGS"$ and corresponding logic to $LK+PU,"Diff",A="FF:::/System/Utils/Diff.ZC,& DF_KEEP_FLAGS"$.
+* Changed $LK+PU,"BootMHDOldRead",A="MN:BootMHDOldRead"$ to take optional size argument, and changed $LK+PU,"BootMHDOldWrite",A="MN:BootMHDOldWrite"$ to use the OldMBR.BIN filesize to determine how many blocks to write. Used in $LK+PU,"LimineMHDIns",A="FF:::/System/Boot/LimineMHDIns.ZC,LimineMHDIns("$ to backup the MBR and post-MBR-gap to OldMBR.BIN.
+
 $IV,1$----04/16/22 20:24:18----$IV,0$
 * Inverted $LK+PU,"DocBorderNew",A="MN:DocBorderNew"$ and $LK+PU,"DocEd",A="MN:DocEd"$ bottom-right window text, adjusted DolDoc tag placement to make solid, changed Ed callbacks ($LK+PU,"EdOverStrikeCB",A="MN:EdOverStrikeCB"$, $LK+PU,"EdAutoSaveCB",A="MN:EdAutoSaveCB"$, $LK+PU,"EdFilterCB",A="MN:EdFilterCB"$, $LK+PU,"EdDollarCB",A="MN:EdDollarCB"$, $LK+PU,"EdMoreCB",A="MN:EdMoreCB"$) to return ' ' SPACE character(s) for disabled flags now since invert renders it solid foreground color, appended ' ' SPACE character at $LK+PU,"EdDollarTypeCB",A="FF:::/System/DolDoc/DocEd.ZC,\"%-3ts \""$ to pad.
 

src/Doc/Charter.DD

@@ -1,12 +1,13 @@
+
 $FG,5$$WW,1$$TX+CX,"ZealOS Charter"$$FG$
 
 * The vision is the same usage model and niche as the Commodore 64 -- a simple machine where programming was the goal, not just a means to an end.  However, it is modern, 64-bit and $FG,2$multi-cored$FG$.  It is special purpose, not general purpose, so some things it will not do.  Also, it's a kayak, not a Titanic. The priority is $FG,2$user developers$FG$, not $FG,2$3rd party developers$FG$.
 
 * $FG,4$We don't think twice about breaking compatibility. $FG$ We do not put any hooks for future changes.  "Perfect" means we always act as though it is final, for all time.  Microsoft allowed the $FG,2$$TX,"Windows BMP",HTML="http://en.wikipedia.org/wiki/BMP_file"$$FG$ file format to adapt to the future and it became grotesque.
 
-* Low line count and code complexity is the highest good, so it is easy to learn the whole thing.  Users should see the light at the end of the tunnel.  One file system, for example, is better than many file systems.
+* Low line count and low code complexity is the highest good, so it is easy to learn the whole thing.  Users should see the light at the end of the tunnel.
 
-* There is a limit of 100,000 lines of code for all time, not including applications and demos. Currently, there are $TX,"98,216",D="DD_ZEALOS_LOC"$ lines of code.  $FG,4$3rd party libraries are banned$FG$ because they circumvent the intent of this limit.  The vision is a Commodore 64 ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell that is no longer blissful.
+* There is a limit of 100,000 lines of code for all time, not including applications and demos. Currently, there are $TX,"98,661",D="DD_ZEALOS_LOC"$ lines of code.  $FG,4$3rd party libraries are banned from being required$FG$ because they circumvent the intent of this limit.  The vision is a Commodore 64 ROM -- a fixed core API that is the only dependency of applications. Dependency on components and libraries creates a hell that is no longer blissful.
 
 * The primary metric for resolving all ZealOS code governance issues is how fast the compiler compiles itself and the kernel with $LK,"BootHDIns",A="MN:BootHDIns"$(). The secondary metric is how understandable the code is. The $LK,"ZealC",A="FI:::/Doc/ZealC.DD"$ language should be changed to optimize these metrics, as Terry Davis did when he changed type casting from prefix to $LK+PU,"postfix",A="FF:::/Doc/ZealC.DD,postfix"$.
  
@@ -14,7 +15,7 @@ $FG,5$$WW,1$$TX+CX,"ZealOS Charter"$$FG$
 
 * It is for one platform -- $FG,4$$TX,"x86_64",HTML="http://en.wikipedia.org/wiki/Amd64#AMD64"$$FG$ desktop PC compatibles, more like super-computers than battery efficient wimpy mobiles.
 
-* One driver for each class of device. Limited exceptions are allowed. With divergent device capabilities, it is a nightmare for user applications and what is gained? 
+* One driver for each class of device. The only exceptions are networking, sound, and keyboard/mouse. With divergent device capabilities, it is a nightmare for user applications and what is gained? 
 
 * $FG,2$Ring-0-only$FG$.	Everything runs in kernel mode, including user applications.
 
@@ -26,13 +27,15 @@ $FG,5$$WW,1$$TX+CX,"ZealOS Charter"$$FG$
 
 * $FG,2$Single-address-map$FG$ as though paging is not used.	Long mode requires paging, however, so the nearest thing is keeping all memory $FG,2$identity-mapped$FG$.
 
-* $FG,2$Free$FG$ and $FG,2$public domain$FG$.
+* $FG,2$Free$FG$ and $FG,2$public domain$FG$ operating system code. Bootloaders of other open-source licenses (Grub, Limine, etc) are permitted. The Public Domain ZealOS HDD/DVD Bootloaders written in ZealC must always be kept functional, must always be offered as a bootloader option during BIOS-mode install, and must always be included in Distro ISOs. 
 
-* $FG,2$100% open source$FG$ with all source included.
+* $FG,2$100% open source$FG$ operating system code with all source included. Bootloaders are excluded from this requirement.
 
 * Documents are not for printing. They're dynamic, intended for the screen.
 
 * Just one 8x8 fixed-width font. $FG,4$No Unicode, just Extended ASCII$FG$. Other countries can make their own versions. The versions should be just for one language and platform.
+
+* Fully self-hosted self-reproducing functionality on bare-metal and in VMs, primarily via AHCI ATAPI burned CD/DVD discs (ñR/W).
 $FG,8$
 * "Commodore 64" is a trademark owned by Polabe Holding NV.
 * "Windows" is a trademark owned by MicroSoft Corp.

src/Doc/Credits.DD

@@ -1,6 +1,6 @@
 $WW,1$$FG,5$$TX+CX,"Credits"$$FG$
 
-$FG,2$Terry A. Davis$FG$ wrote all of TempleOS over a span of $FG,2$$TX,"15.0",D="DD_TEMPLEOS_AGE"$$FG$ years (full-time).	ZealOS, written over a span of $FG,2$$TX,"2.6",D="DD_ZEALOS_AGE"$$FG$ years, is a fork of TempleOS.	It can run on some bare metal 64-bit PC's from about 2007-2019 with no layering, libraries, tools, modules or anything from other sources.	Otherwise, you run it in a virtual machine, like $FG,2$VMware$FG$, $FG,2$QEMU$FG$ or $FG,2$VirtualBox$FG$.	It is independent and stands alone.  100% of the src code is including on all distro's, from the kernel to the compiler to the boot loaders!	It is public domain, not GPL.
+$FG,2$Terry A. Davis$FG$ wrote all of TempleOS over a span of $FG,2$$TX,"15.0",D="DD_TEMPLEOS_AGE"$$FG$ years (full-time).	ZealOS, written over a span of $FG,2$$TX,"3.1",D="DD_ZEALOS_AGE"$$FG$ years (part-time), is a fork of TempleOS.	It can run on bare metal 64-bit PC's from about 2007-2019 with no layering, libraries, tools, modules or anything from other sources.	Otherwise, you run it in a virtual machine, like $FG,2$VMware$FG$, $FG,2$QEMU$FG$ or $FG,2$VirtualBox$FG$.	It is independent and can stand alone.  100% of the operating system source code is included on all distros, from the kernel to the compiler to the applications, including public-domain BIOS-mode boot loaders!	It is public domain, not GPL.
 
 *) $LK,"ATA Reg and Cmd Definitions",A="MN:ATA_NOP"$ are originally from Linux.  Later, Terry got the spec.
 
@@ -38,6 +38,7 @@ $FG,2$Terry A. Davis$FG$ wrote all of TempleOS over a span of $FG,2$$TX,"15.0",D
 
 *) The random number generator is from Donald Knuth in the wikipedia entry for $TX,"Linear_congruential_generator",HTML="http://en.wikipedia.org/wiki/Linear_congruential_generator"$.
 
+*) The $FG,4$optional$FG$ UEFI-compatible Limine bootloader is copyrighted by GitHub user 'mintsuki' and project contributors, under the BSD-2 License.  $FG,4$This bootloader is NOT included by default$FG$, and is only available on ZealOS distro ISO builds marked "BSD2-UEFI" in the ISO filename.
 $FG,8$
 * "MSDOS", "Windows", and "FAT32" are trademarks owned by MicroSoft Corp.
 * "MATLAB" is a trademark owned by The Math Works, Inc.

src/Doc/Customize.DD

@@ -2,6 +2,6 @@ $WW,1$* You can adjust the mouse movement rate by setting global variables in yo
 
 * You can set your local time zone by setting the $FG,4$local_time_offset$FG$ global variable in a start-up file.	Its units are $LK,"CDATE_FREQ",A="MN:CDATE_FREQ"$.  See $LK,"local time",A="FF:~/HomeLocalize.ZC,local_time"$.
 
-* You can change the palette using the $LK+PU,"PaletteSet",A="FF:::/System/Gr/GrPalette.ZC,U0 PaletteSet"$ functions. Pressing $FG,2$<CTRL-ALT-f>$FG$ toggles standard and VGA ROM font.
+* You can change the palette using the $LK+PU,"PaletteSet",A="FF:::/System/Gr/GrPalette.ZC,U0 PaletteSet"$ functions. Pressing $FG,2$<CTRL-ALT-f>$FG$ toggles standard and auxiliary font.
 
 * Get rid of this message $LK,"here",A="FF:~/Once.ZC,Customize.DD"$.

src/Doc/FAQ.DD

@@ -1,15 +1,15 @@
 $WW,1$$FG,5$$TX+CX,"Frequently Asked Questions"$$FG$
 
 $TR,"How come it is public domain, not GPL?"$
-$ID,2$$FG,2$Terry A. Davis$FG$, wrote all of TempleOS over a span of $FG,2$$TX,"15.0",D="DD_TEMPLEOS_AGE"$$FG$ years (full-time).  ZealOS, written over a span of $FG,2$$TX,"2.6",D="DD_ZEALOS_AGE"$$FG$ years, is a fork of TempleOS.  It can run on some bare metal 64-bit PC's from about 2007-2019 with no layering, libraries, tools, modules or anything from other sources.  Otherwise, you run it in a virtual machine, like $FG,2$VMware$FG$, $FG,2$QEMU$FG$ or $FG,2$VirtualBox$FG$.  It is independent and stands alone.	100% of the src code is including on all distro's, from the kernel to the compiler to the boot loaders!  See $LK,"::/Doc/Credits.DD"$.
+$ID,2$$FG,2$Terry A. Davis$FG$, wrote all of TempleOS over a span of $FG,2$$TX,"15.0",D="DD_TEMPLEOS_AGE"$$FG$ years (full-time).  ZealOS, written over a span of $FG,2$$TX,"3.2",D="DD_ZEALOS_AGE"$$FG$ years (part-time), is a fork of TempleOS.  It can run on bare metal 64-bit PC's from about 2007-2019 with no layering, libraries, tools, modules or anything from other sources.  Otherwise, you run it in a virtual machine, like $FG,2$VMware$FG$, $FG,2$QEMU$FG$ or $FG,2$VirtualBox$FG$.  It is independent and can stand alone.	100% of the public-domain operating system source code is included on all distros, from the kernel to the compiler to the applications, including public-domain BIOS-mode boot loaders!  See $LK,"::/Doc/Credits.DD"$.
 $ID,-2$$TR,"Shouldn't it be GNU/ZealOS?"$
-$ID,2$ZealOS executes 100% public-domain code.	Boot-loaders were even written, so we do not need Grub.  See $LK,"::/Doc/Credits.DD"$.
+$ID,2$ZealOS executes 100% public-domain operating system code.	Public-domain boot-loaders were even written, so we do not require Grub.  Optional UEFI-compatible ZealOS distro builds can be made using Limine, a BSD-2 licensed bootloader, but this is never required for BIOS-mode.  See $LK,"::/Doc/Credits.DD"$.
 $ID,-2$$TR,"Don't you use GNU's gcc?"$
 $ID,2$ZealOS was written from scratch, starting with $FG,2$TASM$FG$ long ago, launching from real-mode DOS.  Now, there is no $FG,2$Linux$FG$ or $FG,2$GNU$FG$ or any other code in ZealOS.  Yes, the compiler was written from scratch.	See $LK,"::/Doc/Credits.DD"$.
 $ID,-2$$TR,"Why do you dual boot?"$
 $ID,2$ZealOS is 100% independent -- it does not access the files of your primary operating system and ZealOS will work as the only operating system on your computer.  In your off hours, you will probably use your other operating system.
 $ID,-2$$TR,"It has links, so is it a browser?"$
-$ID,2$ZealOS is an operating system, not a browser.  $LK,"ZealOS links",A="MN:LK_FILE"$ are a special format and only link too local files and symbol source addresses.
+$ID,2$ZealOS is an operating system, not a browser.  $LK,"ZealOS links",A="MN:LK_FILE"$ are a special format and only link to local files and symbol source addresses.
 $ID,-2$$TR,"Where are the animated 3D icon GIFs?"$
 $ID,2$3D $LK,"Sprites",A="FI:::/Doc/Sprite.DD"$ are stored as a mesh of triangles.	There are no GIF files.  It $LK,"rotates",A="MN:Mat4x4MulXYZ"$ 3D sprite objects on the fly.
 $ID,-2$$TR,"If the compiler is JIT, isn't it an interpretor?"$
@@ -55,11 +55,11 @@ $ID,2$If you use Grub, you $FG,2$chain-load$FG$ like Windows.  See $LK,"Boot",A=
 $ID,-2$$TR,"How do I get Kernel.ZXE to boot?"$
 $ID,2$The boot-loaders must be patched by you running $LK,"BootHDIns",A="MN:BootHDIns"$() or $LK,"BootMHDIns",A="MN:BootMHDIns"$().  Those will write the block address into the boot-loader because the boot-loaders do not navigate file systems to find the $LK,"Stage2",A="FI:::/Kernel/KStart16.ZC"$ if you relocate it.
 $ID,-2$$TR,"Why is there some 16-Bit code?"$
-$ID,2$ZealOS is 64-bit.  Like all PC operating systems, the boot-loader starts in 16-bit real-mode.  ZealOS calls a few $FG,2$BIOS$FG$ info routines, switches to VGA-640x480x4bit, switches to 32-bit, then, 64-bit mode.	There is an odd thing called a $FG,2$$TX,"PCI BIOS",HTML="http://www.o3one.org/hwdocs/bios_doc/pci_bios_21.pdf"$$FG$ which is 32-bit used for $FG,2$PCI$FG$ config space access.	If supported, ZealOS calls $LK,"that",A="FI:::/Kernel/PCIBIOS.ZC"$ a couple times, otherwise using Port I/O for PCI.	It must temporarily drop-out-of 64-bit mode for that and stop multi-tasking.
+$ID,2$ZealOS is 64-bit.  Like all PC operating systems, the MBR boot-loader starts in 16-bit real-mode.  ZealOS calls a few $FG,2$BIOS$FG$ info routines, switches to 32-bit, then, 64-bit mode.	There is an odd thing called a $FG,2$$TX,"PCI BIOS",HTML="http://www.o3one.org/hwdocs/bios_doc/pci_bios_21.pdf"$$FG$ which is 32-bit used for $FG,2$PCI$FG$ config space access.	If supported, ZealOS calls $LK,"that",A="FI:::/Kernel/PCIBIOS.ZC"$ a couple times, otherwise using Port I/O for PCI.	It must temporarily drop-out-of 64-bit mode for that and stop multi-tasking.
 $ID,-2$$TR,"Why are you pushing 32-bit values on the stack?"$
 $ID,2$$FG,2$PUSH EAX$FG$ : All stack operations in 64-bit mode are 64-bits.
 $ID,-2$$TR,"Why are you using 32-bit insts and not setting high 32-bits?"$
-$ID,2$$FG,2$XOR EAX,EAX$FG$ : Operations on 32-bit registers clear the high 32-bits.
+$ID,2$$FG,2$XOR EAX, EAX$FG$ : Operations on 32-bit registers clear the high 32-bits.
 $ID,-2$$TR,"How do you use the FS and GS segment registers."$
 $ID,2$$FG,2$MOV RAX,FS:[RAX]$FG$ : FS can be set with a $FG,2$WRMSR$FG$, but displacement is RIP relative, so it's tricky to use.  FS is used for the current $LK,"CTask",A="MN:CTask"$, GS for $LK,"CCPU",A="MN:CCPU"$.
 $ID,-2$$TR,"How do I set ORG for position of code?"$
@@ -89,4 +89,4 @@ $FG,8$
 * "QEMU" is a trademark owned by Fabrice Bellard.
 * "VMware" is a trademark owned by VMware, Inc.
 * "VirtualBox" is a trademark owned by Oracle.
-$FG$
+$FG$

src/Doc/Features.DD

@@ -6,7 +6,7 @@
 
 * Master/Slave MultiCore
 
-* Free, $FG,2$public domain$FG$, $FG,2$100% open source$FG$.
+* Free, $FG,2$public domain$FG$, $FG,2$100% open source$FG$ operating system code.
 
 * 64-bit $FG,2$compiler/assembler$FG$ for $LK,"ZealC",A="FI:::/Doc/ZealC.DD"$.	Truly compiles, doesn't interpret.	$FG,2$Just-in-Time$FG$ and $FG,2$Ahead-of-Time$FG$ compilation.  With $FG,2$JIT$FG$, no need for object or exe files.
 
@@ -50,4 +50,4 @@
 
 * Many games, $LK,"demos",A="FI:::/Doc/DemoIndex.DD"$ and $LK,"documentation",A="FI:::/Doc/HelpIndex.DD"$.
 
-* $FG,2$All source code$FG$ included.  Only compiles with the included ZealOS compiler and assembler.
+* $FG,2$All operating system source code$FG$ included.  Only compiles with the included ZealOS compiler and assembler.

src/Doc/MemoryOverview.DD

@@ -8,7 +8,7 @@ You can create new, independent heaps using $LK,"HeapCtrlInit",A="MN:HeapCtrlIni
 
 Memory alloced by a task will be freed when the task is killed.  The $LK,"System Task",A="FF:::/Doc/Glossary.DD,System Task"$ is a task that never dies.	Its memory is like kernel memory in other operating systems.	See $LK,"SysCAlloc",A="MN:SysCAlloc"$(), $LK,"SysMAlloc",A="MN:SysMAlloc"$(), $LK,"SysMAllocIdent",A="MN:SysMAllocIdent"$() and $LK,"SysStrNew",A="MN:SysStrNew"$().
 
-All of the regular page tables are marked, "cached".	When accessing hardware, however, you need uncached page table.  The lowest 4Gig addresses have an alias to access hardware located toward the top of mapped space, $FG,2$0x$TX,"0100000000",D="DD_UNCACHED_ALIAS"$$FG$.	See $LK,"dev.uncached_alias",A="FF:::/Kernel/MultiProc.ZC,dev.uncached_alias"$.
+All of the regular page tables are marked, "cached".	When accessing hardware, however, you need uncached page table.  The lowest 4Gig addresses have an alias to access hardware located toward the top of mapped space, $FG,2$0x$TX,"0124000000",D="DD_UNCACHED_ALIAS"$$FG$.	See $LK,"dev.uncached_alias",A="FF:::/Kernel/MultiProc.ZC,dev.uncached_alias"$.
 
 During an extended powered-on session of ZealOS, in theory, memory will become fragmented, requiring a reboot.
 
@@ -17,7 +17,7 @@ See $LK,"MemRep",A="MN:MemRep"$() and $LK,"::/Demo/MemDemo.ZC"$.
 
 $FG,5$$TX+CX,"Single System-wide Memory Map"$
 
-$FG,2$ 0x00$TX,"00007C00",D="DD_KERNEL"$- 0x00$TX,"0003813F",D="DD_KERNEL_END"$$FG$
+$FG,2$ 0x00$TX,"0003F000",D="DD_KERNEL"$- 0x00$TX,"000712CF",D="DD_KERNEL_END"$$FG$
 $ID,2$Kernel module, placed here by the boot-loader, $LK,"BOOT_RAM_BASE",A="MN:BOOT_RAM_BASE"$.
 $ID,-2$
 $FG,2$ 0x00$TX,"00096600",D="DD_BOOT_HIGH_LOC_DVD"$- 0x00$TX,"00096FFF",D="DD_BOOT_HIGH_LOC_DVD_END"$$FG$
@@ -25,21 +25,20 @@ $ID,2$$FG$Boot block relocated here before loading the Kernel module, $LK,"BootD
 $ID,-2$
 $FG,2$ 0x00$TX,"00097000",D="DD_MP_VECT"$- 0x00$TX,"0009703B",D="DD_MP_VECT_END"$$FG$ Multicore start-up vect code, $LK,"MPN_VECT",A="MN:MPN_VECT"$.
 $FG,2$~0x000009F000- 0x000009FFFF$FG$ Extended BIOS data area.
-$FG,2$ 0x00000A0000- 0x00000BFFFF$FG$ VGA graphics mem with alias at $LK,"text",A="MN:text"$.vga_alias.
 $FG,2$ 0x00$TX,"00100000",D="DD_SYS_FIXED_AREA_BASE"$- 0x00$TX,"00102FFF",D="DD_SYS_FIXED_AREA_END"$$FG$ $LK,"CSysFixedArea",A="MN:CSysFixedArea"$ for misc.
-$FG,2$ 0x00$TX,"0010D000",D="DD_MEM_HEAP_BASE"$- 0x00$TX,"33BFFFFF",D="DD_MEM_HEAP_LIMIT"$$FG$ Code Heap mem.
+$FG,2$ 0x00$TX,"0010E000",D="DD_MEM_HEAP_BASE"$- 0x00$TX,"3FFE37FF",D="DD_MEM_HEAP_LIMIT"$$FG$ Code Heap mem.
 
 $FG,2$ 0x00E0000000- 0x00FFFFFFFF$FG$
 $ID,2$32-bit devices could alloc memory at 0xF0000000 going up, but this is wrong, since some PCs already have devices at 0xF0000000.  PCI devices are supported, so $LK,"Mem32DevAlloc",A="MN:Mem32DevAlloc"$() flaws could become an issue.
 $ID,-2$
 $FG,2$ 0x0080000000-~0x00DFFFFFFF$FG$
-$FG,2$ 0x0100000000-~0x$TX,"00FFFFFFFF",D="DD_PHYSICAL_SPACE_END"$$FG$
+$FG,2$ 0x0100000000-~0x$TX,"0123FFFFFF",D="DD_PHYSICAL_SPACE_END"$$FG$
 $ID,2$Data Heap mem.	(The physical memory that exists in this range is data heap.)
 $ID,-2$
-$FG,2$ 0x$TX,"0100000000",D="DD_UNCACHED_ALIAS"$- 0x$TX,"01FFFFFFFF",D="DD_MAPPED_SPACE_END"$$FG$
+$FG,2$ 0x$TX,"0124000000",D="DD_UNCACHED_ALIAS"$- 0x$TX,"0223FFFFFF",D="DD_MAPPED_SPACE_END"$$FG$
 $ID,2$Uncached alias of first 4Gig.  (For 32-bit device access.)
 $ID,-2$
-$FG,2$						 - 0x$TX,"01FFFFFFFF",D="DD_MAPPED_SPACE_END"$$FG$
+$FG,2$						 - 0x$TX,"0223FFFFFF",D="DD_MAPPED_SPACE_END"$$FG$
 $ID,2$64-bit devices are alloced with $LK,"Mem64DevAlloc",A="MN:Mem64DevAlloc"$() counting backward$WW,0$.
 $ID,-2$
 
@@ -55,7 +54,7 @@ In 2003, Terry Davis wanted to make a no-paging ring-0-only 64-bit operating sys
 
 Terry needed VGA A0000-BFFFF memory to be write-through and 0xE0000000-0xFFFFFFFF to be uncached for various devices.  All 64-bit computers allow stopping address translation at 2Meg page size, not using 4K.  He wanted to use 2Meg for everything because it's faster, with one less level of page tables.  He had to make A0000-BFFFF write-through, though, so he could not use 2Meg size on the lowest page.	He did the lowest 2Meg area as 4K pages.  He also unmapped the first 4K to cause a fault when dereferencing NULL.
 
-In 2016, Terry came-up with an alternate idea.	He double mapped the lowest memory with an alias that was uncached.	Accessing the lowest 2Meg area directly was cached but the alias he created up at the top of address space was uncached.  See $LK,"UncachedAliasAlloc",A="MN:UncachedAliasAlloc"$().  Unfortunately, he could no longer boast of the simplicity of identity mapping everything.  Since many of the users are familiar with A0000-BFFFF, it is actually pretty seriously unfortunate that they cannot use the easy-to-understand numbers of A0000-BFFFF, but must access the relocated alias location.	See $LK,"text.vga_alias",A="FF:::/Kernel/KMain.ZC,text.vga_alias"$.  We also no longer cause a fault when dereferencing NULL.
+In 2016, Terry came-up with an alternate idea.	He double mapped the lowest memory with an alias that was uncached.	Accessing the lowest 2Meg area directly was cached but the alias he created up at the top of address space was uncached.  See $LK,"UncachedAliasAlloc",A="MN:UncachedAliasAlloc"$().  Unfortunately, he could no longer boast of the simplicity of identity mapping everything.  We also no longer cause a fault when dereferencing NULL.
 
 Then, Terry switched to 1Gig page sizes.	For the lowest 4Gig, he set-up an alias up at the top of address space.	See $LK,"UncachedAliasAlloc",A="MN:UncachedAliasAlloc"$().	Not all computers support 1Gig page tables, however, so he also supported 2Meg.
 

src/Doc/Start.DD

@@ -1,5 +1,5 @@
 
-$WW+H,1$$FG,5$$TX+CX,"ZealOS V1.13",D="DD_OS_NAME_VERSION"$$FG$
+$WW+H,1$$FG,5$$TX+CX,"ZealOS V2.00",D="DD_OS_NAME_VERSION"$$FG$
 
 $TX+CX,"Public Domain Operating System"$
 

src/Doc/Strategy.DD

@@ -6,9 +6,9 @@ Windows is a car.
 
 ZealOS is a motorcycle -- if you lean-over too far, a motorcycle will crash.	Don't do that!	There are no side air bags on a motorcycle.  DOS and C64 had no memory protections and ran in ring-0, with no security.  This saves an order of magnitude complexity.
 
-Linux and Windows are general purpose operating systems.	They attempt to do any task you want.  ZealOS cherry-picks tasks and is designed to do the same things a C64 did.  This saves and order of magnitude complexity.	For example, the $LK,"RedSea",A="FI:::/Doc/RedSea.DD"$ file system allocates just contiguous files -- you load and save whole files at once.  Also, ZealOS does not do multimedia.  In theory, memory will fragment with lots of big files.	The system would fall to pieces with multimedia.
+Linux and Windows are general purpose operating systems.	They attempt to do any task you want.  ZealOS cherry-picks tasks and is designed to do the same things a C64 did.  This saves and order of magnitude complexity.	For example, the $LK,"RedSea",A="FI:::/Doc/RedSea.DD"$ file system allocates just contiguous files -- you load and save whole files at once.  In theory, memory will fragment with lots of big files.
 
-A three button mouse is like a leg you cannot put weight on.	ZealOS just does hardware everybody has, with no divergent code bases for each machine's custom hardware.  There is one graphics driver instead of 50 for different GPUs.  This saves an order of magnitude complexity and makes for a delightful API, so developer's code is not like a frayed rope end.
+A three button mouse is like a leg you cannot put weight on.	ZealOS primarily just does hardware everybody has, avoiding divergent code bases for each machine's custom hardware.  There is one CPU-driven graphics driver, instead of 50 for different GPUs.  This saves an order of magnitude complexity and makes for a delightful API, so developer's code is not like a frayed rope end.
 
 
 

src/Doc/Tips.DD

@@ -67,7 +67,7 @@ $FG,2$Merge("C:/","D:/","+r+d");$FG$ to check your changes.
 
 * Use $FG,2$<CTRL-ALT-a>$FG$ to enter an extended ASCII char.
 
-* Use $FG,2$<CTRL-ALT-f>$FG$ to toggle between the $LK,"VGA ROM Font",A="FF:::/Kernel/KMain.ZC,SYS_FONT_PTR:2"$ and $LK,"Std Font",A="FI:::/Kernel/FontStd.ZC"$.
+* Use $FG,2$<CTRL-ALT-f>$FG$ to toggle between the $LK,"Aux Font",A="FI:::/Kernel/FontAux.ZC"$ and $LK,"Std Font",A="FI:::/Kernel/FontStd.ZC"$.
 
 * Use $FG,2$<CTRL-ALT-s>$FG$ will capture the screen as a sprite on the clip. You can save the cmd line doc as text with $FG,2$<CTRL-a>$FG$.
 

src/Doc/Welcome.DD

@@ -7,7 +7,7 @@ $ID,2$* Professionals doing hobby projects
 * Teenagers doing projects
 * Non-professional, older-persons projects
 $ID,-2$
-Simplicity is a goal to $LK,"keep the line count down",A="FI:::/Doc/Strategy.DD"$, so it's easy to tinker with.  As it turns-out, simplicity makes it faster in some ways, too.  It never switches privilege levels, never changes address maps, tends to load whole contiguous files and other, similar things which boost speed.	It's only $TX,"95,255",D="DD_ZEALOS_LOC"$ lines of code including the kernel, the 64-bit compiler, the graphics library and all the tools.	More importantly, it's designed to keep the user's line count down -- you can do a $LK,"Hello World",A="FI:::/Doc/HelloWorld.DD"$ application in one line of code and can put graphics on the screen with a three line program!
+Simplicity is a goal to $LK,"keep the line count down",A="FI:::/Doc/Strategy.DD"$, so it's easy to tinker with.  As it turns-out, simplicity makes it faster in some ways, too.  It never switches privilege levels, never changes address maps, tends to load whole contiguous files and other, similar things which boost speed.	It's only $TX,"98,658",D="DD_ZEALOS_LOC"$ lines of code including the kernel, the 64-bit compiler, the graphics library and all the tools.	More importantly, it's designed to keep the user's line count down -- you can do a $LK,"Hello World",A="FI:::/Doc/HelloWorld.DD"$ application in one line of code and can put graphics on the screen with a three line program!
 
 It's a kayak, not a Titanic -- it will crash if you do something wrong.  You quickly reboot, however.  DOS and the 8-bit home computers of the 80's worked fine without memory protection and most computers in the world -- the embedded ones -- operate without protection.  The resulting simplicity of no protections is why ZealOS has value.	In facts, that's the point of ZealOS.  See the $LK,"ZealOS Charter",A="FI:::/Doc/Charter.DD"$.
 
@@ -118,7 +118,7 @@ Software is distributed as $LK,"RedSea",A="FI:::/Doc/RedSea.DD"$ ISO files.  Bur
 
 Ideally, do not install applications such as games onto your hard drive because we wish to keep hard drive usage low, so the whole $FG,2$'C'$FG$ drive can be copied quickly to $FG,2$'D'$FG$.	Also, the $LK,"FileMgr",A="MN:FileMgr"$() $FG,2$<CTRL-d>$FG$ starts too slowly when there are lots of hard drive files, but that is how we want it.
 
-3rd party libraries are banned, since they circumvent the 100,000 line of code limit in the $LK,"ZealOS Charter",A="FI:::/Doc/Charter.DD"$.  All applications must only depend on the core ZealOS files and whatever they bring along in the ISO.  This is similar to how Commodore 64 applications only depended on the ROM.
+3rd party libraries are banned from being required, since they circumvent the 100,000 line of code limit in the $LK,"ZealOS Charter",A="FI:::/Doc/Charter.DD"$.  All applications must only depend on the core ZealOS files and whatever they bring along in the ISO.  This is similar to how Commodore 64 applications only depended on the ROM.
 
 $MA-X+PU,"Take Tour",LM="User(\"Cd(\\\"::/Misc/Tour\\\");;InFile(\\\"Tour\\\");\n\");"$
 

src/Doc/WhyNotMore.DD

@@ -10,9 +10,7 @@ In the CPU department, ZealOS has state of the art 64-bit $LK,"long mode",A="FI:
 
 Terry Davis made an incredible accomplishment by getting it to work on practically everyone's computer as long as it is 64-bit and they run inside VMware, QEMU or VirtualBox.
 
-Adding a USB driver would be really ugly with UHCI, EHCI, OHCI, USB1, USB2, USB3, ICH6, ICH7, ICH8, ICH9, ICH10, ICH11, ICH12, boot mode and regular mode for keyboard/mouse and a diversity of HID reports.	It's hopeless.	It could never offer anything but crappy, limited support and it would just add a ton of crappy code that mostly didn't work.	What would ZealOS gain?	Nothing.	A keyboard or mouse would not be improved.	Solid State USB drives would be nice, but it's not going to happen.
+The compiler does not create an ELF or PE format.  We would have to ruin the beauty of the compiler.
-
-UEFI is pointless.	If ZealOS is forced to run in VMware, QEMU or VirtualBox, they will always support non-UEFI mode.	Without working, native hard drive and CD/DVD drivers, you can't get very far with UEFI on a native install, not to mention SecureBoot.  UEFI is, first of all, redundant.	If non-UEFI works in a virtual machine, supporting UEFI would only be redundant, ugly nasty code.  The compiler does not create an ELF or PE format.  We would have to ruin the beauty of the compiler.
 
 God talks.
 $FG,8$

src/Home/DoDistro.ZC

@@ -1,6 +1,6 @@
 //Make Your own Distro by #include-ing this file.
 
-#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n1024\n768\n\n\n"
+#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
 
 U0 MakeMyISO(U8 *_out_iso_filename)
 {//Does everything with current drive.

src/Home/K.ZC

@@ -1,39 +0,0 @@
-Ed("/Doc/ChangeLog.DD");
-
-CAHCIPort	*port;
-I64			 i, ata_drive = -1;
-
-// Find first-available ATA drive for BootHDIns.
-for (i = 0; i < AHCI_MAX_PORTS; i++)
-{
-	if (Bt(&blkdev.ahci_hba->ports_implemented, i))
-	{
-		port = &blkdev.ahci_hba->ports[i];
-		if (port->signature == AHCI_PxSIG_ATA)
-		{
-			ata_drive = i;
-			break;
-		}
-	}
-}
-
-if (ata_drive < 0)
-	throw('No ATA');
-
-In("CC\n%d\n\n1024\n768\n\n\n", ata_drive);
-BootHDIns;
-
-"\n\nSuccessful? ";
-if (YorN)
-{
-	Once(	"CursorRemove(\"/*\");;;"
-			"PopUp(\"#include \\\"DoDistro\\\";;"
-			"if (DriveIsWritable)"
-			"{"
-				"Del(\\\"~/Registry.ZC\\\");"
-				"Del(\\\"~/MakeHome.ZC\\\");"
-				"OutU16(0x4004, 0x3400);"
-			"}\");");
-
-	BootRAM;
-}

src/Home/Net/Drivers/E1000.ZC

@@ -239,7 +239,7 @@ U16	E1000EEPROMRead(U8 word)
 	E1000MMIOWrite(E1000_REG_EERD, 1 | word << 8);
 
 	temp = E1000MMIORead(E1000_REG_EERD);
-	while (!Bt(&temp, E1000_EERDf_DONE))
+	while (!PCIBt(&temp, E1000_EERDf_DONE))
 	{
 		Sleep(1);
 		temp = E1000MMIORead(E1000_REG_EERD);
@@ -278,7 +278,7 @@ I64 E1000PacketReceive(U8 **packet_buffer_out, U16 *packet_length_out)
 		drop = TRUE;
 	}
 
-	if (Bt(&entry->status, E1000_RDESC_STATUSf_EOP))
+	if (PCIBt(&entry->status, E1000_RDESC_STATUSf_EOP))
 	{
 		NetErr("E1000 PACKET RECEIVE: No EOP Set");
 		drop = TRUE;
@@ -316,7 +316,7 @@ U0 E1000ReceivePacketRelease(I64 de_index)
 
 Bool E1000DriverOwnsRX(CE1000DescriptorEntryRX *entry)
 {
-	return Bt(&entry->status, 0); // ?? TODO #define
+	return PCIBt(&entry->status, 0); // ?? TODO #define
 }
 
 I64 E1000TransmitPacketAllocate(U8 **packet_buffer_out, I64 length)
@@ -330,9 +330,9 @@ I64 E1000TransmitPacketAllocate(U8 **packet_buffer_out, I64 length)
 
 	entry->address	= *packet_buffer_out;
 	entry->length	= length;
-	Bts(&entry->cmd, E1000_TDESC_CMDf_EOP);
+	PCIBts(&entry->cmd, E1000_TDESC_CMDf_EOP);
-	Bts(&entry->cmd, E1000_TDESC_CMDf_IFCS);
+	PCIBts(&entry->cmd, E1000_TDESC_CMDf_IFCS);
-	Bts(&entry->cmd, E1000_TDESC_CMDf_RS);
+	PCIBts(&entry->cmd, E1000_TDESC_CMDf_RS);
 
 	NetLog("E1000 ALLOCATE TX PACKET: de_index: %X.", de_index);
 	return de_index;
@@ -370,23 +370,23 @@ interrupt U0 E1000IRQ()
 
 	icr &= ~(E1000_ICRF_TXDW | E1000_ICRF_TXQE);
 
-	if (Bt(&icr, E1000_ICRf_LSC)) // 'link status change' ?
+	if (PCIBt(&icr, E1000_ICRf_LSC)) // 'link status change' ?
 	{
-		Btr(&icr, E1000_ICRf_LSC);
+		PCIBtr(&icr, E1000_ICRf_LSC);
 		E1000MMIOWrite(E1000_REG_CTRL, E1000MMIORead(E1000_REG_CTRL) | E1000_CTRLF_SLU);
 	}
 
-	if (Bt(&icr, E1000_ICRf_RXO) || Bt(&icr, E1000_ICRf_RXDMT)) // 'rx underrun / min threshold' ?
+	if (PCIBt(&icr, E1000_ICRf_RXO) || PCIBt(&icr, E1000_ICRf_RXDMT)) // 'rx underrun / min threshold' ?
 	{
-		Btr(&icr, E1000_ICRf_RXO);
+		PCIBtr(&icr, E1000_ICRf_RXO);
-		Btr(&icr, E1000_ICRf_RXDMT);
+		PCIBtr(&icr, E1000_ICRf_RXDMT);
 
 		poll = TRUE;
 	}
 
-	if (Bt(&icr, E1000_ICRf_RXT)) // 'packet pending' ?
+	if (PCIBt(&icr, E1000_ICRf_RXT)) // 'packet pending' ?
 	{
-		Btr(&icr, E1000_ICRf_RXT);
+		PCIBtr(&icr, E1000_ICRf_RXT);
 
 		poll = TRUE;
 	}

src/Home/Net/Drivers/PCNet.ZC

@@ -199,7 +199,7 @@ U0 PCNetSWStyleSet()
 
 	csr &= ~0xFF; // clears first 8 bits: SWSTYLE 8-bit register.
 	csr |= PCNET_SWSTYLE_SELECTION; // set SWSTYLE to PCNet-PCI mode.
-	Bts(&csr, PCNET_SWSTYLE_SSIZE32); // set SSIZE32 bit 1
+	PCIBts(&csr, PCNET_SWSTYLE_SSIZE32); // set SSIZE32 bit 1
 
 	PCNetCSRWrite(PCNET_CSR_SOFTWARESTYLE, csr);
 }
@@ -239,7 +239,7 @@ U0 PCNetDescriptorEntryInit(CPCNetDescriptorEntry *entry, U32 buffer_address, I6
 
 	//if this is a Receive DE, give ownership to the card so the PCNet can fill them.
 	if (is_rx)
-		Bts(&entry->status1, PCNET_DESCRIPTORf_OWN);
+		PCIBts(&entry->status1, PCNET_DESCRIPTORf_OWN);
 }
 
 U0 PCNetBuffersAllocate()
@@ -397,11 +397,11 @@ U0 PCNetInterruptCSRSet()
 
 	U32 csr = PCNetCSRRead(PCNET_CSR_INTERRUPTS);
 
-	Btr(&csr, PCNET_INT_BSWP);
+	PCIBtr(&csr, PCNET_INT_BSWP);
-	Btr(&csr, PCNET_INT_RINTM);
+	PCIBtr(&csr, PCNET_INT_RINTM);
 
-	Bts(&csr, PCNET_INT_IDONM);
+	PCIBts(&csr, PCNET_INT_IDONM);
-	Bts(&csr, PCNET_INT_TINTM);
+	PCIBts(&csr, PCNET_INT_TINTM);
 	
 	PCNetCSRWrite(PCNET_CSR_INTERRUPTS, csr);
 }
@@ -414,7 +414,7 @@ U0 PCNetTXAutoPadEnable()
 
 	U32 csr = PCNetCSRRead(PCNET_CSR_FEATURECTRL);
 
-	Bts(&csr, PCNET_FEATURE_APADXMT);
+	PCIBts(&csr, PCNET_FEATURE_APADXMT);
 
 	PCNetCSRWrite(PCNET_CSR_FEATURECTRL, csr);
 }
@@ -429,10 +429,10 @@ U0 PCNetConfigModeExit()
 
 	U32 csr = PCNetCSRRead(PCNET_CSR_CTRLSTATUS);
 
-	Btr(&csr, PCNET_CTRL_INIT);
+	PCIBtr(&csr, PCNET_CTRL_INIT);
-	Btr(&csr, PCNET_CTRL_STOP);
+	PCIBtr(&csr, PCNET_CTRL_STOP);
 
-	Bts(&csr, PCNET_CTRL_STRT);
+	PCIBts(&csr, PCNET_CTRL_STRT);
 
 	PCNetCSRWrite(PCNET_CSR_CTRLSTATUS, csr);
 }
@@ -442,7 +442,7 @@ I64 PCNetDriverOwns(CPCNetDescriptorEntry* entry)
 	Descriptor Entry is zero. If 0, driver owns,
 	if 1, PCNet card owns it. */
 
-	return !Bt(&entry->status1, PCNET_DESCRIPTORf_OWN);
+	return !PCIBt(&entry->status1, PCNET_DESCRIPTORf_OWN);
 }
 
 I64 PCNetTransmitPacketAllocate(U8 **packet_buffer_out, I64 length)
@@ -474,9 +474,9 @@ I64 PCNetTransmitPacketAllocate(U8 **packet_buffer_out, I64 length)
 		NetLog("PCNET ALLOCATE TX PACKET: Driver owns TX DE at index %d.", de_index);
 	}
 
-	Bts(&entry->status1, PCNET_DESCRIPTORf_STP);
+	PCIBts(&entry->status1, PCNET_DESCRIPTORf_STP);
 
-	Bts(&entry->status1, PCNET_DESCRIPTORf_ENP);
+	PCIBts(&entry->status1, PCNET_DESCRIPTORf_ENP);
 
 	/*	AMD PCNet datasheet p.1-991.
 		BCNT is the usable buffer length, expressed as first
@@ -512,9 +512,9 @@ U0 PCNetTransmitPacketFinish(I64 de_index)
 
 	CPCNetDescriptorEntry *entry = &pcnet.tx_de_buffer[de_index * sizeof(CPCNetDescriptorEntry)];
 
-	Bts(&entry->status1, PCNET_DESCRIPTORf_OWN);
+	PCIBts(&entry->status1, PCNET_DESCRIPTORf_OWN);
 	NetLog("PCNET FINISH TX PACKET: TX DE index: %X, OWN bit of entry at entry: %b.",
-				de_index, Bt(&entry->status1, PCNET_DESCRIPTORf_OWN));
+				de_index, PCIBt(&entry->status1, PCNET_DESCRIPTORf_OWN));
 }
 
 U0 NetDriverTransmitPacketFinish(I64 de_index)
@@ -570,7 +570,7 @@ U0 PCNetReceivePacketRelease(I64 de_index)
 
 	CPCNetDescriptorEntry *entry = &pcnet.rx_de_buffer[de_index * sizeof(CPCNetDescriptorEntry)];
 
-	Bts(&entry->status1, PCNET_DESCRIPTORf_OWN);
+	PCIBts(&entry->status1, PCNET_DESCRIPTORf_OWN);
 }
 
 interrupt U0 PCNetIRQ()
@@ -603,7 +603,7 @@ interrupt U0 PCNetIRQ()
 			PCNetReceivePacketRelease(de_index);
 		}
 
-		Bts(&csr, PCNET_CTRL_RINT);
+		PCIBts(&csr, PCNET_CTRL_RINT);
 
 		PCNetCSRWrite(PCNET_CSR_CTRLSTATUS, csr);
 
@@ -666,10 +666,10 @@ U0 PCNetInit()
 	PCNet32BitModeEnable;
 
 	U32 csr = PCNetCSRRead(PCNET_CSR_CTRLSTATUS);
-	NetLog("PCNET INIT START: what is INIT ?: %d", Bt(&csr, PCNET_CTRL_INIT));
+	NetLog("PCNET INIT START: what is INIT ?: %d", PCIBt(&csr, PCNET_CTRL_INIT));
-	NetLog("PCNET INIT START: what is STRT ?: %d", Bt(&csr, PCNET_CTRL_STRT));
+	NetLog("PCNET INIT START: what is STRT ?: %d", PCIBt(&csr, PCNET_CTRL_STRT));
-	NetLog("PCNET INIT START: what is STOP ?: %d", Bt(&csr, PCNET_CTRL_STOP));
+	NetLog("PCNET INIT START: what is STOP ?: %d", PCIBt(&csr, PCNET_CTRL_STOP));
-	NetLog("PCNET INIT START: what is RINT ?: %d", Bt(&csr, PCNET_CTRL_RINT));
+	NetLog("PCNET INIT START: what is RINT ?: %d", PCIBt(&csr, PCNET_CTRL_RINT));
 
 
 	PCNetSWStyleSet;
@@ -689,10 +689,10 @@ U0 PCNetInit()
 	PCNetCSRWrite(0, PCNetCSRRead(0) | 1 | 1 << 6); // ?
 
 	csr = PCNetCSRRead(PCNET_CSR_CTRLSTATUS);
-	NetLog("PCNET INIT UPLOAD: what is INIT ?: %d", Bt(&csr, PCNET_CTRL_INIT));
+	NetLog("PCNET INIT UPLOAD: what is INIT ?: %d", PCIBt(&csr, PCNET_CTRL_INIT));
-	NetLog("PCNET INIT UPLOAD: what is STRT ?: %d", Bt(&csr, PCNET_CTRL_STRT));
+	NetLog("PCNET INIT UPLOAD: what is STRT ?: %d", PCIBt(&csr, PCNET_CTRL_STRT));
-	NetLog("PCNET INIT UPLOAD: what is STOP ?: %d", Bt(&csr, PCNET_CTRL_STOP));
+	NetLog("PCNET INIT UPLOAD: what is STOP ?: %d", PCIBt(&csr, PCNET_CTRL_STOP));
-	NetLog("PCNET INIT UPLOAD: what is RINT ?: %d", Bt(&csr, PCNET_CTRL_RINT));
+	NetLog("PCNET INIT UPLOAD: what is RINT ?: %d", PCIBt(&csr, PCNET_CTRL_RINT));
 
 	while (!(PCNetCSRRead(0) & 1 << 8)) // ?
 		Yield;
@@ -702,15 +702,15 @@ U0 PCNetInit()
 	Sleep(100); //? necessary?
 
 	csr = PCNetCSRRead(PCNET_CSR_CTRLSTATUS);
-	NetLog("PCNET INIT END: what is INIT ?: %d", Bt(&csr, PCNET_CTRL_INIT));
+	NetLog("PCNET INIT END: what is INIT ?: %d", PCIBt(&csr, PCNET_CTRL_INIT));
-	NetLog("PCNET INIT END: what is STRT ?: %d", Bt(&csr, PCNET_CTRL_STRT));
+	NetLog("PCNET INIT END: what is STRT ?: %d", PCIBt(&csr, PCNET_CTRL_STRT));
-	NetLog("PCNET INIT END: what is STOP ?: %d", Bt(&csr, PCNET_CTRL_STOP));
+	NetLog("PCNET INIT END: what is STOP ?: %d", PCIBt(&csr, PCNET_CTRL_STOP));
-	NetLog("PCNET INIT END: what is RINT ?: %d", Bt(&csr, PCNET_CTRL_RINT));
+	NetLog("PCNET INIT END: what is RINT ?: %d", PCIBt(&csr, PCNET_CTRL_RINT));
-	NetLog("PCNET INIT END: what is TXON ?: %d", Bt(&csr, 4));
+	NetLog("PCNET INIT END: what is TXON ?: %d", PCIBt(&csr, 4));
-	NetLog("PCNET INIT END: what is RXON ?: %d", Bt(&csr, 5));
+	NetLog("PCNET INIT END: what is RXON ?: %d", PCIBt(&csr, 5));
 
 	csr =  PCNetCSRRead(PCNET_CSR_POLLINT);
-	NetLog("PCNET INIT END: what is POLLINT ?: %d", Bt(&csr, PCNET_CTRL_RINT));
+	NetLog("PCNET INIT END: what is POLLINT ?: %d", PCIBt(&csr, PCNET_CTRL_RINT));
 
 	NetLog("PCNET INIT END: Redirecting interrupts.");
 	PCNetInterruptsSetup;
@@ -763,7 +763,7 @@ U0 NetStop()
 { // Halt network activity by setting STOP bit on Status CSR.
 	U32 csr = PCNetCSRRead(PCNET_CSR_CTRLSTATUS);
 
-	Bts(&csr, PCNET_CTRL_STOP);
+	PCIBts(&csr, PCNET_CTRL_STOP);
 
 	PCNetCSRWrite(PCNET_CSR_CTRLSTATUS, csr);
 
@@ -773,7 +773,7 @@ U0 NetStart()
 { // Continue network activity. Setting START bit clears STOP/INIT.
 	U32 csr = PCNetCSRRead(PCNET_CSR_CTRLSTATUS);
 
-	Bts(&csr, PCNET_CTRL_STRT);
+	PCIBts(&csr, PCNET_CTRL_STRT);
 
 	PCNetCSRWrite(PCNET_CSR_CTRLSTATUS, csr);
 }

src/Home/PaletteEditor/Palettes/Amicus.ZC

@@ -1,5 +1,5 @@
 public CBGR24 gr_palette_amicus[COLORS_NUM] = {
-0x0, 0x1A4883, 0x8D2E75, 0xFFA995, 0xA10000, 0xFFC0FF, 0x8B5858, 0xB2B6AF, 0x555753, 0xC5A5, 0x82BC49, 0x8ABEE1, 0xDF2100, 0xD138D1, 0xFFFFFF, 0x969696
+0x0, 0x1A4883, 0x8D2E75, 0xFFA995, 0xA10000, 0xFFC0FF, 0x8B5858, 0xB2B6AF, 0x555753, 0xE4D2, 0x82BC49, 0x8AE0C0, 0xDF2100, 0xB800B2, 0xFFFFFF, 0x969696
 };
 public U0 PaletteSetAmicus(Bool persistent=TRUE)
 {
@@ -7,4 +7,4 @@ public U0 PaletteSetAmicus(Bool persistent=TRUE)
 	LFBFlush;
 	if (persistent)
 		fp_set_std_palette = &PaletteSetAmicus;
-}
+}

src/Home/PaletteEditor/Palettes/Commander.ZC

@@ -1,5 +1,5 @@
 public CBGR24 gr_palette_commander[COLORS_NUM] = {
-0xFFFFFF, 0x867ADE, 0xCC55, 0x5A878B, 0xEE0000, 0xCC44CC, 0xDD8855, 0xBBBBBB, 0x777777, 0x9BFF, 0xAAFF66, 0xAAFFEE, 0xFF7777, 0xCA94E8, 0xEEEE77, 0x483AAA
+0xFFFFFF, 0x867ADE, 0xCC55, 0x5A878B, 0xFF0000, 0xCC44CC, 0xDD8855, 0xE1E1E2, 0x777777, 0x9BFF, 0xAAFF66, 0xAAFFEE, 0xFF7777, 0xCA94E8, 0xEEEE77, 0x483AA7
 };
 public U0 PaletteSetCommander(Bool persistent=TRUE)
 {

src/Home/Roadmap.DD

@@ -1,25 +0,0 @@
-$WW$$FG,5$$TX+CX,"Project Roadmap"$$FG$
-
-The goal is to be a fully-functional, self-reproducing x86_64 PC operating system running in $FG,2$ring-0 only$FG$, designed for modern machines with $FG,2$AHCI$FG$.
-
-Roadmap:
-
-- AHCI driver that is capable of reading and burning CD/DVD discs (ñR/W).
-
-- Write drivers for the 5 most common ethernet cards.
-	- PCNet-II	(Virtualbox)
-	- 82545EM	(VMWare; QEMU?)
-	- ...
-	- ...
-	- ...
-
-- Create a clean and robust networking stack that supports sockets, TCP, UDP, IP, ICMP, DHCP, and an HTTP library.
-	- Write applications using this networking stack.
-	- Write a JSON library, so REST APIs can be used.
-	- Whole system VCS, with root being top-level directory. Stored repo inside the OS, you can checkout any commit onto another partition and boot it to see what the OS was like in that commit.
-	- Pull updates directly onto root filesystem from network. (it's a repo source tree after all).
-
-- Code clean up and refactoring.
-
-- Perhaps support for USB keyboard and mice.
-

src/HomeLocalize.ZC

@@ -7,6 +7,9 @@ KbdTypeMatic(0);
 //Set Time Zone
 local_time_offset = 0 * 60 * 60 * CDATE_FREQ; //Do daylight savings by hand
 
+//Set screen zoom behaviour
+gr.continuous_scroll = TRUE;
+
 //$AN,"",A="mouse_move_scale"$adjust these to set mouse move scale
 mouse_hard.scale.x = 0.7;
 mouse_hard.scale.y = 0.7;

src/Kernel/BlkDev/DiskAHCI.ZC

@@ -1,11 +1,18 @@
 /*
-- Perhaps make more references to spec in comments
+- Make more references to spec in comments
 
-- ATAPI RW
+- ATAPI RW needs cleaning up / improving
 
 - Remove Buffer alignment check and just do it on every call
 
-- AHCIATAPISetMaxSpeed?
+- AHCIATAPISetMaxSpeed needs to be implemented
+
+- TODO FIXME: Variable casting into AHCI memory-mapped areas caused strange crashes
+	on a Ryzen with Gigabyte brand motherboard, all PCI devices AMD brand.
+	Compiler casting internal functionality needs to be researched to fix those bugs.
+	Example line that caused crashes with Page Faults and bad memory address on Ryzen:
+		cmd_header = &port->cmd_list_base(CPortCmdHeader *)[i];
+
 */
 
 I64 AHCI_DEBUG = FALSE;
@@ -25,24 +32,24 @@ U0 AHCIDebug(I64 port_num)
 	"\nAHCI Port: %d", port_num;
 
 	"\nPort Interrupt Status: %b", port->interrupt_status;
-	if (Bt(&port->interrupt_status, AHCI_PxIf_CPDS))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_CPDS))
 		"\n\tCold Port Detect Status";
-	if (Bt(&port->interrupt_status, AHCI_PxIf_TFE))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_TFE))
 		"\n\tTask File Error";
-	if (Bt(&port->interrupt_status, AHCI_PxIf_HBFS))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_HBFS))
 		"\n\tHost Bus Fatal Error";
-	if (Bt(&port->interrupt_status, AHCI_PxIf_HBDS))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_HBDS))
 		"\n\tHost Bus Data Error";
-	if (Bt(&port->interrupt_status, AHCI_PxIf_IFS))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_IFS))
 		"\n\tSATA Interface Fatal Error";
-	if (Bt(&port->interrupt_status, AHCI_PxIf_INFS))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_INFS))
 		"\n\tSATA Interface Non-Fatal Error";
-	if (Bt(&port->interrupt_status, AHCI_PxIf_OFS))
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_OFS))
 		"\n\tOverflow Status (HBA RX bytes > PRDT bytes)";
 	"\nPort Command:          %b", port->command;
 	"\nPort Command Issue:    %b", port->cmd_issue;
 	"\nPort Task File Data:   %b", port->task_file_data;
-	if (Bt(&port->task_file_data, AHCI_PxTFDf_STS_ERR))
+	if (PCIBt(&port->task_file_data, AHCI_PxTFDf_STS_ERR))
 	{
 		"\n\tTask File Data Error";
 		"\n\tTask File Data Error Register: %b", port->task_file_data.u8[1];
@@ -51,27 +58,27 @@ U0 AHCIDebug(I64 port_num)
 	"\nPort SATA Status:      %b", port->sata_status;
 	"\nPort SATA Ctrl:        %b", port->sata_ctrl;
 	"\nPort SATA Error:       %b", port->sata_error;
-	if (Bt(&port->sata_error, AHCI_PxSERR_ERR_I))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_ERR_I))
 		"\n\tRecovered Data Integrity Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_ERR_M))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_ERR_M))
 		"\n\tRecovered Communication Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_ERR_T))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_ERR_T))
 		"\n\tTransient Data Integrity Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_ERR_C))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_ERR_C))
 		"\n\tPersistent Communication Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_ERR_P))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_ERR_P))
 		"\n\tSATA Protocol Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_ERR_E))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_ERR_E))
 		"\n\tInternal Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_DIAG_I))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_DIAG_I))
 		"\n\tPHY Internal Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_DIAG_C))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_DIAG_C))
 		"\n\tLink Layer CRC Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_DIAG_H))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_DIAG_H))
 		"\n\tHandshake Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_DIAG_S))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_DIAG_S))
 		"\n\tLink Sequence Error";
-	if (Bt(&port->sata_error, AHCI_PxSERR_DIAG_T))
+	if (PCIBt(&port->sata_error, AHCI_PxSERR_DIAG_T))
 		"\n\tTransport State Transition Error";
 	"\nPort SATA Active:      %b", port->sata_active;
 	"\nPort SATA Notif:       %b", port->sata_notif;
@@ -85,14 +92,14 @@ U0 AHCIDebug(I64 port_num)
 	"\nHBA Ports Implemented: %b", hba->ports_implemented;
 	"\nHBA Version:           0x%0X", hba->version;
 	"\nHBA Ext Capabilities:  %b", hba->caps_ext;
-	if (Bt(&hba->caps_ext, AHCI_CAPSEXTf_BOH))
+	if (PCIBt(&hba->caps_ext, AHCI_CAPSEXTf_BOH))
 		"\n\tBIOS/OS Handoff supported.";
-	if (Bt(&hba->caps_ext, AHCI_CAPSEXTf_NVMP))
+	if (PCIBt(&hba->caps_ext, AHCI_CAPSEXTf_NVMP))
 		"\n\tNVMHCI Supported (Non-Volatile Memory Host Controller Interface)";
 	"\nHBA BIOS/OS Handoff:   %b", hba->bohc;
-	if (Bt(&hba->bohc, AHCI_BOHCf_BOS))
+	if (PCIBt(&hba->bohc, AHCI_BOHCf_BOS))
 		"\n\tBIOS owns AHCI Controller";
-	if (Bt(&hba->bohc, AHCI_BOHCf_BB))
+	if (PCIBt(&hba->bohc, AHCI_BOHCf_BB))
 		"\n\tBIOS Busy";
 
 	"\n";
@@ -144,20 +151,20 @@ U0 AHCIPortCmdStop(I64 port_num)
 {//Stop command engine on port.
 	CAHCIPort *port = &blkdev.ahci_hba->ports[port_num];
 
-	Btr(&port->command, AHCI_PxCMDf_ST);
+	PCIBtr(&port->command, AHCI_PxCMDf_ST);
-	Btr(&port->command, AHCI_PxCMDf_FRE);
+	PCIBtr(&port->command, AHCI_PxCMDf_FRE);
 
-	while (Bt(&port->command, AHCI_PxCMDf_CR) || Bt(&port->command, AHCI_PxCMDf_FR));
+	while (PCIBt(&port->command, AHCI_PxCMDf_CR) || PCIBt(&port->command, AHCI_PxCMDf_FR));
 }
 
 U0 AHCIPortCmdStart(I64 port_num)
 {//Start command engine on port.
 	CAHCIPort *port = &blkdev.ahci_hba->ports[port_num];
 
-	while (Bt(&port->command, AHCI_PxCMDf_CR));
+	while (PCIBt(&port->command, AHCI_PxCMDf_CR));
 
-	Bts(&port->command, AHCI_PxCMDf_FRE);
+	PCIBts(&port->command, AHCI_PxCMDf_FRE);
-	Bts(&port->command, AHCI_PxCMDf_ST);
+	PCIBts(&port->command, AHCI_PxCMDf_ST);
 }
 
 Bool AHCIPortWait(I64 port_num, F64 timeout, Bool throwing=TRUE)
@@ -224,10 +231,10 @@ U0 AHCIPortCmdWait(I64 port_num, I64 cmd_slot)
 
 	while (TRUE)
 	{
-		if (!Bt(&port->cmd_issue, cmd_slot)) //When command has been processed
+		if (!PCIBt(&port->cmd_issue, cmd_slot)) //When command has been processed
 			break;
 
-		if (Bt(&port->interrupt_status, AHCI_PxIf_TFE)) //Task File Error ($LK,"ATAS_ERR",A="MN:ATAS_ERR"$)
+		if (PCIBt(&port->interrupt_status, AHCI_PxIf_TFE)) //Task File Error ($LK,"ATAS_ERR",A="MN:ATAS_ERR"$)
 		{
 error:
 			if (AHCI_DEBUG)
@@ -243,7 +250,7 @@ error:
 		Yield; // don't hang OS
 	}
 
-	if (Bt(&port->interrupt_status, AHCI_PxIf_TFE)) //Second safety check
+	if (PCIBt(&port->interrupt_status, AHCI_PxIf_TFE)) //Second safety check
 		goto error;
 }
 
@@ -264,7 +271,7 @@ I64 AHCIAtapiCapacityGet(CBlkDev *bd)
 
 	buf = CAlloc(8, sys_task->code_heap);
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A);
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -277,12 +284,12 @@ I64 AHCIAtapiCapacityGet(CBlkDev *bd)
 	cmd_fis	= cmd_table->cmd_fis;
 
 	cmd_fis->type		= FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 	cmd_fis->command	= ATA_PACKET;
 	cmd_table->acmd[0]	= ATAPI_READ_CAPACITY >> 8;
 
 	AHCIPortWait(bd->port_num, tS + 2);
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 
 	try
 		AHCIPortCmdWait(bd->port_num, cmd_slot);
@@ -309,7 +316,7 @@ Bool AHCIAtapiSync(CBlkDev *bd)
 		throw('AHCI');	
 	}
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A);
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -317,12 +324,12 @@ Bool AHCIAtapiSync(CBlkDev *bd)
 	cmd_fis	= cmd_table->cmd_fis;
 
 	cmd_fis->type		= FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 	cmd_fis->command	= ATA_PACKET;
 	cmd_table->acmd[0]	= ATAPI_SYNC_CACHE >> 8;
 
 	AHCIPortWait(bd->port_num, tS + 2);
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 
 	try
 		AHCIPortCmdWait(bd->port_num, cmd_slot);
@@ -350,7 +357,7 @@ Bool AHCIAtapiClose(CBlkDev *bd, I64 close_field=0x200, I64 track=0)
 		throw('AHCI');	
 	}
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A);
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -358,7 +365,7 @@ Bool AHCIAtapiClose(CBlkDev *bd, I64 close_field=0x200, I64 track=0)
 	cmd_fis	= cmd_table->cmd_fis;
 
 	cmd_fis->type		= FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 	cmd_fis->command	= ATA_PACKET;
 
 	MemSet(&close_cmd, 0, sizeof(CAtapiCloseCmd));
@@ -368,7 +375,7 @@ Bool AHCIAtapiClose(CBlkDev *bd, I64 close_field=0x200, I64 track=0)
 	MemCopy(&cmd_table->acmd, &close_cmd, sizeof(CAtapiCloseCmd));
 
 	AHCIPortWait(bd->port_num, tS + 2);
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 
 	try
 		AHCIPortCmdWait(bd->port_num, cmd_slot);
@@ -395,7 +402,7 @@ Bool AHCIAtapiBlank(CBlkDev *bd, Bool minimal=TRUE)
 		throw('AHCI');	
 	}
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A);
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -403,13 +410,13 @@ Bool AHCIAtapiBlank(CBlkDev *bd, Bool minimal=TRUE)
 	cmd_fis	= cmd_table->cmd_fis;
 
 	cmd_fis->type		= FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 	cmd_fis->command	= ATA_PACKET;
 	cmd_table->acmd[0]	= ATAPI_BLANK >> 8;
 	cmd_table->acmd[1]	= minimal;
 
 	AHCIPortWait(bd->port_num, tS + 2);
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 
 	try
 		AHCIPortCmdWait(bd->port_num, cmd_slot);
@@ -445,7 +452,7 @@ Bool AHCIAtapiModeWriteSelect(CBlkDev *bd)
 	mode_list->page.block_type			= 8;			// Mode 1: 2048-size blocks of data
 	mode_list->page.packet_size			= EndianU32(16);// Number of User Data Blocks per Fixed Packet. DVD media default: 16.
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A);
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -458,12 +465,12 @@ Bool AHCIAtapiModeWriteSelect(CBlkDev *bd)
 
 	cmd_fis->type		= FISt_H2D;
 	cmd_fis->feature_low= 0x01; // Core Feature, 'mandatory'
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 	cmd_fis->command	= ATA_PACKET;
 	cmd_table->acmd[0]	= ATAPI_MODE_SELECT >> 8;
 
 	AHCIPortWait(bd->port_num, tS + 2);
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 
 	try
 		AHCIPortCmdWait(bd->port_num, cmd_slot);
@@ -490,7 +497,7 @@ Bool AHCIAtapiStartStop(CBlkDev *bd, Bool start)
 		throw('AHCI');	
 	}
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A);
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A);
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -498,13 +505,13 @@ Bool AHCIAtapiStartStop(CBlkDev *bd, Bool start)
 	cmd_fis	= cmd_table->cmd_fis;
 
 	cmd_fis->type		= FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 	cmd_fis->command	= ATA_PACKET;
 	cmd_table->acmd[0]	= ATAPI_START_STOP_UNIT >> 8;
 	cmd_table->acmd[4]	= start;
 
 	AHCIPortWait(bd->port_num, tS + 2);
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 
 	try
 		AHCIPortCmdWait(bd->port_num, cmd_slot);
@@ -566,7 +573,7 @@ U0 AHCIPortIdentify(CBlkDev *bd)
 	cmd_fis = cmd_table->cmd_fis;
 
 	cmd_fis->type = FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS.
 
 	if (port->signature == AHCI_PxSIG_ATAPI)
 		cmd_fis->command = ATA_IDENTIFY_PACKET;
@@ -578,7 +585,7 @@ U0 AHCIPortIdentify(CBlkDev *bd)
 	//Wait on previous command to complete.
 	AHCIPortWait(bd->port_num, tS + 2);
 
-	Bts(&port->cmd_issue, cmd_slot); //Issue the command.
+	PCIBts(&port->cmd_issue, cmd_slot); //Issue the command.
 	AHCIPortCmdWait(bd->port_num, cmd_slot);
 
 	Free(bd->dev_id_record);
@@ -608,14 +615,14 @@ U8 *AHCIBufferAlign(CBlkDev *bd, U8 *user_buf, I64 buf_size, Bool write)
 		Free(bd->prd_buf);
 		bd->prd_buf = MAlloc(buf_size, sys_task->code_heap);
 
-		Bts(&bd->flags, BDf_INTERNAL_BUF);
+		PCIBts(&bd->flags, BDf_INTERNAL_BUF);
 
 		if (write)
 			MemCopy(bd->prd_buf, user_buf, buf_size);
 
 		return bd->prd_buf;
 	}
-	Btr(&bd->flags, BDF_INTERNAL_BUF);
+	PCIBtr(&bd->flags, BDF_INTERNAL_BUF);
 
 	return user_buf;
 }
@@ -650,16 +657,11 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
 	buf_size = buf_size_tmp = count * BLK_SIZE;
 	prdt_len = (buf_size - 1) / AHCI_PRD_MAX_BYTES + 1;
 
-//	"PRDT Length:\t%d\n", prdt_len;
-//	"Count:\t\t\t%d\n", count;
-//	"Buffer size:\t%X\n", buf_size;
-
 	cmd_header->prdt_len = prdt_len; //Set PRD table length in cmd header.
 	//Set 'write' bit depending on 'write' argument.
 	BEqual(&cmd_header->desc, AHCI_CH_DESCf_W, write);
 
 	internal_buf = internal_buf_tmp = AHCIBufferAlign(bd, buf, buf_size, write);
-//	"Buffer:\t\t\t0x%X\n", internal_buf;
 
 	if (!internal_buf) throw('AHCI'); //Will probably never happen.
 
@@ -675,9 +677,6 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
 		else
 			byte_count = buf_size_tmp;
 
-//		"prdt[%d].data_base_addr  = 0x%X\n"  , i, internal_buf_tmp;
-//		"prdt[%d].data_byte_count = 0x%X\n\n", i, byte_count;
-
 		cmd_table->prdt[i].data_base = internal_buf_tmp;
 		cmd_table->prdt[i].data_byte_count = byte_count - 1; //Zero-based value
 		buf_size_tmp -= byte_count;
@@ -687,7 +686,7 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
 	cmd_fis = cmd_table->cmd_fis;
 
 	cmd_fis->type = FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS
 
 	if (write) //Assumed support for LBA48.
 		cmd_fis->command = ATA_WRITE_DMA_EXT;
@@ -707,7 +706,7 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
 	//Wait on previous command to complete.
 	AHCIPortWait(bd->port_num, tS + 2);
 	//Issue the command.
-	Bts(&port->cmd_issue, cmd_slot);
+	PCIBts(&port->cmd_issue, cmd_slot);
 	//Wait on command to finish.
 	AHCIPortCmdWait(bd->port_num, cmd_slot);
 
@@ -725,27 +724,23 @@ I64 AHCIAtaBlksRW(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool write)
 }
 
 I64 AHCIAtaBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
-{//Read 'blk' amount of blocks from AHCI disk device. Returns num of bytes transferred between disk and memory.
+{//Read 'count' amount of blocks from block 'blk' in AHCI disk device. Returns num of bytes transferred between disk and memory.
 	I64 byte_count = 0;
 	if (!count)
 		return 0;
 	if (count <= AHCI_PRDT_MAX_BLOCKS)
 	{
-//		"$$GREEN$$READ less than MAX_BLOCKS$$FG$$\n";
 		return AHCIAtaBlksRW(bd, buf, blk, count, FALSE);
 	}
 	else
 	{
-//		"$$GREEN$$READ greater than MAX_BLOCKS\n";
-//		"read count: %d\n$$FG$$", count;
 		while (count > AHCI_PRDT_MAX_BLOCKS)
 		{
 			byte_count += AHCIAtaBlksRW(bd, buf, blk, AHCI_PRDT_MAX_BLOCKS, FALSE);
 			count -= AHCI_PRDT_MAX_BLOCKS;
 			blk += AHCI_PRDT_MAX_BLOCKS;
 			buf += AHCI_PRDT_MAX_BLOCKS * BLK_SIZE;
-//			"$$GREEN$$read count: %d\n$$FG$$", count;
+		}
-		}$ER$
 		byte_count += AHCIAtaBlksRW(bd, buf, blk, count, FALSE);
 	}
 
@@ -755,27 +750,23 @@ I64 AHCIAtaBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
 }
 
 I64 AHCIAtaBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
-{//Write 'blk' amount of blocks to AHCI disk device. Returns num of bytes transferred between memory and disk.
+{//Write 'count' amount of blocks from block 'blk' in AHCI disk device. Returns num of bytes transferred between memory and disk.
 	I64  byte_count = 0;
 
 	if (!count)
 		return 0;
 	if (count <= AHCI_PRDT_MAX_BLOCKS)
 	{
-//		"$$GREEN$$WRITE less than MAX_BLOCKS$$FG$$\n";
 		return AHCIAtaBlksRW(bd, buf, blk, count, TRUE);
 	}
 	else
 	{
-//		"$$GREEN$$WRITE greater than MAX_BLOCKS\n";
-//		"write count: %d$$FG$$\n", count;
 		while (count > AHCI_PRDT_MAX_BLOCKS)
 		{
 			byte_count += AHCIAtaBlksRW(bd, buf, blk, AHCI_PRDT_MAX_BLOCKS, TRUE);
 			count -= AHCI_PRDT_MAX_BLOCKS;
 			blk += AHCI_PRDT_MAX_BLOCKS;
 			buf += AHCI_PRDT_MAX_BLOCKS * BLK_SIZE;
-//			"$$GREEN$$write count: %d\n$$FG$$\n", count;
 		}
 		byte_count += AHCIAtaBlksRW(bd, buf, blk, count, TRUE);
 	}
@@ -784,7 +775,7 @@ I64 AHCIAtaBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count)
 }
 
 I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
-{//Read 'blk' amount of blocks from from AHCI ATAPI device. Returns num of bytes transferred.
+{//Read 'count' amount of blocks from block 'blk' in AHCI ATAPI device. Returns num of bytes transferred.
 	CPortCmdTable	*cmd_table;
 	CFisH2D			*cmd_fis;
 	CAHCIPort		*port = bd->ahci_port;
@@ -808,18 +799,13 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 	buf_size = buf_size_tmp = count * DVD_BLK_SIZE;
 	prdt_len = (buf_size - 1) / AHCI_PRD_MAX_BYTES + 1;
 
-//	"PRDT Length:\t%d\n", prdt_len;
-//	"Count:\t\t\t%d\n", count;
-//	"Buffer size:\t%X\n", buf_size;
-
 	cmd_header->prdt_len = prdt_len;
 
 	internal_buf = internal_buf_tmp = AHCIBufferAlign(bd, buf, buf_size, FALSE);
-//	"Buffer:\t\t\t0x%X\n", internal_buf;
 
 	if (!internal_buf) throw('AHCI');
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A); //Set ATAPI flag in command header
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A); //Set ATAPI flag in command header
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -831,8 +817,6 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 		else
 			byte_count = buf_size_tmp;
 
-//		"prdt[%d].data_base_addr  = 0x%X\n"  , i, internal_buf_tmp;
-//		"prdt[%d].data_byte_count = 0x%X\n\n", i, byte_count;
 		cmd_table->prdt[i].data_base = internal_buf_tmp;
 		cmd_table->prdt[i].data_byte_count = byte_count - 1; //Zero-based value
 
@@ -844,7 +828,7 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 	MemSet(cmd_fis, 0, sizeof(CFisH2D));
 
 	cmd_fis->type = FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS 
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS 
 
 	cmd_fis->feature_low = 1; //Necessary?
 	cmd_fis->command	 = ATA_PACKET;
@@ -859,7 +843,7 @@ I64 AHCIAtapiBlksRead(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 
 	AHCIPortWait(bd->port_num, tS + 2);
 	
-	Bts(&port->cmd_issue, cmd_slot);
+	PCIBts(&port->cmd_issue, cmd_slot);
 	AHCIPortCmdWait(bd->port_num, cmd_slot);
 	
 	if (bd->flags & BDF_INTERNAL_BUF)
@@ -908,8 +892,8 @@ I64 AHCIAtapiBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 
 	if (!internal_buf) throw('AHCI');
 
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_A); //Set ATAPI flag in command header
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_A); //Set ATAPI flag in command header
-	Bts(&cmd_header->desc, AHCI_CH_DESCf_W); //Set WRITE flag in command header
+	PCIBts(&cmd_header->desc, AHCI_CH_DESCf_W); //Set WRITE flag in command header
 
 	cmd_table = cmd_header->cmd_table_base;
 	MemSet(cmd_table, 0, sizeof(CPortCmdTable));
@@ -931,7 +915,7 @@ I64 AHCIAtapiBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 	MemSet(cmd_fis, 0, sizeof(CFisH2D));
 
 	cmd_fis->type = FISt_H2D;
-	Bts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS 
+	PCIBts(&cmd_fis->desc, AHCI_CF_DESCf_C); //Set Command bit in H2D FIS 
 
 	cmd_fis->command	 = ATA_PACKET;
 
@@ -944,7 +928,7 @@ I64 AHCIAtapiBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 
 	AHCIPortWait(bd->port_num, tS + 2);
 	
-	Bts(&port->cmd_issue, cmd_slot);
+	PCIBts(&port->cmd_issue, cmd_slot);
 	AHCIPortCmdWait(bd->port_num, cmd_slot);
 	
 	if (bd->flags & BDF_INTERNAL_BUF)
@@ -961,8 +945,9 @@ I64 AHCIAtapiBlksWrite(CBlkDev *bd, U8 *buf, I64 blk, I64 count, Bool lock=TRUE)
 
 U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num)
 {//Initialize base addresses for command list and FIS receive area and start command execution on port.
-	CPortCmdHeader *cmd_header;
+	CPortCmdHeader	*cmd_header,
-	I64				i;
+					*cmd_header_base;
+	I64				 i;
 
 	if (!(port->signature == AHCI_PxSIG_ATAPI || port->signature == AHCI_PxSIG_ATA))
 		Debug("AHCI Port/BlkDev error: Invalid Port Signature");
@@ -992,9 +977,12 @@ U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num)
 	port->fis_base = CAllocAligned(sizeof(CFisReceived), 256, sys_task->code_heap);
 	port->fis_base_upper = 0;
 
+
+	cmd_header_base = port->cmd_list_base;
 	for (i = 0; i < blkdev.cmd_slot_count; i++)
 	{
-		cmd_header = &port->cmd_list_base(CPortCmdHeader *)[i];
+//		cmd_header = &port->cmd_list_base(CPortCmdHeader *)[i];
+		cmd_header = &cmd_header_base[i];
 		//Write Command FIS Length (CFL, a fixed size) in bits 4:0 of the desc. Takes size in U32s.
 		cmd_header->desc = sizeof(CFisH2D) / sizeof(U32);
 
@@ -1009,7 +997,7 @@ U0 AHCIPortInit(CBlkDev *bd, CAHCIPort *port, I64 port_num)
 Bool AHCIAtaInit(CBlkDev *bd)
 {
 	Bool			unlock, okay = FALSE;
-	CPortCmdHeader *cmd_header;
+	CPortCmdHeader *cmd_header, *cmd_header_base;
 	I64				i;
 
 	if (!bd->ahci_port)
@@ -1022,7 +1010,9 @@ Bool AHCIAtaInit(CBlkDev *bd)
 	{
 		for (i = 0; i < blkdev.cmd_slot_count; i++)
 		{
-			cmd_header = &bd->ahci_port->cmd_list_base(CPortCmdHeader *)[i];
+			cmd_header_base = bd->ahci_port->cmd_list_base;
+//			cmd_header = &bd->ahci_port->cmd_list_base(CPortCmdHeader *)[i];
+			cmd_header = &cmd_header_base[i];
 			Free(cmd_header->cmd_table_base);
 		}
 		Free(bd->ahci_port->cmd_list_base);
@@ -1054,9 +1044,9 @@ Bool AHCIAtaInit(CBlkDev *bd)
 
 U0 AHCIHbaReset()
 {
-	Bts(&blkdev.ahci_hba->ghc, AHCI_GHCf_HBA_RESET);
+	PCIBts(&blkdev.ahci_hba->ghc, AHCI_GHCf_HBA_RESET);
-	while (Bt(&blkdev.ahci_hba->ghc, AHCI_GHCf_HBA_RESET));
+	while (PCIBt(&blkdev.ahci_hba->ghc, AHCI_GHCf_HBA_RESET));
-	Bts(&blkdev.ahci_hba->ghc, AHCI_GHCf_AHCI_ENABLE);
+	PCIBts(&blkdev.ahci_hba->ghc, AHCI_GHCf_AHCI_ENABLE);
 }
 
 U0 AHCIInit()
@@ -1080,19 +1070,19 @@ U0 AHCIInit()
 	blkdev.ahci_hba = hba;
 
 
-	Bts(&blkdev.ahci_hba->ghc, AHCI_GHCf_AHCI_ENABLE);
+	PCIBts(&blkdev.ahci_hba->ghc, AHCI_GHCf_AHCI_ENABLE);
 	"AHCI: GHC.AE set\n";
 
 	//Transferring ownership from BIOS if supported.
-	if (Bt(&hba->caps_ext, AHCI_CAPSEXTf_BOH))
+	if (PCIBt(&hba->caps_ext, AHCI_CAPSEXTf_BOH))
 	{
-		Bts(&hba->bohc, AHCI_BOHCf_OOS);
+		PCIBts(&hba->bohc, AHCI_BOHCf_OOS);
 		"AHCI: Transferring ownership from BIOS\n";
 
-		while (Bt(&hba->bohc, AHCI_BOHCf_BOS));
+		while (PCIBt(&hba->bohc, AHCI_BOHCf_BOS));
 
 		Sleep(25);
-		if (Bt(&hba->bohc, AHCI_BOHCf_BB)) //if Bios Busy is still set after 25 mS, wait 2 seconds.
+		if (PCIBt(&hba->bohc, AHCI_BOHCf_BB)) //if Bios Busy is still set after 25 mS, wait 2 seconds.
 			Sleep(2000);
 	}
 
@@ -1101,7 +1091,7 @@ U0 AHCIInit()
 
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 	{
-		if (Bt(&hba->ports_implemented, i))
+		if (PCIBt(&hba->ports_implemented, i))
 		{//$BK,1$Make ports idle?$BK,0$
 			port = &hba->ports[i];
 			"AHCI: Port %2d signature 0x%08X ", i, port->signature;
@@ -1109,7 +1099,7 @@ U0 AHCIInit()
 			{
 				if (port->signature == AHCI_PxSIG_ATAPI)
 				{
-					Bts(&port->command, AHCI_PxCMDf_ATAPI);
+					PCIBts(&port->command, AHCI_PxCMDf_ATAPI);
 					"ATAPI drive\n";
 				}
 				else if (port->signature == AHCI_PxSIG_ATA)
@@ -1139,7 +1129,7 @@ Bool AHCIBootDVDProbeAll(CBlkDev *bd)
 
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 	{
-		if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 			"AHCI: BootDVDProbeAll: Saw port at %2d with signature 0x%0X\n", i, port->signature;
@@ -1163,7 +1153,17 @@ Bool AHCIBootDVDProbeAll(CBlkDev *bd)
 						return TRUE;
 					}
 					else
-						"AHCI: Did not find matching sys_compile_time on Port %d\n", i;
+						"AHCI: Did not find matching sys_compile_time at BLK %d on Port %d\n", sys_boot_blk, i;
+
+					AHCIAtapiBlksRead(bd, buf, 0, 1, FALSE);
+
+					if (!MemCompare(buf + 568, sys_disk_uuid, 16))
+					{
+						"AHCI: Found sys_disk_uuid at BLK 0 byte 568 on Port %d\n", i;
+						"______________________\n";
+						return TRUE;
+					}
+
 				}
 				catch
 				{

src/Kernel/BlkDev/DiskATAId.ZC

@@ -29,7 +29,7 @@ I64 MountAHCIAuto()
 		// if boot-drive blkdev exists, do a SATA port iteration to mount it first
 		"( ':' BlkDev at 0x%0X )\n", bd;
 		for (i = 0; i < AHCI_MAX_PORTS; i++)
-			if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+			if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 			{
 				port = &blkdev.ahci_hba->ports[i];
 
@@ -55,7 +55,7 @@ I64 MountAHCIAuto()
 	// do a 2nd iteration to mount remaining drives
 	// (we will end up trying to boot off whichever drive/partition ends up at chosen letter)
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
-		if (i != ata_port && i != atapi_port && Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (i != ata_port && i != atapi_port && PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 

src/Kernel/BlkDev/DiskCDDVD.ZC

@@ -27,7 +27,8 @@ Bool ISOInit(CDrive *drive, I64 blk)
 						case ISOT_BOOT_RECORD:
 							drv_offset += (2 * DVD_BLK_SIZE + DVD_BLK_SIZE) / BLK_SIZE;
 							break;
-
+// TODO FIXME: ISOT_PRI_VOL_DESC isn't currently implemented, meaning only ISO9660 ISOs with Joliet filesystem are supported !
+//						case ISOT_PRI_VOL_DESC:
 						case ISOT_SUPPLEMENTARY_DESC:
 							de = &iso->root_dir_record;
 							drive->size = iso->vol_space_size.little * bd->blk_size >> BLK_SIZE_BITS;

src/Kernel/BlkDev/DiskClus.ZC

@@ -106,7 +106,7 @@ I64 ClusBlkRead(CDrive *drive, U8 *buf, I64 c, I64 blks)
 
 I64 ClusRead(CDrive *drive, U8 *buf, I64 c, I64 count)
 {//Read cluster count from drive to buf.
-	return ClusBlkRead(drive, buf, c, count*drive->spc);
+	return ClusBlkRead(drive, buf, c, count * drive->spc);
 }
 
 I64 ClusBlkWrite(CDrive *drive, U8 *buf, I64 c, I64 blks)

src/Kernel/BlkDev/DiskCopy.ZC

@@ -29,7 +29,7 @@ Bool CopySingleZ(U8 *f1, U8 *f2) //Just one file
 Bool CopySingle(U8 *f1, U8 *f2) //Just one file
 {
 	U8		*absf1 = FileNameAbs(f1), *absf2 = FileNameAbs(f2), *buf;
-	I64		 count, n, size, attr1 = FileAttr(f1), attr2 = FileAttr(f2), i, j;
+	I64		 count, n, size, attr1 = FileAttr(f1), attr2 = FileAttr(f2), i, j, time = counts.jiffies;
 	CFile	*in_file = NULL, *out_file = NULL;
 
 	if (!StrCompare(absf1, absf2))
@@ -57,7 +57,7 @@ Bool CopySingle(U8 *f1, U8 *f2) //Just one file
 			out_file = FOpen(f2, "w", count);
 		if (out_file)
 		{
-			"Copying %s to %s\n", f1, f2;
+			"Copying %s to %s", f1, f2;
 			j = size;
 			while (count > 0)
 			{
@@ -65,6 +65,11 @@ Bool CopySingle(U8 *f1, U8 *f2) //Just one file
 				{
 					n = COPY_BUF_BLKS;
 					i = n << BLK_SIZE_BITS;
+					if (counts.jiffies > time + 2000)
+					{
+						"\n [ %0.2f%% ]", 100 * ToF64(size - j) / size;
+						time = counts.jiffies;
+					}
 				}
 				else
 				{
@@ -76,6 +81,7 @@ Bool CopySingle(U8 *f1, U8 *f2) //Just one file
 				count -= n;
 				j -= n << BLK_SIZE_BITS;
 			}
+			"\n";
 			out_file->flags			|= FF_USE_OLD_DATETIME;
 			out_file->de.datetime	= in_file->de.datetime;
 			out_file->de.size		= size;

src/Kernel/BlkDev/FileSysFAT.ZC

@@ -1045,8 +1045,7 @@ Bool FAT32MkDir(CDrive *drive, U8 *cur_dir, U8 *name, I64 entry_count)
 {
 	I64				 c, cur_dir_clus = Name2DirClus(drive, cur_dir), 
 					 //Rough estimate of size
-					 size = CeilU64((entry_count + 2) << FAT32_ENTRIES_BITS,
+					 size = CeilU64((entry_count + 2) << FAT32_ENTRIES_BITS, drive->spc << BLK_SIZE_BITS);
-					 drive->spc << BLK_SIZE_BITS);
 	U8				*buf = CAlloc(size);
 	CDirEntry		 d_native;
 	CFAT32DirEntry	*dFAT = buf;

src/Kernel/BlkDev/FileSysISO.ZC

@@ -176,7 +176,8 @@ U8 *ISOFileRead(CDrive *drive, U8 *cur_dir, U8 *filename, I64 *_size, I64 *_attr
 				buf = MAlloc(blk_cnt << BLK_SIZE_BITS + 1);
 				c = de.clus;
 				c = ClusBlkRead(drive, buf, c, blk_cnt);
-				buf[de.size] = 0;	//Terminate *_size = de.size;
+				buf[de.size] = 0;	//Terminate
+				*_size = de.size;
 				*_attr = FileAttr(de.name, de.attr);
 			}
 			DriveUnlock(drive);

src/Kernel/Display.ZC

@@ -60,17 +60,17 @@ See also $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
 		{//Scroll screen down
 
 			MemCopy(text.fb_alias,
-					text.fb_alias		+ sys_vbe_mode.width * FONT_HEIGHT,
+					text.fb_alias		+ sys_framebuffer_width * FONT_HEIGHT,
-					(text.screen_size	- sys_vbe_mode.width * FONT_HEIGHT) * sizeof(U32));
+					(text.screen_size	- sys_framebuffer_width * FONT_HEIGHT) * sizeof(U32));
 
-			MemSetU32(text.fb_alias + text.screen_size - sys_vbe_mode.width * FONT_HEIGHT, BLACK32, sys_vbe_mode.width * FONT_HEIGHT);
+			MemSetU32(text.fb_alias + text.screen_size - sys_framebuffer_width * FONT_HEIGHT, BLACK32, sys_framebuffer_width * FONT_HEIGHT);
 			text.raw_col -= text.cols ;
 			row = text.rows - 1;
 		}
 		x = col * FONT_WIDTH;
 		y = row * FONT_HEIGHT;
 		ch_bitmap = text.font[ch & 0xFF];
-		framebuffer = text.fb_alias + sys_vbe_mode.width * y + x;
+		framebuffer = text.fb_alias + sys_framebuffer_width * y + x;
 
 		PUSHFD
 		CLI
@@ -81,7 +81,7 @@ See also $LK,"GrUpdateScreen",A="MN:GrUpdateScreen"$().
 			else
 				*framebuffer++ = BLACK32;
 			if (i & (FONT_WIDTH - 1) == FONT_WIDTH - 1)
-				framebuffer += sys_vbe_mode.width - FONT_WIDTH;
+				framebuffer += sys_framebuffer_width - FONT_WIDTH;
 			ch_bitmap >>= 1;
 		}
 		POPFD

src/Kernel/FontAux.ZC

@@ -0,0 +1,258 @@
+public U64 sys_font_aux[256] = {
+0x0000000000000000,
+0x0000000000000000,
+0x000000FF00000000,
+0x000000FF00FF0000,
+0x1818181818181818,
+0x6C6C6C6C6C6C6C6C,
+0x181818F800000000,
+0x6C6C6CEC0CFC0000,
+0x1818181F00000000,
+0x6C6C6C6F607F0000,
+0x000000F818181818,
+0x000000FC0CEC6C6C,
+0x0000001F18181818,
+0x0000007F606F6C6C,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0000000000000000,
+0x0008000000000000,//
+0x0000000000000000,// 
+0x000C000C0C1E1E0C,//!
+0x0000000012243636,//"
+0x0036367F367F3636,//#
+0x00083F683E0B7E08,//$$
+0x0023562C18326542,//%
+0x006E333B6E1C361C,//&
+0x0000000004080C0C,//'
+0x00180C0606060C18,//(
+0x00060C1818180C06,//)
+0x0000361C7F1C3600,//*
+0x000008083E080800,//+
+0x04080C0C00000000,//,
+0x000000007E000000,//-
+0x000C0C0000000000,//.
+0x000103060C183020,///
+0x003E67636363733E,//0
+0x007E18181818181C,//1
+0x007F03061C30633E,//2
+0x003E63603C60633E,//3
+0x0060607F63666C78,//4
+0x003E6360603F037F,//5
+0x003E63633F03633E,//6
+0x0003060C1830637F,//7
+0x003E63633E63633E,//8
+0x003E63607E63633E,//9
+0x000C0C00000C0C00,//:
+0x0004080C000C0C00,//;
+0x0030180C060C1830,//<
+0x0000003E003E0000,//=
+0x00060C1830180C06,//>
+0x000C000C3C60633E,//?
+0x007E037B6B7B633E,//@
+0x0063637F6363361C,//A
+0x003F63633F63633F,//B
+0x003E63030303633E,//C
+0x001F33636363331F,//D
+0x007F03031F03037F,//E
+0x000303031F03037F,//F
+0x007E63637B03037E,//G
+0x006363637F636363,//H
+0x007E18181818187E,//I
+0x003E636360606078,//J
+0x0063331B0F1B3363,//K
+0x007F030303030303,//L
+0x006363636B7F7763,//M
+0x006363737B6F6763,//N
+0x003E63636363633E,//O
+0x000303033F63633F,//P
+0x005E337B6B63633E,//Q
+0x0063331B3F63633F,//R
+0x003E63603E03633E,//S
+0x001818181818187E,//T
+0x003E636363636363,//U
+0x00081C3663636363,//V
+0x006363777F6B6363,//W
+0x0063773E1C3E7763,//X
+0x001818183C666666,//Y
+0x007F070E1C38707F,//Z
+0x001E06060606061E,//[
+0x00406030180C0602,//\
+0x001E18181818181E,//]
+0x0000000063361C08,//^
+0x00FF000000000000,//_
+0x000000000030180C,//`
+0x007E637E603E0000,//a
+0x003F6363633F0303,//b
+0x003E6303633E0000,//c
+0x007E6363637E6060,//d
+0x003E037F633E0000,//e
+0x000C0C0C7F0C0C78,//f
+0x3E607E63637E0000,//g
+0x00636363633F0303,//h
+0x007E18181C001818,//i
+0x003E636060600060,//j
+0x0063331F33630303,//k
+0x0030181818181818,//l
+0x006B6B6B6B3F0000,//m
+0x00636363633F0000,//n
+0x003E6363633E0000,//o
+0x03033F63633F0000,//p
+0x60607E63637E0000,//q
+0x00030303673B0000,//r
+0x003F607F037E0000,//s
+0x00181818187E1818,//t
+0x003E636363630000,//u
+0x00081C3663630000,//v
+0x00367F6B6B630000,//w
+0x00773E1C3E770000,//x
+0x070C1C3663630000,//y
+0x007F0E1C387F0000,//z
+0x007018180C181870,//{
+0x0018181818181818,//|
+0x00070C0C180C0C07,//}
+0x0000003B6B6E0000,//~
+0xFFFFFFFFFFFFFFFF,
+0x0004083E6303633E,//€
+0x003E636363003600,//<2F>
+0x003E037F633E0810,//‚
+0x007E637E603E1408,//ƒ
+0x007E637E603E0036,//„
+0x007E637E603E0804,//…
+0x007E637E603E0C0C,//†
+0x0004083E03033E00,//‡
+0x003E037F633E1408,//ˆ
+0x003E037F633E0036,//‰
+0x003E037F633E0804,//Š
+0x007E18181C003636,//‹
+0x007E18181C001408,//Œ
+0x007E18181C000804,//<2F>
+0x00637F63361C0036,//Ž
+0x00637F63361C141C,//<2F>
+0x007F031F037F0810,//<2F>
+0x007E197E583E0000,//‘
+0x007B1B1F7B1B1E7C,//’
+0x003E63633E001408,//“
+0x003E63633E000036,//”
+0x003E63633E000804,//•
+0x003E636363001408,//–
+0x003E636363000804,//—
+0x0F0C1C3663630063,//˜
+0x003E6363633E0036,//™
+0x003E636363630036,//š
+0x00083E6B0B6B3E08,//›
+0x007F06061F46663C,//œ
+0x00083E083E1C3663,//<2F>
+0x70337B332F1B1B0F,//ž
+0x0E1B18187E18D870,//Ÿ
+0x007E637E603E0810,// 
+0x007E18181C000810,//¡
+0x003E63633E000810,//¢
+0x003E636363000810,//£
+0x00636363633F1428,//¤
+0x0063736B67631428,//¥
+0x007E007E637E603E,//¦
+0x00007E003C66663C,//§
+0x003E63031E180018,//¨
+0x00000C06FF060C00,//©
+0x000030303F000000,//ª
+0x0070117244750911,//«
+0x0040417A54654911,//¬
+0x00183C3C18180018,//­
+0x00006C361B366C00,//®
+0x00001B366C361B00,//¯
+0x1144114411441144,//°
+0x55AA55AA55AA55AA,//±
+0xEEBBEEBBEEBBEEBB,//²
+0x0808080808080808,//³
+0x080808080F080808,//´
+0x0808080F0F0F0808,//µ
+0x3C3C3C3C3F3C3C3C,//¶
+0x3C3C3C3C3F000000,//·
+0x0808080F0F0F0000,//¸
+0x3C3C3C3F3F3F3C3C,//¹
+0x3C3C3C3C3C3C3C3C,//º
+0x3C3C3E3F1F0F0000,//»
+0x0000000F1F3F3E3C,//¼
+0x000000003F3C3C3C,//½
+0x0000000F0F0F0808,//¾
+0x0808080807000000,//¿
+0x00000000F0080808,//À
+0x00000000FF080808,//Á
+0x08080808FF000000,//Â
+0x08080808F8080808,//Ã
+0x00000000FF000000,//Ä
+0x08080808FF080808,//Å
+0x080808F8F8F80808,//Æ
+0x3C3C3C3CFC3C3C3C,//Ç
+0x000000F0F8FC7C3C,//È
+0x3C3C7CFCF8F00000,//É
+0x000000FFFFFF3C3C,//Ê
+0x3C3C3CFFFFFF0000,//Ë
+0x3C3C3CFCFCFC3C3C,//Ì
+0x000000FFFFFF0000,//Í
+0x3C3C3CFFFFFF3C3C,//Î
+0x000000FFFFFF0808,//Ï
+0x00000000FF3C3C3C,//Ð
+0x080808FFFFFF0000,//Ñ
+0x3C3C3C3CFF000000,//Ò
+0x00000000FC3C3C3C,//Ó
+0x000000F8F8F80808,//Ô
+0x080808F8F8F80000,//Õ
+0x3C3C3C3CFC000000,//Ö
+0x3C3C3C3CFF3C3C3C,//×
+0x080808FFFFFF0808,//Ø
+0x0000000007080808,//Ù
+0x08080808F0000000,//Ú
+0xFFFFFFFFFFFFFFFF,//Û
+0xFFFFFFFF00000000,//Ü
+0x0F0F0F0F0F0F0F0F,//Ý
+0xF0F0F0F0F0F0F0F0,//Þ
+0x00000000FFFFFFFF,//ß
+0x005E6363635E0000,//à
+0x00037F63633B633E,//á
+0x000303030303037F,//â
+0x00363636367F0000,//ã
+0x007F060C180C067F,//ä
+0x001E3333337E0000,//å
+0x00031F3333330000,//æ
+0x001818181A7C0000,//ç
+0x00083E6B6B6B3E08,//è
+0x00003E637F633E00,//é
+0x007736636363633E,//ê
+0x003E63633E0C067F,//ë
+0x0000364949360000,//ì
+0x0002043E493E1020,//í
+0x003E630E633E0000,//î
+0x006363636363361C,//ï
+0x00003E003E003E00,//ð
+0x003E0008083E0808,//ñ
+0x003E000C1830180C,//ò
+0x003E00180C060C18,//ó
+0x1818181818D8D870,//ô
+0x0E1B1B1818181818,//õ
+0x0008003E00080000,//ö
+0x003B6B6E003B6B6E,//÷
+0x000000001C36361C,//ø
+0x0000001818000000,//ù
+0x0000001800000000,//ú
+0x001C1E1B18181878,//û
+0x000000001B1B1B0F,//ü
+0x0000003F061C331E,//ý
+0x00003C3C3C3C0000,//þ
+0xFFFFFFFFFFFFFFFF,//ÿ
+};

src/Kernel/KConfig.ZC

@@ -26,7 +26,6 @@ class CKConfig
 	CDoc	*add_dev;
 	U8		*debug_distro_file, *debug_distro_start;
 	U8		*home_dir;
-	U16		screen_width, screen_height;
 	Bool	opts[CONFIG_OPTIONS_NUM];
 	U8		mem_init_val, heap_init_val, var_init_val, boot_drive_let, mount_ide_auto_hd_let, mount_ide_auto_cd_let;
 };
@@ -168,27 +167,11 @@ U0 KConfigOptions(CKConfig *c)
 
 CKConfig *KConfigNew()
 {
-	I64		  resolution_num;
 	CKConfig *c = CAlloc(sizeof(CKConfig));
 
 	c->add_dev = KConfigAddDev(c);
 	c->home_dir = StrNew("::/Home");
-
-	VideoRep(FALSE);
-	resolution_num = I64Get("Enter list number of desired resolution, "
-							"or desired width. ($$PURPLE$$<ENTER>$$FG$$ for auto maximum): ",, 1);
-	if (resolution_num <= VBE_MODES_NUM)
-	{
-		c->screen_width  = sys_vbe_modes[resolution_num - 1].width;
-		c->screen_height = sys_vbe_modes[resolution_num - 1].height;
-	}
-	else
-	{
-		c->screen_width  = resolution_num;
-		c->screen_height = I64Get("Enter Height: ",, 0);
-	}
  
-
 	c->disk_cache_size_exp = StrGet("\nDisk Cache Size in Bytes, gets rounded-up funny, "
 									"($$PURPLE$$<ENTER>$$FG$$ will use default.):",
 									"Scale2Mem(0x80000,0x8000000)");

src/Kernel/KDebug.ZC

@@ -1,17 +1,21 @@
 Bool CheckPtr(U8 *ptr)
 {//Check if address is valid pointer.
+	CZXE *zxe = mem_boot_base - sizeof(CZXE);
+
 	if (mem_heap_base <= ptr <= mem_mapped_space)
 		return *MemPageTable(ptr) & 1;
 	else
-		return mem_boot_base < ptr < VGAM_GRAPHICS;
+		return mem_boot_base < ptr < mem_boot_base + zxe->file_size - 1 - sizeof(CZXE);
 }
 
 Bool CheckCodePtr(U8 *ptr)
 {//Check if address is valid code address.
+	CZXE *zxe = mem_boot_base - sizeof(CZXE);
+
 	if (mem_heap_base <= ptr <= mem_heap_limit)
 		return *MemPageTable(ptr) & 1;
 	else
-		return mem_boot_base < ptr < VGAM_GRAPHICS;
+		return mem_boot_base < ptr < mem_boot_base + zxe->file_size - 1 - sizeof(CZXE);
 }
 
 Bool CheckOnStack(U8 *ptr, CTask *task=NULL)

src/Kernel/KGlobals.ZC

@@ -13,7 +13,7 @@ CTask	*sys_winmgr_task,
 U8		*rev_bits_table; //Table with U8 bits reversed
 CDate	 local_time_offset;
 F64		*pow10_I64,
-		 sys_os_version = 1.13;
+		 sys_os_version = 2.00;
 
 CAutoCompleteDictGlobals acd;
 CAutoCompleteGlobals	 ac;

src/Kernel/KMain.ZC

@@ -64,33 +64,18 @@ U0 SysGlobalsInit()
 	QueueInit(&dev.pci_head);
 	dev.mem64_ptr = mem_mapped_space;
 
-	if (sys_boot_src.u8[0] != BOOT_SRC_RAM)
-	{//framebuffer pointer is already linear
-		Seg2Linear(&sys_vbe_info.video_modes);
-		Seg2Linear(&sys_vbe_info.oem);
-		Seg2Linear(&sys_vbe_info.vendor);
-		Seg2Linear(&sys_vbe_info.product_name);
-		Seg2Linear(&sys_vbe_info.product_revision);
-		Seg2Linear(SYS_FONT_PTR);
-		sys_vbe_info.software_revision = Bcd2Binary(sys_vbe_info.software_revision);
-	}
-
 	debug.fun_seg_cache  = CAlloc(FUN_SEG_CACHE_SIZE * sizeof(CFunSegCache));
 	debug.int_fault_code = IntFaultHandlersNew;
 }
 
 U0 SysGrInit()
 {
-	I64 i, j;
+	I64 i;
-	text.aux_font = MAlloc(256 * 8); //256 U64s
-	MemCopy(text.aux_font, *SYS_FONT_PTR(U32), 256 * 8);
-
-	for (i = 0; i < 256; i++)
-		for (j = 0; j < 8; j++)
-			text.aux_font[i].u8[j] = rev_bits_table[text.aux_font[i].u8[j]];
 
     text.font = sys_font_std;
 
+	text.aux_font = sys_font_aux;
+
 	//patch some chars
 	text.aux_font[10]	= text.font[10]; //"Return" symbol 
 	text.aux_font[255]	= text.font[255]; //Block symbol ÿ
@@ -103,16 +88,15 @@ U0 SysGrInit()
 	text.border_chars[2] (I64) = 'ÄͳºÚÉ¿»';
 	text.border_chars[10](U32) = 'ÀÈÙ¼';
 
-	text.cols = sys_vbe_mode.width  / FONT_WIDTH;
+	text.cols = sys_framebuffer_width  / FONT_WIDTH;
-	text.rows = sys_vbe_mode.height / FONT_HEIGHT;
+	text.rows = sys_framebuffer_height / FONT_HEIGHT;
 
-	text.screen_size	= sys_vbe_mode.width * sys_vbe_mode.height;
+	text.screen_size	= sys_framebuffer_width * sys_framebuffer_height;
 	text.buffer_size	= text.screen_size * 4; //buffer for 32-bit, but only 16 colors now.
 	text.raw_screen		= CAlloc(text.buffer_size);
-	text.fb_alias		= sys_vbe_mode.framebuffer;
+	text.fb_alias		= sys_framebuffer_addr;
 
 	MemSetU32(text.fb_alias, BLACK32, text.screen_size);
-	text.vga_alias = CAlloc(text.rows * text.cols * 8);
 }
 
 U0 TimerInit()

src/Kernel/KStart16.ZC

@@ -50,23 +50,31 @@ GDT_TR: 		DU8 	MP_PROCESSORS_NUM * 16 DUP(0);
 GDT_TR_RING3: 	DU8 	MP_PROCESSORS_NUM * 16 DUP(0);
 #assert $$ - SYS_GDT == sizeof(CGDT)
 
-SYS_FONT_PTR::	DU32	0;
+SYS_FRAMEBUFFER_ADDR::		DU64	0;
+SYS_FRAMEBUFFER_WIDTH::		DU64	0;
+SYS_FRAMEBUFFER_HEIGHT::	DU64	0;
+SYS_FRAMEBUFFER_PITCH::		DU64	0;
+SYS_FRAMEBUFFER_BPP::		DU8		0;
+
+SYS_SMBIOS_ENTRY::	DU64	0;
+
+SYS_DISK_UUID::			DU64	0, 0;
+
+SYS_BOOT_STACK::	DU32	BOOT_RAM_LIMIT;
+
+SYS_IS_UEFI_BOOTED::    DU8    0;
+
+SYS_FRAMEBUFFER_LIST::	DU8	sizeof(CVideoInfo) * VBE_MODES_NUM	DUP(0);
 
-SYS_VBE_INFO::			DU8 	sizeof(CVBEInfo)						DUP(0);
-SYS_VBE_MODES::			DU8 	sizeof(CVBEModeShort) * VBE_MODES_NUM	DUP(0);
-SYS_VBE_FINAL_MODE::	DU8 	sizeof(CVBEMode)						DUP(0);
-SYS_VBE_FINAL_MODE_NUM::DU16	0; //mode number of final mode set
 #assert $$ - SYS_KERNEL == sizeof(CKernel) - sizeof(CZXE)
 
-TEMP_VBE_MODE:		DU8 	sizeof(CVBEMode)		DUP(0);
+REQUESTED_SCREEN_WIDTH:		DU16	1024;
-MAX_VBE_MODE:		DU8 	sizeof(CVBEModeShort)	DUP(0);
+REQUESTED_SCREEN_HEIGHT:	DU16	768;
-MAX_SCREEN_HEIGHT:	DU16	0;
 
-#exe
+VBE_TEMP_MODE:		DU8 	sizeof(CVBEMode)	DUP(0);
-{
+VBE_INFO:			DU8 	sizeof(CVBEInfo)	DUP(0);
-	StreamPrint("SCREEN_WIDTH:	DU16		%d;"
+VBE_FINAL_MODE_NUM:	DU16	0; // gets set to final result mode number
-				"SCREEN_HEIGHT: DU16		%d;", kernel_config->screen_width, kernel_config->screen_height);
+VBE_STD_MODE_NUM:	DU16	0; // gets set to mode number for standard 1024x768
-};
 
 //************************************
 CORE0_16BIT_INIT::
@@ -84,10 +92,10 @@ GET_IP: POP 	BX
 		MOV 	AX, CS
 		ADD 	AX, BX
 		PUSH	AX
-		PUSH	U16 @@04
+		PUSH	U16 @@05
 		RETF
 
-@@04: 	STI
+@@05: 	STI
 		MOV 	AX, CS
 		MOV 	DS, AX
 		MOV 	U32 [SYS_RUN_LEVEL], RLF_16BIT
@@ -100,34 +108,34 @@ GET_IP: POP 	BX
 
 //Get VBE implementation information
 		MOV		AX, 0x4F00
-		MOV		DI, SYS_VBE_INFO
+		MOV		DI, VBE_INFO
 		MOV		CVBEInfo.signature[DI], 'VBE2' //set to 'VBE2' to use VBE 2.0 functionality
 		INT		0x10
 		POP		ES
 		CMP		AX, 0x004F
-		JE		@@05
+		JE		@@10
 		JMP		$$	//Freeze system if VBE not supported
 
-@@05:
+@@10:
 
 /*Loop variables:
  DI <- Temporary storage for mode information
  CX <- Mode number
- DX <- mode array
+ DX <- 'mode' array
  GS <- Segment for video modes list
  SI <- Offset for video modes list
 */
 //Obtain segment:offset of list of potential video modes
-		MOV		AX, SYS_VBE_INFO
+		MOV		AX, VBE_INFO
 		MOV		SI, CVBEInfo.video_modes[AX]
 		MOV		GS, CVBEInfo.video_modes+2[AX]
-		MOV		DI, TEMP_VBE_MODE
+		MOV		DX, SYS_FRAMEBUFFER_LIST
-		MOV		DX, SYS_VBE_MODES
+		MOV		DI, VBE_TEMP_MODE
 
-@@06: //Loop through all the mode numbers
+@@15: //Loop through all the mode numbers
 		MOV 	AX, GS:[SI]
 		CMP 	AX, 0xFFFF //FFFF signifies the end of the list
-		JE		@@08
+		JE		@@25
 
 		ADD 	SI, 2 //Increment pointer to read next U16 mode
 
@@ -141,90 +149,98 @@ GET_IP: POP 	BX
 		INT		0x10
 		POP		ES
 		CMP		AX, 0x004F
-		JNE		@@06 //if call to get mode information failed
+		JNE		@@15 //if call to get mode information failed
 
-//filter everything but 32-bit color
+//Filter everything but 32-bit color
 		MOV 	AL, CVBEMode.bpp[DI]
 		CMP 	AL, 32
-		JNE 	@@06
+		JNE 	@@15
 
 //Check if the mode is actually supported
 		MOV 	AX, CVBEMode.attributes[DI]
 		AND 	AX, 0x91 //bit 0 = supported, bit 4 = graphics mode, bit 7 = linear framebuffer
 		CMP 	AX, 0x91
-		JNE 	@@06
+		JNE 	@@15
 
 //Only want memory model of packed pixel or direct color (RGB)
-//		MOV 	AX, CVBEMode.memory_model[DI]
+		MOV 	AX, CVBEMode.memory_model[DI]
-//		CMP 	AX, 4
+		CMP 	AX, 4
-//		JNE 	@@06
+		JE		@@18
-//		CMP 	AX, 6
+		CMP		AX, 6
-//		JNE 	@@06
+		JNE		@@15
-//Copy information about this mode into an element of the mode array
-		MOV 	BX, CVBEMode.height[DI]
-		MOV 	CVBEModeShort.height[DX], BX
-		CMP 	BX, [MAX_SCREEN_HEIGHT]
-		JL		@@07
 
-		MOV		[MAX_SCREEN_HEIGHT], BX
+//Copy information about this mode into AX and BX
-		MOV		[MAX_VBE_MODE],      CX
+@@18:	MOV 	BX, CVBEMode.height[DI]
+@@20: 	MOV		AX, CVBEMode.width[DI]
 
-@@07: 	MOV		AX, CVBEMode.width[DI]
+// Copy info into DX SYS_FRAMEBUFFER_LIST
-		MOV		CVBEModeShort.width[DX], AX
-//		MOV		EAX, CVBEMode.max_pixel_clock[DI]
-//		MOV		CVBEModeShort.max_pixel_clock[DX], EAX
 
-		MOV 	CVBEModeShort.mode_num[DX], CX
+		MOV		CVideoInfo.height[DX], BX
-		ADD 	DX, sizeof(CVBEModeShort) //next array element
+		MOV		CVideoInfo.width[DX], AX
+		ADD		DX, sizeof(CVideoInfo) // next array element
 
-//Check if width and height match
+//Check if width and height match standard 1024x768
-		CMP		AX, [SCREEN_WIDTH]
+//If they match, set VBE_STD_MODE_NUM to this mode num
-		JNE		@@06
+		CMP		AX, 1024
-		CMP		BX, [SCREEN_HEIGHT]
+		JNE		@@23
-		JNE		@@06
+		CMP		BX, 768
+		JNE		@@23
+		MOV		[VBE_STD_MODE_NUM], CX
+
+//Check if width and height match requested resolution
+@@23:	CMP		AX, [REQUESTED_SCREEN_WIDTH]
+		JNE		@@15
+		CMP		BX, [REQUESTED_SCREEN_HEIGHT]
+		JNE		@@15
 
 //If we've made it here we have our mode
-		MOV		[SYS_VBE_FINAL_MODE_NUM], CX
+		MOV		[VBE_FINAL_MODE_NUM], CX
-		JMP		@@06
+		JMP		@@15
 
-@@08: //End of loop
+@@25: //End of loop
-//If there isn't a valid mode set by user through kernel config, set the mode with the biggest height.
+
-		MOV		AX, [SYS_VBE_FINAL_MODE_NUM]
+//If requested resolution wasn't found in VBE mode list,
+//use the standard 1024x768 mode as fallback
+		MOV		AX, [VBE_FINAL_MODE_NUM]
 		CMP		AX, 0
-		JNE		@@09
+		JNE		@@30
-		MOV		CX, [MAX_VBE_MODE]
-		MOV		[SYS_VBE_FINAL_MODE_NUM], CX
 
-@@09: 	PUSH	ES
+		MOV		CX, [VBE_STD_MODE_NUM]
+		MOV		[VBE_FINAL_MODE_NUM], CX
+
+@@30: 	PUSH	ES
 		PUSH	DS
 		POP 	ES
-//Get mode infomration for the mode we want
+//Get mode information for the mode we want
-		MOV 	DI, SYS_VBE_FINAL_MODE
+		MOV 	DI, VBE_TEMP_MODE
-		MOV 	CX, [SYS_VBE_FINAL_MODE_NUM]
+		MOV 	CX, [VBE_FINAL_MODE_NUM]
 		MOV 	AX, 0x4F01
 		INT 	0x10
 		POP 	ES
 		CMP 	AX, 0x004F
-		JNE 	@@10 //if called failed
+		JNE 	@@35 //if called failed
 
 //Set the mode; call takes mode number in BX
 		MOV 	AX, 0x4F02
 		MOV 	BX, CX
 		INT 	0x10
 		CMP 	AX, 0x004F
-		JNE 	@@10
+		JNE 	@@35
+
+//Give mode information to kernel
+		MOV		EAX, CVBEMode.framebuffer[DI]
+		MOV		U32 [SYS_FRAMEBUFFER_ADDR], EAX
+		MOV		AX, CVBEMode.height[DI]
+		MOV		U16 [SYS_FRAMEBUFFER_HEIGHT], AX
+		MOV		AX, CVBEMode.width[DI]
+		MOV		U16 [SYS_FRAMEBUFFER_WIDTH], AX
+		MOV		AX, CVBEMode.pitch[DI]
+		MOV		U16 [SYS_FRAMEBUFFER_PITCH], AX
+		MOV		AL, CVBEMode.bpp[DI]
+		MOV		U8 [SYS_FRAMEBUFFER_BPP], AL
 
 		BTS 	U32 [SYS_RUN_LEVEL], RLf_VESA
-@@10:
+@@35:
-
-//Get pointer to 8x8 VGA ROM font.
-		MOV		AX, 0x1130
-		MOV		BH, 3
-		INT		0x10
-		MOV		AX, ES
-		SHL		EAX, 16
-		MOV		AX, BP
-		MOV		U32 [SYS_FONT_PTR], EAX
 
 //Get E801 memory map.
 //Output: AX = Memory between 1MiB and 16MiB in KiB (max 0x3C00 == 15 MiB)
@@ -233,10 +249,10 @@ GET_IP: POP 	BX
 		XOR		DX, DX
 		MOV		AX, 0xE801
 		INT 	0x15
-		JCXZ	@@12 //if CX and DX are zero, use AX and BX instead.
+		JCXZ	@@40 //if CX and DX are zero, use AX and BX instead.
 		MOV		AX, CX
 		MOV		BX, DX
-@@12:	MOV 	U16 [MEM_E801],   AX
+@@40:	MOV 	U16 [MEM_E801],   AX
 		MOV 	U16 [MEM_E801+2], BX
 
 //Get E820 memory map.
@@ -245,21 +261,21 @@ GET_IP: POP 	BX
 		PUSH	DS
 		POP		ES
 		MOV 	DI,  MEM_E820
-@@15: 	PUSH	CX
+@@45: 	PUSH	CX
 		MOV 	EAX, 0xE820
 		MOV 	ECX, sizeof(CMemE820)
 		MOV 	EDX, 'PAMS'
 		INT 	0x15
-		JC		@@20
+		JC		@@50
 		CMP 	EAX, 'PAMS'
-		JNE 	@@20
+		JNE 	@@50
 		TEST	EBX, EBX
-		JZ		@@20
+		JZ		@@50
 		ADD 	DI,  sizeof(CMemE820)
 		POP 	CX
-		LOOP	@@15
+		LOOP	@@45
 		SUB 	SP,  2
-@@20: 	ADD		SP,  2 //if called failed we want to nullify the PUSHed CX value.
+@@50: 	ADD		SP,  2 //if called failed we want to nullify the PUSHed CX value.
 
 //Find how much space to map, start with E801 limit.
 		XOR 	EAX, EAX
@@ -270,24 +286,24 @@ GET_IP: POP 	BX
 
 //Find max of E820 to set mapped space.
 		MOV 	SI,  MEM_E820
-@@25: 	MOV 	CL,  CMemE820.type[SI]
+@@55: 	MOV 	CL,  CMemE820.type[SI]
 		TEST	CL,  CL
-		JZ		@@35
+		JZ		@@65
 		MOV 	EBX, CMemE820.base  [SI]
 		MOV 	ECX, CMemE820.base+4[SI]
 		ADD 	EBX, CMemE820.len   [SI]
 		ADC 	ECX, CMemE820.len+4 [SI]
 		SUB 	EBX, EAX
 		SBB 	ECX, EDX
-		JC		@@30
+		JC		@@60
 		MOV		EAX, CMemE820.base  [SI]
 		MOV		EDX, CMemE820.base+4[SI]
 		ADD		EAX, CMemE820.len   [SI]
 		ADC		EDX, CMemE820.len+4 [SI]
-@@30: 	ADD		SI,  sizeof(CMemE820)
+@@60: 	ADD		SI,  sizeof(CMemE820)
-		JMP		@@25
+		JMP		@@55
 
-@@35: 	MOV		[MEM_PHYSICAL_SPACE],   EAX
+@@65: 	MOV		[MEM_PHYSICAL_SPACE],   EAX
 		MOV		[MEM_PHYSICAL_SPACE+4], EDX
 
 //Get PCI Bus Info
@@ -296,11 +312,11 @@ GET_IP: POP 	BX
 		MOV		AX, 0xB101
 		INT		0x1A
 		CMP		DX, 'PC'
-		JNE		@@40
+		JNE		@@70
 		MOV		CH, 0
 		INC		CX
 		MOV		U16 [SYS_PCI_BUSES], CX
-@@40:
+@@70:
 		CLI
 //Enable A20
 		IN		AL, 0x92

src/Kernel/KStart32.ZC

@@ -88,6 +88,7 @@ CORE0_32BIT_INIT:: //Entry point for $LK,"BootRAM",A="MN:BootRAM"$.
 		BTS 	U32 [SYS_RUN_LEVEL], RLf_32BIT
 		MOV 	ESI, U32 [SYS_BOOT_PATCH_TABLE_BASE]
 		MOV 	EDI, U32 [MEM_BOOT_BASE]
+		MOV		ESP, U32 [SYS_BOOT_STACK]
 
 		MOV		AX, CGDT.ds
 		MOV		DS,  AX
@@ -95,8 +96,15 @@ CORE0_32BIT_INIT:: //Entry point for $LK,"BootRAM",A="MN:BootRAM"$.
 		MOV		FS,  AX
 		MOV		GS,  AX
 		MOV		SS,  AX
-		MOV		ESP, BOOT_RAM_LIMIT //Tmp Stack
 
+        JMP @@02
+
+        ALIGN 16, OC_NOP
+        // Signature to find CORE0_32BIT_INIT
+        DU64 ZEALBOOTER_LIMINE_SIGNATURE_1; 
+        DU64 ZEALBOOTER_LIMINE_SIGNATURE_2;
+
+@@02:
 //Patch abs addresses
 		MOV		ECX, U32 CPatchTableAbsAddr.abs_address_count[ESI]
 		LEA		ESI, U32 CPatchTableAbsAddr.abs_address[ESI]

src/Kernel/KStart64.ZC

@@ -83,7 +83,7 @@ USE64
 //************************************
 SYS_RAM_REBOOT:: //This gets copied high.  $LK,"SYS_RAM_REBOOT",A="FF:::/System/Boot/BootRAM.ZC,SYS_RAM_REBOOT:2"$
 		PUSH	U32 CGDT.ds 		//stack seg
-		PUSH	U32 BOOT_RAM_LIMIT	//stack
+		PUSH	U32 [SYS_BOOT_STACK]//stack
 		PUSH	U32 0 				//flags
 		PUSH	U32 CGDT.cs32
 		LEA 	RAX, [@@10]

src/Kernel/Kernel.PRJ

@@ -30,6 +30,7 @@
 #include "Sched"
 #include "Memory/MakeMemory"
 #include "FontStd"
+#include "FontAux"
 #include "StrB"
 #include "KHashA"
 #include "KInterrupts"

src/Kernel/KernelA.HH

@@ -427,7 +427,7 @@ class CSysLimitBase
 };
 
 #help_index "Memory/Info"
-#define MEM_E820_ENTRIES_NUM	48
+#define MEM_E820_ENTRIES_NUM	256
 #define MEM_E820t_USABLE		1
 #define MEM_E820t_RESERVED		2
 #define MEM_E820t_ACPI			3
@@ -536,14 +536,15 @@ class CVBEMode
 };
 #assert sizeof(CVBEMode) == 256
 
-class CVBEModeShort
+class CVideoInfo
 {
-	U16 	width,
+	U16 width;
-			height,
+	U16 height;
-			mode_num;
-	U32 	max_pixel_clock; //TODO refresh rates.
 };
 
+#define ZEALBOOTER_LIMINE_SIGNATURE_1	0xaa23c08ed10bd4d7; // See $LK+PU,"CORE0_32BIT_INIT",A="FF:::/Kernel/KStart32.ZC,JMP @@"$
+#define ZEALBOOTER_LIMINE_SIGNATURE_2	0xf6ceba7d4b74179a; //
+
 #help_index "Boot"
 class CKernel
 {//Must match $LK,"OSStartUp",A="FF:::/Kernel/KStart16.ZC,MEM_BOOT_BASE"$
@@ -564,11 +565,16 @@ class CKernel
 	U16				sys_pci_buses;
 	;$$ = ($$ + 15) & -16;
 	CGDT			sys_gdt;
-	U32				sys_font_ptr;
+	U64				sys_framebuffer_addr;
-	CVBEInfo		sys_vbe_info;
+	U64				sys_framebuffer_width;
-	CVBEModeShort	sys_vbe_modes[VBE_MODES_NUM];
+	U64				sys_framebuffer_height;
-	CVBEMode		sys_vbe_mode;
+	U64				sys_framebuffer_pitch;
-	U16				sys_vbe_mode_num;
+	U8				sys_framebuffer_bpp;
+	U64				sys_smbios_entry;
+	U64				sys_disk_uuid[2];
+	U32				sys_boot_stack;
+	Bool			sys_is_uefi_booted;
+	CVideoInfo		sys_framebuffer_list[VBE_MODES_NUM];
 };
 
 //Run-Levels
@@ -907,7 +913,7 @@ public class CHashImport:CHashSrcSym
 };
 
 #help_index "Compiler/Internal"
-#define PTR_STARS_NUM 	4
+#define PTR_STARS_NUM 	3
 
 //Member List Flags
 #define MLF_DEFAULT_AVAILABLE 		1
@@ -2722,7 +2728,7 @@ class CPCIDev
 
 //Command FIS flags
 #define AHCI_CF_DESCf_C		7	//'Command' bit. Set when FIS is an ATA command.
-#define AHCI_CF_DESCF_C		(1 << AHCI_CF_DESCF_C)
+#define AHCI_CF_DESCF_C		(1 << AHCI_CF_DESCf_C)
 
 //Port register flags
 //Command and Status register flags
@@ -3015,7 +3021,7 @@ class CAtapiModeWriteList
 #define FILEMASK_AOT	"*.ZC*;*.HH*;*.PRJ*"
 #define FILEMASK_SRC	"*.ZC*;*.HH*;*.IN*;*.PRJ*"
 #define FILEMASK_DD 	FILEMASK_SRC ";*.DD*"
-#define FILEMASK_TXT	FILEMASK_DD ";*.TXT*"
+#define FILEMASK_TXT	FILEMASK_DD ";*.TXT*;*.CFG*"
 #define FILEMASK_GR 	"*.GR*"
 
 #help_index "File/Low Level"
@@ -4278,7 +4284,6 @@ public class CTextGlobals
 	U32 	*raw_screen, *fb_alias;
 	I64 	 rows, cols;	//Use TEXT_ROWS,TEXT_COLS
 	U64 	*font, *aux_font, screen_size, buffer_size;
-	U8		*vga_alias;
 	U8		 border_chars[16];
 	Bool	 is_fb_busy;
 };
@@ -4387,10 +4392,6 @@ public class CDC
 #assert !($$ & 7)
 };
 
-#help_index "Devices"
-//VGA Memory
-#define VGAM_GRAPHICS 	0xA0000
-
 #define "Char/Input;StdIn"
 //StrGet flags
 #define SGF_SHIFT_ESC_EXIT			1 //This kills task on <SHIFT-ESC>
@@ -4515,7 +4516,7 @@ public class CDebugGlobals
 #define BOOT_SRC_DVD		4
 
 // $LK,"In",A="MN:In"$("") StdIn for call to $LK,"BootHDIns",A="MN:BootHDIns"$().
-#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT \n\n\n\n"
+#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
 
 #help_index "Registry"
 //Registry sys_message_flags. $LK,"RegOneTimePopUp",A="MN:RegOneTimePopUp"$()
@@ -4551,4 +4552,4 @@ class CProgress
 #define PRINTF_NEG_E				0x400
 #define PRINTF_NEG_AUX_FORMAT_NUM	0x800
 
-#help_index ""
+#help_index ""

src/Kernel/KernelB.HH

@@ -243,10 +243,20 @@ public _intern IC_FS CTask *Fs(); //FS segment register points to the current $L
 #help_file "::/Doc/TimeCycles"
 public _intern IC_RDTSC I64 TSCGet(); //Get time stamp counter.
 
-#help_index "Graphics/VBE"
+#help_index "Graphics/Framebuffer"
-public _extern SYS_VBE_INFO			CVBEInfo		sys_vbe_info;
+public _extern SYS_FRAMEBUFFER_ADDR		U8	*sys_framebuffer_addr;
-public _extern SYS_VBE_FINAL_MODE	CVBEMode		sys_vbe_mode;
+public _extern SYS_FRAMEBUFFER_WIDTH	U64	sys_framebuffer_width;
-_extern SYS_VBE_FINAL_MODE_NUM		U16				sys_vbe_mode_num;
+public _extern SYS_FRAMEBUFFER_HEIGHT	U64	sys_framebuffer_height;
-_extern SYS_VBE_MODES				CVBEModeShort	sys_vbe_modes[VBE_MODES_NUM];
+public _extern SYS_FRAMEBUFFER_PITCH	U64	sys_framebuffer_pitch;
+public _extern SYS_FRAMEBUFFER_BPP		U8	sys_framebuffer_bpp;
+
+_extern SYS_FRAMEBUFFER_LIST CVideoInfo sys_framebuffer_list[VBE_MODES_NUM];
+
+#help_index "Processor/SMBIOS"
+public _extern SYS_SMBIOS_ENTRY U8	*sys_smbios_entry;
+
+#help_index ""
+public _extern SYS_DISK_UUID  U64	sys_disk_uuid[2];
+public _extern SYS_IS_UEFI_BOOTED	Bool	sys_is_uefi_booted;
 
 #help_index ""

src/Kernel/KernelC.HH

@@ -622,6 +622,9 @@ public extern							U0	PCIWriteU32(I64 bus, I64 dev, I64 fun, I64 rg, I64 val);
 public extern							U0	PCIWriteU8( I64 bus, I64 dev, I64 fun, I64 rg, I64 val);
 public _extern SYS_PCIBIOS_SERVICE_DIR	U32	sys_PCIBIOS_service_dir;//Far call routine in the BIOS
 public _extern SYS_PCI_SERVICES			U32	sys_pci_services;//Far call routine in the BIOS
+public extern							Bool PCIBt(		U8 *bit_field, I64 bit); // MOV-based Bt for use in PCI device memory-mapped IO areas.   See $LK+PU,"Bt()",A="FF:::/Kernel/KernelB.HH,Bt("$.
+public extern							Bool PCIBtr(	U8 *bit_field, I64 bit); // MOV-based Btr for use in PCI device memory-mapped IO areas.  See $LK+PU,"Btr()",A="FF:::/Kernel/KernelB.HH,Btr("$.
+public extern							Bool PCIBts(	U8 *bit_field, I64 bit); // MOV-based Bts for use in PCI device memory-mapped IO areas.  See $LK+PU,"Bts()",A="FF:::/Kernel/KernelB.HH,Bts("$.
 
 #help_index "Processor"
 public extern U8 *IntEntryGet(I64 irq);

src/Kernel/KeyDev.ZC

@@ -237,6 +237,6 @@ U0 KeyDevInit()
 	CtrlAltCBSet('M', &CtrlAltM, "Cmd /Toggle Mute");
 	CtrlAltCBSet('N', &CtrlAltN, "Cmd /Next Focus Task",, TRUE);
 	CtrlAltCBSet('T', &CtrlAltT, "Cmd /Terminal Window");
-	CtrlAltCBSet('V', &CtrlAltV, "Cmd /VGA Flush",, TRUE);
+	CtrlAltCBSet('V', &CtrlAltV, "Cmd /Video Framebuffer Flush",, TRUE);
 	CtrlAltCBSet('X', &CtrlAltX, "Cmd /Kill Focused Task",, TRUE);
 }

src/Kernel/PCI.ZC

@@ -126,3 +126,32 @@ else bus, dev, fun.
 pci_end:
 	return res;
 }
+
+Bool PCIBt(U8 reg RBX *bit_field, I64 reg RDX bit)
+{ // MOV-based Bt for use in PCI device memory-mapped IO areas.  See $LK+PU,"Bt()",A="FF:::/Kernel/KernelB.HH,Bt("$.
+	bit_field += bit / 8;
+	bit &= 7;
+	return (*bit_field & 1 << bit) >> bit;
+}
+
+Bool PCIBtr(U8 reg RDX *bit_field, I64 reg RBX bit)
+{ // MOV-based Btr for use in PCI device memory-mapped IO areas.  See $LK+PU,"Btr()",A="FF:::/Kernel/KernelB.HH,Btr("$.
+	U64 reg R9 chunk_mod = bit & 31, chunk_bit = 1 << chunk_mod;
+	bit_field(U32 *) += bit / 32;
+	Bool reg R8 result = (*bit_field(U32 *) & chunk_bit) >> chunk_mod;
+
+	*bit_field(U32 *) &= ~chunk_bit;
+
+	return result;
+}
+
+Bool PCIBts(U8 reg RDX *bit_field, I64 reg RBX bit)
+{ // MOV-based Bts for use in PCI device memory-mapped IO areas.  See $LK+PU,"Bts()",A="FF:::/Kernel/KernelB.HH,Bts("$.
+	U64 reg R9 chunk_mod = bit & 31, chunk_bit = 1 << chunk_mod;
+	bit_field(U32 *) += bit / 32;
+	Bool reg R8 result = (*bit_field(U32 *) & chunk_bit) >> chunk_mod;
+
+	*bit_field(U32 *) |= chunk_bit;
+
+	return result;
+}

src/Kernel/SerialDev/Mouse.ZC

@@ -24,8 +24,8 @@ U0 MouseUpdate(I64 x, I64 y, I64 z, Bool l, Bool r)
 		mouse.pos.z = mouse.presnap.z;
 	}
 
-	mouse.pos.x = ClampI64(mouse.pos.x, 0, sys_vbe_mode.width  - 1);
+	mouse.pos.x = ClampI64(mouse.pos.x, 0, sys_framebuffer_width  - 1);
-	mouse.pos.y = ClampI64(mouse.pos.y, 0, sys_vbe_mode.height - 1);
+	mouse.pos.y = ClampI64(mouse.pos.y, 0, sys_framebuffer_height - 1);
 	mouse.pos_text.x = mouse.pos.x / FONT_WIDTH;
 	if (mouse.pos_text.x >= text.cols)
 	{
@@ -46,9 +46,9 @@ U0 MouseUpdate(I64 x, I64 y, I64 z, Bool l, Bool r)
 
 U0 MouseSet(I64 x=I64_MAX, I64 y=I64_MAX, I64 z=I64_MAX, I64 l=I64_MAX, I64 r=I64_MAX)
 {//Note: Generates a message. See $LK,"MouseSet",A="FF:::/Demo/Games/Zing.ZC,MouseSet"$().
-	if (!(0 <= x < sys_vbe_mode.width))
+	if (!(0 <= x < sys_framebuffer_width))
 		x = mouse.pos.x;
-	if (!(0 <= y < sys_vbe_mode.height))
+	if (!(0 <= y < sys_framebuffer_height))
 		y = mouse.pos.y;
 	if (z == I64_MAX)
 		z = mouse.pos.z;
@@ -227,14 +227,14 @@ U0 MouseHardSetPost()
 //TODO mouse_grid.x_offset?
 	if (i < 0)
 		mouse.offset.x -= i;
-	else if (i >= sys_vbe_mode.width)
+	else if (i >= sys_framebuffer_width)
-		mouse.offset.x += sys_vbe_mode.width - 1 - i;
+		mouse.offset.x += sys_framebuffer_width - 1 - i;
 
 	i = Trunc(mouse.scale.y * mouse_hard.pos.y / mouse_grid.y) * mouse_grid.y + mouse.offset.y;
 	if (i < 0)
 		mouse.offset.y -= i;
-	else if (i >= sys_vbe_mode.height)
+	else if (i >= sys_framebuffer_height)
-		mouse.offset.y += sys_vbe_mode.height - 1 - i;
+		mouse.offset.y += sys_framebuffer_height - 1 - i;
 
 	if (mouse_hard.pos.x != mouse_hard_last.pos.x || mouse_hard.pos.y != mouse_hard_last.pos.y ||
 		mouse_hard.pos.z != mouse_hard_last.pos.z)
@@ -400,10 +400,10 @@ U0 KbdMouseInit()
 	mouse_hard.scale.x		= 0.5;
 	mouse_hard.scale.y		= 0.5;
 	mouse_hard.scale.z		= 1.0;
-	mouse_hard.prescale.x	= sys_vbe_mode.width  / mouse_hard.scale.x / 2.0;
+	mouse_hard.prescale.x	= sys_framebuffer_width  / mouse_hard.scale.x / 2.0;
-	mouse_hard.prescale.y	= sys_vbe_mode.height / mouse_hard.scale.y / 2.0;
+	mouse_hard.prescale.y	= sys_framebuffer_height / mouse_hard.scale.y / 2.0;
 	mouse_hard.prescale.z	= 0 / mouse_hard.scale.z;
-	mouse_hard.pos.x		= sys_vbe_mode.width >> 1;
+	mouse_hard.pos.x		= sys_framebuffer_width >> 1;
-	mouse_hard.pos.y		= sys_vbe_mode.height >> 1;
+	mouse_hard.pos.y		= sys_framebuffer_height >> 1;
 	MemCopy(&mouse_hard_last, &mouse_hard, sizeof(CMouseHardStateGlobals));
 }

src/Misc/Auto/AutoDistro.ZC

@@ -2,7 +2,7 @@
 // Custom DoDistro file that generates an AUTO.ISO.
 // Used by host OS to create a full Distro ISO synced with GitHub repo.
 
-#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n1024\n768\n\n\n"
+#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
 
 U0 MakeMyISO(U8 *_out_iso_filename)
 {//Does everything with current drive.

src/Misc/Auto/AutoFullDistro0.ZC

@@ -7,7 +7,7 @@ U0 Auto()
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 
 	{
-		if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 			if (port->signature == AHCI_PxSIG_ATA)
@@ -18,12 +18,16 @@ U0 Auto()
 		}
 	}
 
+	WinMax;
 	BootMHDIns('C');
-	in_str = MStrPrint("Sleep(700);In(\"CC\\n%d\\n\\n1024\\n768\\n\\n\\n\");", ata_port);
+	in_str = MStrPrint("Sleep(700);In(\"CC\\n%d\\n\\n\\n\\n\");", ata_port);
 	OnceDrive('C', in_str);
 	Free(in_str);
-	in_str = MStrPrint("BootHDIns;OnceFlush;Once(\"#include \\\"/Misc/Auto/AutoFullDistro1\\\";;Auto;\");Reboot;");
+	in_str = MStrPrint(	"BootHDIns;"
+						"OnceFlush;"
+						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro1\\\";;Auto;\");"
+						"Reboot;");
 	OnceDrive('C', in_str);
 	OutU8(0x501,0x31);
 }
-Auto;
+Auto;

src/Misc/Auto/AutoFullDistro1.ZC

@@ -1,4 +1,37 @@
 U0 Auto()
 {
-	PopUp("#include \"/Misc/Auto/AutoFullDistro2\"");
+	I64			 i, ata_port = -1;
-}
+	CAHCIPort	*port;
+	U8			*in_str;
+
+	for (i = 0; i < AHCI_MAX_PORTS; i++)
+
+	{
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
+		{
+			port = &blkdev.ahci_hba->ports[i];
+			if (port->signature == AHCI_PxSIG_ATA)
+			{
+				ata_port = i;
+				break;
+			}
+		}
+	}
+
+	WinMax;
+	BootMHDIns('C');
+	Copy("C:/Tmp/OSBuild/Kernel/KStart16.ZC", "C:/Kernel/");
+	Copy("C:/Tmp/OSBuild/Kernel/KernelA.HH", "C:/Kernel/");
+	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
+	Sleep(700);
+	In(in_str);
+	BootHDIns;
+	OnceFlush;
+	Free(in_str);
+	in_str = MStrPrint(	"OnceFlush;"
+						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro2\\\";;Auto;\");"
+						"Reboot;");
+	OnceDrive('C', in_str);
+	Reboot;
+}
+Auto;

src/Misc/Auto/AutoFullDistro2.ZC

@@ -1,72 +1,36 @@
-#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n1024\n768\n\n\n"
+U0 Auto()
-
-U0 MakeMyISO()
 {
-	U8 *_out_iso_filename = "/Tmp/MyDistro.ISO.C";
+	I64			 i, ata_port = -1;
-	U8 *out_iso_filename = FileNameAbs(_out_iso_filename);
+	CAHCIPort	*port;
-	I64 line_count = LineRep("/*", "-r") + LineRep("/System/*") + LineRep("/Compiler/*", "-S+$$") + LineRep("/Kernel/*");
+	U8			*in_str;
+
+	for (i = 0; i < AHCI_MAX_PORTS; i++)
 
-	if (!DriveIsWritable)
 	{
-		"Drive must be writable.	Install on Hard drive, first.\n";
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
-		return;
+		{
+			port = &blkdev.ahci_hba->ports[i];
+			if (port->signature == AHCI_PxSIG_ATA)
+			{
+				ata_port = i;
+				break;
+			}
+		}
 	}
 
-	DocTreeFWrite("/System/Define.ZC", "LineRep", "DefinePrint(\"DD_ZEALOS_LOC\",\"%,d\");\n", line_count);
+	WinMax;
-	DefinePrint("DD_ZEALOS_LOC", "%,d", line_count);
+	BootMHDIns('C');
-
+	CopyTree("C:/Tmp/OSBuild/Kernel/", "C:/Kernel/");
-	"Total LOC:%12,d\n\n", line_count;
+	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
-
+	Sleep(700);
-	DelTree("/Distro");
+	In(in_str);
-	Del(out_iso_filename);
+	BootHDIns;
-
+	OnceFlush;
-	ProgressBarsReset;
+	Free(in_str);
-	progress1_max = 14;
+	in_str = MStrPrint(	"OnceFlush;"
-	StrCopy(progress1_desc, "Copying files to /Distro");
+						"Once(\"#include \\\"/Misc/Auto/AutoFullDistro3\\\";;Auto;\");"
-
+						"Reboot;");
-	DirMake("/Distro");
+	OnceDrive('C', in_str);
-	In(STD_DISTRO_DVD_CONFIG);
+	Reboot;
-	BootDVDIns;
-	progress1++;
-
-	Copy("/*", "/Distro");
-	progress1++;
-	DirMake("/Distro" BOOT_DIR);
-	Move(BOOT_DIR_DVD_KERNEL_ZXE, "/Distro" BOOT_DIR_KERNEL_ZXE);
-	progress1++;
-	CopyTree("/Home", 		"/Distro/Home");
-	progress1++;
-	Del("/Distro/Home/Registry.ZC");
-	CopyTree("/System", 	"/Distro/System");
-	progress1++;
-	CopyTree("/Apps", 		"/Distro/Apps");
-	progress1++;
-	CopyTree("/Compiler",	"/Distro/Compiler");
-	progress1++;
-	CopyTree("/Demo", 		"/Distro/Demo");
-	progress1++;
-	CopyTree("/Doc",		"/Distro/Doc");
-	progress1++;
-	CopyTree("/Kernel", 	"/Distro/Kernel");
-	progress1++;
-	CopyTree("/Misc", 		"/Distro/Misc");
-	progress1++;
-
-	CopyTree("/Downloads", "/Distro/Downloads");
-	progress1++;
-	DirMake("/Distro/Tmp");
-	DirMake("/Distro/Tmp/ScreenShots");
-	progress1++;
-	StrCopy(progress1_desc, "Building ISO");
-	RedSeaISO(out_iso_filename, "/Distro", "/Distro" BOOT_DIR_KERNEL_ZXE);
-	progress1++;
-
-	//If CD-ROM use MT_CD instead of MT_DVD.
-	//DVDImageWrite('T',out_iso_filename,MT_DVD); //Uncomment to burn.
-
-	DelTree("/Distro");
-	ProgressBarsReset;
-	Free(out_iso_filename);
 }
-MakeMyISO;
+Auto;
-OutU8(0x501,0x31);

src/Misc/Auto/AutoFullDistro3.ZC

@@ -0,0 +1,33 @@
+U0 Auto()
+{
+	I64			 i, ata_port = -1;
+	CAHCIPort	*port;
+	U8			*in_str;
+
+	for (i = 0; i < AHCI_MAX_PORTS; i++)
+
+	{
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
+		{
+			port = &blkdev.ahci_hba->ports[i];
+			if (port->signature == AHCI_PxSIG_ATA)
+			{
+				ata_port = i;
+				break;
+			}
+		}
+	}
+
+	WinMax;
+	CopyTree("C:/Tmp/OSBuild/", "C:/");
+	in_str = MStrPrint("CC\n%d\n\n\n\n", ata_port);
+	Sleep(700);
+	In(in_str);
+	BootHDIns;
+	OnceFlush;
+	in_str = MStrPrint("#include \"/Misc/Auto/AutoFullDistro4\";;Auto;;");
+	OnceDrive('C', in_str);
+	DelTree("C:/Tmp/OSBuild");
+	Reboot;
+}
+Auto;

src/Misc/Auto/AutoFullDistro4.ZC

@@ -0,0 +1,4 @@
+U0 Auto()
+{
+	PopUp("#include \"/Misc/Auto/AutoFullDistro5\"");
+}

src/Misc/Auto/AutoFullDistro5.ZC

@@ -0,0 +1,74 @@
+#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
+
+U0 MakeMyISO()
+{
+	U8 *_out_iso_filename = "/Tmp/MyDistro.ISO.C";
+	U8 *out_iso_filename = FileNameAbs(_out_iso_filename);
+	I64 line_count = LineRep("/*", "-r") + LineRep("/System/*") + LineRep("/Compiler/*", "-S+$$") + LineRep("/Kernel/*");
+
+	if (!DriveIsWritable)
+	{
+		"Drive must be writable.	Install on Hard drive, first.\n";
+		return;
+	}
+
+	DocTreeFWrite("/System/Define.ZC", "LineRep", "DefinePrint(\"DD_ZEALOS_LOC\",\"%,d\");\n", line_count);
+	DefinePrint("DD_ZEALOS_LOC", "%,d", line_count);
+
+	"Total LOC:%12,d\n\n", line_count;
+
+	DelTree("/Distro");
+	Del(out_iso_filename);
+
+	ProgressBarsReset;
+	progress1_max = 14;
+	StrCopy(progress1_desc, "Copying files to /Distro");
+
+	DirMake("/Distro");
+	In(STD_DISTRO_DVD_CONFIG);
+	BootDVDIns;
+	progress1++;
+
+	Copy("/*", "/Distro");
+	progress1++;
+	DirMake("/Distro" BOOT_DIR);
+	Move(BOOT_DIR_DVD_KERNEL_ZXE, "/Distro" BOOT_DIR_KERNEL_ZXE);
+	progress1++;
+	CopyTree("/Home", 		"/Distro/Home");
+	progress1++;
+	Del("/Distro/Home/Registry.ZC");
+	CopyTree("/System", 	"/Distro/System");
+	progress1++;
+	CopyTree("/Apps", 		"/Distro/Apps");
+	progress1++;
+	CopyTree("/Compiler",	"/Distro/Compiler");
+	progress1++;
+	CopyTree("/Demo", 		"/Distro/Demo");
+	progress1++;
+	CopyTree("/Doc",		"/Distro/Doc");
+	progress1++;
+	CopyTree("/Kernel", 	"/Distro/Kernel");
+	progress1++;
+	CopyTree("/Misc", 		"/Distro/Misc");
+	progress1++;
+
+	CopyTree("/Downloads", "/Distro/Downloads");
+	progress1++;
+	DirMake("/Distro/Tmp");
+	DirMake("/Distro/Tmp/ScreenShots");
+	progress1++;
+	StrCopy(progress1_desc, "Building ISO");
+	RedSeaISO(out_iso_filename, "/Distro", "/Distro" BOOT_DIR_KERNEL_ZXE);
+	progress1++;
+
+	//If CD-ROM use MT_CD instead of MT_DVD.
+	//DVDImageWrite('T',out_iso_filename,MT_DVD); //Uncomment to burn.
+
+	Copy("/Distro" BOOT_DIR_KERNEL_ZXE, "/Tmp/DVD" KERNEL_ZXE);
+
+	DelTree("/Distro");
+	ProgressBarsReset;
+	Free(out_iso_filename);
+}
+MakeMyISO;
+OutU8(0x501,0x31);

src/Misc/Auto/AutoInstall.ZC

@@ -41,7 +41,7 @@ U0 VMInstallDrive(CTask *task, U8 drv_let, I64 ata_port, I64 atapi_port)
 		XTalkWait(task, "C\n%d\n", ata_port);
 	if (atapi_port > -1)
 		XTalkWait(task, "T%d\n", atapi_port);
-	XTalkWait(task, "\n1024\n768\n\n\n"); //Exit Drives,  set Screen Resolution, skip Disk Cache and Options
+	XTalkWait(task, "\n\n\n"); //Exit Drives, skip Disk Cache and Options
 }
 
 U0 VMInstallWiz()
@@ -66,7 +66,7 @@ U0 VMInstallWiz()
 	SATARep;
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 	{
-		if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 			if (port->signature == AHCI_PxSIG_ATA)
@@ -78,7 +78,7 @@ U0 VMInstallWiz()
 	}
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 	{
-		if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 			if (port->signature == AHCI_PxSIG_ATAPI)

src/Misc/DoDistro.ZC

@@ -1,6 +1,6 @@
 //Make Your own Distro by #include-ing this file.
 
-#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n1024\n768\n\n\n"
+#define STD_DISTRO_DVD_CONFIG 	"TB\nScale2Mem(2048,0x40000)\nT\n\n\n\n"
 
 U0 MakeMyISO(U8 *_out_iso_filename)
 {//Does everything with current drive.

src/Misc/OSInstall.ZC

@@ -1,3 +1,17 @@
+
+#define LIMINE_HDD_FILE			"/Boot/Limine-HDD.HH"
+#define LIMINE_HDD_INSTALLER	"/System/Boot/LimineMHDIns.ZC"
+#include LIMINE_HDD_FILE
+#include LIMINE_HDD_INSTALLER
+
+#define LIMINE_INSTALL_PROMPT	\
+"Install $$GREEN$$Public Domain$$FG$$ ZealOS Boot Loader,\n" \
+"or $$RED$$BSD-2 licensed$$FG$$ Limine Boot Loader?\n\n" \
+"$$DKGRAY$$ZealOS Boot Loader is written in public-domain ZealC, but only supports BIOS mode.\n\n" \
+"Limine supports UEFI and BIOS mode and multiple boot protocols, but is written in BSD-2 licensed C code, and cannot be modified within ZealOS.$$FG$$\n\n\n"
+
+// TODO FIXME: refactor OSUpgrade code into optional Diff prompt to compare ISO<->HDD before Install.
+
 CDirEntry OSFilesMGFind(CDirEntry *needle_entry, CDirEntry *haystack_list)
 {
 	while (haystack_list)
@@ -10,7 +24,7 @@ CDirEntry OSFilesMGFind(CDirEntry *needle_entry, CDirEntry *haystack_list)
 	return NULL;
 }
 
-U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_fuf_flags, I64 *_df_flags, Bool auto)
+U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_df_flags)
 {
 	CDirEntry	*tmpde;
 	U8			*new;
@@ -23,28 +37,27 @@ U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_fuf_flags, I64
 			"$$BROWN$$Does Not Exist:%s$$FG$$\n", tmpde1->full_name;
 			new = StrNew(tmpde1->full_name);
 			new[0] = tmpde2->full_name[0]; // shortcut to quickly get drive letter
-			Copy(tmpde1->full_name, new);
+
+			if (tmpde1->attr & RS_ATTR_DIR)
+				CopyTree(tmpde1->full_name, new);
+			else
+			{
+				Copy(tmpde1->full_name, new);
+			}
+
 			Free(new);
 		}
 		else
 		{
 			if (tmpde1->attr & RS_ATTR_DIR)
-				OSFilesMergeInner(tmpde1->sub, tmpde->sub, _fuf_flags, _df_flags, auto);
+				OSFilesMergeInner(tmpde1->sub, tmpde->sub, _df_flags);
 			else
 			{
-				if (AbsI64(tmpde1->datetime - tmpde->datetime) > CDATE_FREQ * 2) {//slop
+				if (FilesFindMatch(tmpde1->full_name, FILEMASK_TXT))
+				{
 					"\n$$LTRED$$%s$$FG$$\n", tmpde->full_name;
 					"$$LTGREEN$$%s$$FG$$\n", tmpde1->full_name;
-					if (Bt(_fuf_flags, FUf_DIFF))
+					Diff(tmpde->full_name, tmpde1->full_name, _df_flags);
-					{
-						if (FilesFindMatch(tmpde1->full_name, FILEMASK_TXT))
-						{
-							if (!auto)
-								Diff(tmpde->full_name, tmpde1->full_name, _df_flags);
-							else
-								Copy(tmpde1->full_name, tmpde->full_name);
-						}
-					}
 				}
 			}
 		}
@@ -54,7 +67,7 @@ U0 OSFilesMergeInner(CDirEntry *tmpde1, CDirEntry *tmpde2, I64 *_fuf_flags, I64
 
 U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *fu_flags=NULL)
 { // See $LK+PU,"Merge",A="FF:::/System/Utils/Merge.ZC,public U0 Merge"$.
-	I64			 df_flags = 0, fuf_flags = 0, ch;
+	I64			 df_flags, fuf_flags = 0, ch;
 	CDirEntry	*tmpde1 = NULL, *tmpde2 = NULL;
 
 	FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), "+r");
@@ -64,20 +77,26 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
 	PrintWarn("This is based strictly on file dates.\n");
 	tmpde1 = FilesFind(src_files_find_mask, fuf_flags & FUG_FILES_FIND);
 	tmpde2 = FilesFind(dst_files_find_mask, fuf_flags & FUG_FILES_FIND);
-	fuf_flags &= FUF_DIFF;
 
 	"\n\nManual or Automatic Upgrade? (M/A): ";
 	do
 		ch = ToUpper(CharGet(, FALSE));
 	while (ch != 'M' && ch != 'A');
+
+	"%c\n", ch;
+
 	if (ch == 'M')
 	{
 		PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n"
 				"$$LTRED$$FILE1$$FG$$ is from existing install.");
-		OSFilesMergeInner(tmpde1, tmpde2, &fuf_flags, &df_flags, FALSE);
+		df_flags = 0;
+		OSFilesMergeInner(tmpde1, tmpde2, &df_flags);
 	}
 	else
-		OSFilesMergeInner(tmpde1, tmpde2, &fuf_flags, &df_flags, TRUE);
+	{
+		df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS;
+		OSFilesMergeInner(tmpde1, tmpde2, &df_flags);
+	}
 
 	DirTreeDel(tmpde1);
 	DirTreeDel(tmpde2);
@@ -89,17 +108,36 @@ U0 OSMerge(U8 dst_drv, U8 src_drv=':')
 	U8 *src = MStrPrint("%C:/", src_drv);
 
 	CopyTree(dst, "B:/");
-	Copy(MStrPrint("%C:/Misc/Bible.TXT", src_drv), "B:/Misc/Bible.TXT");
+	Del("B:/Misc/Bible.TXT");		// Deleting from B:/ prevents causing hang when merging large .TXT files,
-	Copy(MStrPrint("%C:/Misc/Clementine.TXT", src_drv), "B:/Misc/Clementine.TXT");
+	Del("B:/Misc/Clementine.TXT");	// they will instead be copied over from boot drive in OSMergeInner
+
+	Del("B:/Boot/Limine.CFG"); // Delete to make merge output ignore (copy) this, since it gets regenerated later
+
+	DocMax;
+
+	"$$PB$$$$PB$$$$LTCYAN$$Beginning Upgrade (running OSFilesMerge) ...$$FG$$\n\n";
+
 	OSFilesMerge("B:/", src, "+d");
+
+	"\n\n$$LTCYAN$$Upgrade merge completed."
+	"\nChanges listed above, scroll up to see all."
+	"\n\nPress ESC when you are ready to finish Upgrade (write merged files to disk).$$FG$$\n\n";
+	View;
+	DocBottom;
+
 	CopyTree("B:/", dst);
+
+	ExePrint("Del(\"%C:/Boot/Limine-CD.BIN\");", dst_drv);
+	ExePrint("Del(\"%C:/Boot/Limine-CD-EFI.BIN\");", dst_drv);
+	ExePrint("Del(\"%C:/Boot/Limine.CFG\");", dst_drv);
+	ExePrint("Del(\"%C:/boot.catalog\");", dst_drv);
+
 }
 
 U0 OSUpgrade()
 {
-	I64		 drv_let;
+	I64		 drv_let, ch;
 	U8		*st, *port_st;
-	I64		 res_num;
 	CTask	*task;
 
 	task = User;
@@ -147,17 +185,44 @@ U0 OSUpgrade()
 
 	OSMerge(drv_let); // src_drv needed?
 
-	XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\n%C\n%s\n\n", drv_let, drv_let, port_st);
+	XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\nC\n%s\n\n", drv_let, port_st);
-	VideoRep;
+	XTalkWait(task, "\n\n"); //skip through Disk Cache, Options
-	res_num = I64Get("Enter desired list num ($$PURPLE$$<ENTER>$$FG$$ for max res): ",, 1);
-	XTalkWait(task, "%d\n\n\n", res_num); //skip through Disk Cache, Options
 
-	"$$RED$$Install Master Boot Loader?$$FG$$";
+	if (!sys_is_uefi_booted)
-	if (YorN)
 	{
-		'\n';
+		"$$RED$$Install Master Boot Loader?$$FG$$";
-		BootMHDIns(drv_let);
+		if (YorN)
+		{
+			"\n\n";
+			if (FileFind(LIMINE_HDD_FILE))
+			{
+				"" LIMINE_INSTALL_PROMPT;
+				"(Z/L): ";
+
+				do
+					ch = ToUpper(CharGet(, FALSE));
+				while (ch != 'Z' && ch != 'L');
+
+				"%c\n", ch;
+
+				if (ch == 'Z')
+				{
+					BootMHDIns(drv_let);
+					"\n(Generating optional UEFI-mode Limine.CFG...)\n";
+					LimineCFGMake(drv_let);
+				}
+				else
+				{
+					LimineMHDIns(drv_let);
+				}
+				"\n\n";
+			}
+			else
+				BootMHDIns(drv_let);
+		}
 	}
+	else
+		LimineCFGMake(drv_let);
 
 	WinVert(task->win_top, Fs->win_bottom);
 	Kill(task);
@@ -169,9 +234,22 @@ U0 InstallDrive(U8 drv_let)
 
 	while (!DriveCheck(blkdev.let_to_drive[drv_let - 'A'], FALSE))
 		Sleep(1);
+
+	Sleep(1000);
+	'.';
+	Sleep(1000);
+	'.';
+	Sleep(1000);
+	'.';
 	Sleep(1000);
 
 	ExePrint("CopyTree(\"::/\",\"%C:/\");",			drv_let);
+
+	ExePrint("Del(\"%C:/Boot/Limine-CD.BIN\");", drv_let);
+	ExePrint("Del(\"%C:/Boot/Limine-CD-EFI.BIN\");", drv_let);
+	ExePrint("Del(\"%C:/Boot/Limine.CFG\");", drv_let);
+	ExePrint("Del(\"%C:/boot.catalog\");", drv_let);
+
 	ExePrint("DirMake(\"%C:/Tmp\");",				drv_let);
 	ExePrint("DirMake(\"%C:/Tmp/ScreenShots\");",	drv_let);
 	ExePrint("DirMake(\"%C:/Home\");",				drv_let);
@@ -206,13 +284,13 @@ U0 VMInstallDrive(CTask *task, U8 drv_let, I64 ata_port, I64 atapi_port)
 		XTalkWait(task, "C\n%d\n", ata_port);
 	if (atapi_port > -1)
 		XTalkWait(task, "T%d\n", atapi_port);
-	XTalkWait(task, "\n1024\n768\n\n\n"); //Exit Drives,  set Screen Resolution, skip Disk Cache and Options
+	XTalkWait(task, "\n\n\n\n"); //Exit Drives, skip Disk Cache and Options
 }
 
 U0 VMInstallWiz()
 {
 	CTask		*task;
-	I64			 i, atapi_port = -1, ata_port = -1;
+	I64			 i, atapi_port = -1, ata_port = -1, ch;
 	CAHCIPort	*port;
 
 	task = User;
@@ -229,7 +307,7 @@ U0 VMInstallWiz()
 	SATARep;
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 	{
-		if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 			if (port->signature == AHCI_PxSIG_ATA)
@@ -241,7 +319,7 @@ U0 VMInstallWiz()
 	}
 	for (i = 0; i < AHCI_MAX_PORTS; i++)
 	{
-		if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+		if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 		{
 			port = &blkdev.ahci_hba->ports[i];
 			if (port->signature == AHCI_PxSIG_ATAPI)
@@ -256,7 +334,38 @@ U0 VMInstallWiz()
 	{
 		VMInstallDrive(task, 'C', ata_port, atapi_port);
 		VMInstallDrive(task, 'D', ata_port, atapi_port);
-		BootMHDIns('C');
+		if (!sys_is_uefi_booted)
+		{
+			if (FileFind(LIMINE_HDD_FILE))
+			{
+				"\n\n"
+				"" LIMINE_INSTALL_PROMPT;
+				"(Z/L): ";
+
+				do
+					ch = ToUpper(CharGet(, FALSE));
+				while (ch != 'Z' && ch != 'L');
+
+				"%c\n", ch;
+
+				if (ch == 'Z')
+				{
+					BootMHDIns('C');
+					"\n(Generating optional UEFI-mode Limine.CFG...)\n";
+					LimineCFGMake('C');
+				}
+				else
+				{
+					LimineMHDIns('C');
+				}
+				"\n\n";
+			}
+			else
+				BootMHDIns('C');
+		}
+		else
+			LimineCFGMake('C');
+
 	}
 
 	WinVert(task->win_top, Fs->win_bottom);
@@ -267,7 +376,7 @@ U0 RegularInstallWiz()
 {
 	I64		 drv_let;
 	U8		*st, *port_st;
-	I64		 ch, res_num;
+	I64		 ch;
 	CTask	*task;
 
 	task = User;
@@ -336,15 +445,43 @@ U0 RegularInstallWiz()
 
 
 	XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\nC\n%s\n\n", drv_let, port_st);
-	VideoRep;
+	XTalkWait(task, "\n\n"); //skip through Disk Cache, Options
-	res_num = I64Get("Enter desired list num ($$PURPLE$$<ENTER>$$FG$$ for max res): ",, 1);
+	if (!sys_is_uefi_booted)
-	XTalkWait(task, "%d\n\n\n", res_num); //skip through Disk Cache, Options
-	"$$RED$$Install Master Boot loader?$$FG$$";
-	if (YorN)
 	{
-		'\n';
+		"$$RED$$Install Master Boot loader?$$FG$$";
-		BootMHDIns(drv_let);
+		if (YorN)
+		{
+			"\n\n";
+			if (FileFind(LIMINE_HDD_FILE))
+			{
+				"" LIMINE_INSTALL_PROMPT;
+				"(Z/L): ";
+
+				do
+					ch = ToUpper(CharGet(, FALSE));
+				while (ch != 'Z' && ch != 'L');
+
+
+				"%c\n", ch;
+
+				if (ch == 'Z')
+				{
+					BootMHDIns(drv_let);
+					"\n(Generating optional UEFI-mode Limine.CFG...)\n";
+					LimineCFGMake(drv_let); // ensures we don't leave the LiveCD's Limine.CFG on the HDD
+				}
+				else
+				{
+					LimineMHDIns(drv_let);
+				}
+				"\n\n";
+			}
+			else
+				BootMHDIns(drv_let);
+		}
 	}
+	else
+		LimineCFGMake(drv_let);
 
 	WinVert(task->win_top, Fs->win_bottom);
 	Kill(task);
@@ -380,6 +517,8 @@ Bool DoInstall(Bool prompt_reboot)
 			ch = ToUpper(CharGet(, FALSE));
 		while (ch != 'U' && ch != 'I');
 
+		"%c\n", ch;
+
 		if (ch == 'U')
 			OSUpgrade;
 		else
@@ -400,6 +539,8 @@ Bool DoInstall(Bool prompt_reboot)
 				ch = ToUpper(CharGet(, FALSE));
 			while (ch != 'U' && ch != 'I');
 
+			"%c\n", ch;
+
 			if (ch == 'I')
 			{
 				RegularInstallWiz();

src/System/BlkDev/Mount.ZC

@@ -60,7 +60,7 @@ public I64 SATARep(I64 bd_type=BDT_NULL)
 
 		for (i = 0; i < AHCI_MAX_PORTS; i++)
 		{
-			if (Bt(&blkdev.ahci_hba->ports_implemented, i))
+			if (PCIBt(&blkdev.ahci_hba->ports_implemented, i))
 			{
 				port = &blkdev.ahci_hba->ports[i];
 

src/System/Boot/BootMHDIns.ZC

@@ -12,12 +12,13 @@
 //Old master boot record
 #define BOOT_DIR_OLDMBR_BIN 	BOOT_DIR "/OldMBR.BIN"
 
-public U0 BootMHDOldRead(U8 src_drive, U8 dst_drive)
+public U0 BootMHDOldRead(U8 src_drive, U8 dst_drive, I64 size=1)
 {//Reads MBR from disk drive containing src partition.
-//Writes a single block file to dst BOOT_DIR.
+//Writes MBR file to dst BOOT_DIR.
+// Takes optional arg 'size': count of 512-byte blocks.
 	CBlkDev		*bd = Letter2BlkDev(src_drive);
 	CDrive		*drive;
-	CMasterBoot	 mbr;
+	U8			*mbr = MAlloc(BLK_SIZE * size);
 
 	Drive(dst_drive);
 	drive = Fs->cur_dv;
@@ -28,28 +29,30 @@ public U0 BootMHDOldRead(U8 src_drive, U8 dst_drive)
 	{
 //Bypass partition bounds-checking
 		BlkDevLock(bd);
-		AHCIAtaBlksRead(bd, &mbr, 0, 1);
+		AHCIAtaBlksRead(bd, mbr, 0, size);
 		BlkDevUnlock(bd);
 
 		Drive(dst_drive);
 		DirMake(BOOT_DIR);
-		FileWrite(BOOT_DIR_OLDMBR_BIN, &mbr, BLK_SIZE);
+		FileWrite(BOOT_DIR_OLDMBR_BIN, mbr, size * BLK_SIZE);
 	}
 }
 
 public U0 BootMHDOldWrite(U8 src_drive, U8 dst_drive)
 {//Reads OldMBR from src drive BOOT_DIR.
 //writes it to the MBR of the drive with dst partition.
+// If OldMBR.BIN size > BLK_SIZE, writes to post-MBR gap.
 	CBlkDev		*bd = Letter2BlkDev(dst_drive);
 	CMasterBoot	*mbr;
+	I64			 size;
 
 	Drive(src_drive);
 
-	if (mbr = FileRead(BOOT_DIR_OLDMBR_BIN))
+	if (mbr = FileRead(BOOT_DIR_OLDMBR_BIN, &size))
 	{
 //Bypass partition bounds-checking
 		BlkDevLock(bd);
-		AHCIAtaBlksWrite(bd, mbr, 0, 1);
+		AHCIAtaBlksWrite(bd, mbr, 0, size / BLK_SIZE);
 		BlkDevUnlock(bd);
 	}
 	Free(mbr);
@@ -117,10 +120,13 @@ public Bool BootMHDIns(U8 drv_let, U8 *drv_list=NULL)
 			StrPrint(menu_ptr, "\n\r\n\rZealOS Boot Loader\n\r\n\r");
 			j = 0;
 
+			"\nDetected boot drives:\n";
+			"(Choice %16s)\n", "drv_offset";
 			if (FileFind(BOOT_DIR_OLDMBR_BIN, &de, FUF_JUST_FILES))
 			{
 				Free(de.full_name);
 				*_q++ = Clus2Blk(drive, de.clus);
+				"Old Boot Record\n";
 				CatPrint(menu_ptr, "0. Old Boot Record\n\r");
 				j++;
 			}
@@ -173,6 +179,7 @@ public Bool BootMHDIns(U8 drv_let, U8 *drv_list=NULL)
 				res = TRUE;
 			}
 		}
+		"\nZealOS Public Domain HDD MBR Boot Loader installed.\n\n";
 	}
 	catch
 		PutExcept;

src/System/Boot/LimineMHDIns.ZC

@@ -0,0 +1,118 @@
+
+class CLimineStage2Header
+{
+	U16 size_a;
+	U16 size_b;
+	U64 location_a;
+	U64 location_b;
+};
+
+#ifndef binary_limine_hdd_bin_data
+U8 binary_limine_hdd_bin_data[0];
+#endif
+
+Bool LimineCFGMake(U8 drv_let)
+{
+	U8		*filename_cfg = MStrPrint("%C:/Boot/Limine.CFG", drv_let);
+	CDoc	*doc = DocNew(filename_cfg);
+	CDrive	*drive;
+	CBlkDev	*bd;
+	I64		 i;
+	U8		*filename_sys, *filename_elf, *filename_zxe, *st;
+
+	"\nGenerating Limine.CFG ...\n";
+
+	DocPrint(doc,
+		"TIMEOUT=2\n"
+		"INTERFACE_RESOLUTION=1024x768\n\n");
+
+	"Searching drives for Limine bootloader files ...\n";
+	for (i = 0, drive = blkdev.drvs; i < DRIVES_NUM; i++, drive++)
+	{
+		if (drive->drive_signature == DRIVE_SIGNATURE_VAL && drive->fs_type == FSt_FAT32 && DriveIsWritable(drive->drv_let))
+		{
+			bd = drive->bd;
+			drv_let = Drive2Letter(drive);
+
+			filename_sys = MStrPrint("%C:/Boot/Limine.SYS", drv_let);
+			filename_elf = MStrPrint("%C:/Boot/ZealBooter.ELF", drv_let);
+			filename_zxe = MStrPrint("%C:/Boot/Kernel.ZXE", drv_let);
+			if (FileFind(filename_sys) && FileFind(filename_elf) && FileFind(filename_zxe))
+			{
+				st = MStrPrint(":ZealOS %C:/\n"
+					"PROTOCOL=limine\n"
+					"RESOLUTION=1024x768\n"
+					"KERNEL_PATH=boot://%d/Boot/ZealBooter.ELF\n"
+					"MODULE_PATH=boot://%d/Boot/Kernel.ZXE\n"
+					"\n", drv_let, drive->prt_num + 1, drive->prt_num + 1);
+
+				DocPrint(doc, st);
+				"%C:/ drive added as a Limine.CFG menu entry.\n", drv_let;
+			}
+			else
+				"%C:/ drive is missing Limine bootloader files.\n", drv_let;
+		}
+	}
+	DocWrite(doc);
+	DocDel(doc);
+
+	"/Boot/Limine.CFG generated.\n";
+
+	"Copying Limine.CFG to all other drives ...\n";
+	for (i = 0, drive = blkdev.drvs; i < DRIVES_NUM; i++, drive++)
+	{
+		if (drive->drive_signature == DRIVE_SIGNATURE_VAL && drive->fs_type == FSt_FAT32 && DriveIsWritable(drive->drv_let))
+		{
+			drv_let = Drive2Letter(drive);
+			if (FileFind(filename_sys) && FileFind(filename_elf) && FileFind(filename_zxe))
+			{
+				st = MStrPrint("%C:/Boot/Limine.CFG", drv_let);
+				Copy(filename_cfg, st);
+			}
+		}
+	}
+
+	return TRUE;
+}
+
+Bool LimineMHDIns(U8 drv_let)
+{
+	U8					*limine			= binary_limine_hdd_bin_data;
+	U16					 limine_size	= sizeof(binary_limine_hdd_bin_data);
+	CLimineStage2Header *limine_stage2	= limine + 0x1A4;
+	U16					 limine_stage2_size = limine_size - BLK_SIZE;
+	U16					 limine_stage2_size_aligned = limine_stage2_size + ((BLK_SIZE * 2) - limine_stage2_size % (BLK_SIZE * 2));
+	CBlkDev				*bd = Letter2BlkDev(drv_let);
+	CMasterBoot			 old_mbr, *new_mbr = limine;
+
+	if (limine_size == 0)
+	{
+		"\n" ST_ERR_ST "Limine HDD MBR binary bytes not found. Must first #include it, then recompile this file.\n";
+		return FALSE;
+	}
+
+	'\n';
+
+	limine_stage2->size_a = limine_stage2->size_b = limine_stage2_size_aligned / 2;
+	limine_stage2->location_a = BLK_SIZE;
+	limine_stage2->location_b = BLK_SIZE + limine_stage2->size_a;
+
+	BlkDevLock(bd);
+
+	AHCIAtaBlksRead(bd, &old_mbr, 0, 1); // read old MBR currently on disk
+	MemCopy(new_mbr->p, old_mbr.p, sizeof(CMasterBoot.p)); // copy old MBR partition table to new Limine MBR
+
+	// read the whole MBR + post-MBR-gap that Limine wants to overwrite, save all of that as an OldMBR.BIN
+	BootMHDOldRead(drv_let, drv_let, 1 + (limine_stage2_size_aligned / BLK_SIZE));
+
+	AHCIAtaBlksWrite(bd, limine, 0, 1 + (limine_stage2_size_aligned / BLK_SIZE)); // write Limine to MBR and post-MBR gap
+
+	BlkDevUnlock(bd);
+
+	LimineCFGMake(drv_let);
+
+	"\nLimine BSD2-licensed HDD MBR Boot Loader installed.\n\n";
+
+	return TRUE;
+
+}

src/System/Define.ZC

@@ -15,8 +15,8 @@ U0 LoadDocDefines()
 	//$LK,"DD_BOOT_HIGH_LOC_DVD",A="FF:::/System/Boot/BootDVD.ZC,DD_BOOT_HIGH_LOC_DVD"$
 
 $TR,"LineRep"$
-$ID,2$DefinePrint("DD_ZEALOS_LOC","98,216");
+$ID,2$DefinePrint("DD_ZEALOS_LOC","98,675");
-$ID,-2$
+$ID,-2$
 	DefinePrint("DD_MP_VECT", "%08X", MP_VECT_ADDR);
 	DefinePrint("DD_MP_VECT_END", "%08X", MP_VECT_ADDR + COREAP_16BIT_INIT_END - COREAP_16BIT_INIT - 1);
 

src/System/DevInfo.ZC

@@ -1,136 +1,5 @@
 #help_index "PCI;Processor;Devices;Info"
 
-//The file was downloaded from
-//http://www.pcidatabase.com/reports.php?type=tab-delimeted
-
-#define PCI_DEV_FILE "::/Misc/PCIDevices.DD"
-
-/****
-//1) Download http://www.pcidatabase.com/reports.php?type=tab-delimeted
-//2) Rename to ::/Misc/PCIDevices.DD
-//3) ToDolDoc("::/Misc/PCIDevices.DD");
-//4) Edit and remove file header and tail
-//5) Text find-and-replace "=0A=" with "". (Doesn't seem necessary anmore.)
-//6) Run PCIDevFileGen(). (Doesn't seem necessary anmore.)
-
-public U0 PCIDevFileGen()
-{
-	Bool first=TRUE,del=FALSE,del2=FALSE,cont=FALSE;
-	CDoc *doc=DocRead(PCI_DEV_FILE,
-				DOCF_PLAIN_TEXT|DOCF_DBL_DOLLARS|DOCF_NO_CURSOR);
-	CDocEntry *doc_e=doc->head.next,*doc_e2;
-	while (doc_e!=doc) {
-		doc_e2=doc_e->next;
-		if (first) {
-			if (doc_e->type_u8==DOCT_TEXT) {
-				if (doc_e->tag[0]==';')
-					del=TRUE;
-			}
-			first=FALSE;
-		}
-		if (doc_e->type_u8==DOCT_TEXT && doc_e->tag[StrLen(doc_e->tag)-1]=='=' &&
-					doc_e2->type_u8==DOCT_NEW_LINE) {
-			doc_e->tag[StrLen(doc_e->tag)-1]=CH_SPACE;
-			cont=TRUE;
-		}
-		del2=del;
-		if (doc_e->type_u8==DOCT_NEW_LINE) {
-			first=TRUE;
-			del2=FALSE;
-			if (cont) {
-				del=TRUE;
-				cont=FALSE;
-			}
-		}
-		if (del)
-			DocEntryDel(doc,doc_e);
-		del=del2;
-		doc_e=doc_e2;
-	}
-	DocWrite(doc);
-}
-****/
-
-//$LK,"::/Misc/PCIDevices.DD",A="PI:::/Misc/PCIDevices.DD"$
-U0 PCILookUpSingle(CDoc *doc, I64 m, I64 d, U8 **_vendor, U8 **_dev)
-{
-	Bool		 first = TRUE;
-	U8			 buf[8], *vendor = NULL, *dev = NULL;
-	CDocEntry	*doc_e = doc->head.next;
-
-	while (doc_e != doc)
-	{
-		if (first)
-		{
-			if (doc_e->type_u8 == DOCT_TEXT && doc_e->tag[0] != ';' && StrLen(doc_e->tag) >= 4)
-			{
-				buf[0](U16) = '0x';
-				buf[2](U32) = doc_e->tag(U32 *)[0];
-				buf[6] = '\0';
-				if (Str2I64(buf) == m)
-				{
-					doc_e = doc_e->next->next->next;
-					if (doc_e->type_u8 == DOCT_TEXT)
-					{
-						vendor = SysStrNew(doc_e->tag);
-						first = FALSE;
-						break;
-					}
-				}
-			}
-			first=FALSE;
-		}
-		if (doc_e->type_u8 == DOCT_NEW_LINE)
-			first = TRUE;
-		doc_e = doc_e->next;
-	}
-
-	if (vendor)
-	{
-		while (doc_e != doc)
-		{
-			if (first)
-			{
-				if (doc_e->type_u8 == DOCT_TAB)
-				{
-					doc_e = doc_e->next->next->next->next;
-					if (doc_e->type_u8 == DOCT_TEXT && StrLen(doc_e->tag) >= 4)
-					{
-						buf[0](U16) = '0x';
-						buf[2](U32) = doc_e->tag(U32 *)[0];
-						buf[6] = '\0';
-						if (Str2I64(buf) == d)
-						{
-							doc_e = doc_e->next->next->next;
-							if (doc_e->type_u8 == DOCT_TEXT)
-							{
-								dev = SysStrNew(doc_e->tag);
-								break;
-							}
-						}
-					}
-				}
-				else
-					break;
-				first = FALSE;
-			}
-			if (doc_e->type_u8 == DOCT_NEW_LINE)
-				first = TRUE;
-			doc_e = doc_e->next;
-		}
-	}
-
-	if (vendor)
-		*_vendor = vendor;
-	else
-		*_vendor = SysStrNew("Unknown");
-
-	if (dev)
-		*_dev = dev;
-	else
-		*_dev = SysStrNew("Unknown");
-}
-
 U0 PCILookUpDevs()
 {
 	CPCIDev	*tmppci;
@@ -253,11 +122,11 @@ public U0 MemBIOSRep()
 	"FEE00000-FEE00FFF See $LK,"APIC",A="MN:LAPIC_BASE"$\n\n";
 
 	if (!IsRaw)
-		"$$PURPLE$$VBE Linear Framebuffer$$FG$$\n";
+		"$$PURPLE$$Linear Framebuffer$$FG$$\n";
 	else
-		"VBE Linear Framebuffer\n";
+		"Linear Framebuffer\n";
 
-	"%08X-%08X  See $LK,"VBE Mode",A="FF:::/Kernel/KernelA.HH,framebuffer"$\n", text.fb_alias, text.fb_alias(U8 *) + text.buffer_size - 1;
+	"%08X-%08X  \n", text.fb_alias, text.fb_alias(U8 *) + text.buffer_size - 1;
 
 	if (!IsRaw)
 		"\n$$PURPLE$$32 Bit Device Mem$$FG$$\n";

src/System/Gr/GrGlobals.ZC

@@ -47,9 +47,9 @@ public CBGR24 gr_palette[COLORS_NUM];
 //See $LK,"SysGrInit",A="MN:SysGrInit"$()
 //Allows consts to be used instead of variables.
 HashPublic("GR_WIDTH", HTT_DEFINE_STR);;
-DefinePrint("GR_WIDTH", "%d", sys_vbe_mode.width);
+DefinePrint("GR_WIDTH", "%d", sys_framebuffer_width);
 HashPublic("GR_HEIGHT", HTT_DEFINE_STR);;
-DefinePrint("GR_HEIGHT", "%d", sys_vbe_mode.height);
+DefinePrint("GR_HEIGHT", "%d", sys_framebuffer_height);
 
 #help_index "Char;TextBase Layer/Char"
 DefinePrint("TEXT_ROWS", "%d", text.rows);;

src/System/Gr/GrInitB.ZC

@@ -187,7 +187,7 @@ U0 GrInit2()
 	gr.to_8_bits	= MAlloc(256 * sizeof(I64));
 	gr.to_8_colors	= MAlloc(256 * sizeof(I64));
 
-	gr.screen_cache = MAlloc(sys_vbe_mode.width * sys_vbe_mode.height);
+	gr.screen_cache = MAlloc(sys_framebuffer_width * sys_framebuffer_height);
 
 	gr.text_base			= CAlloc(TEXT_ROWS * TEXT_COLS * sizeof(U32));
 	gr.win_uncovered_bitmap	= CAlloc(65536 / 8);

src/System/Gr/GrPalette.ZC

@@ -20,7 +20,7 @@ public CBGR24 gr32_palette_std[COLORS_NUM] = {
 };
 
 public U0 PaletteSetStd(Bool persistent=TRUE)
-{//Activate std palette.
+{//Activate standard palette.
 	GrPaletteSet(gr32_palette_std);
 	LFBFlush;
 	if (persistent)
@@ -80,11 +80,11 @@ public U0 PaletteSetSlate(Bool persistent=TRUE)
 }
 //********************************************************************************
 public CBGR24 gr_palette_commander[COLORS_NUM] = {
-	0xFFFFFF, 0x867ADE, 0x00CC55, 0x5A878B, 0xEE0000, 0xCC44CC, 0xDD8855, 0xBBBBBB,
+	0xFFFFFF, 0x867ADE, 0x00CC55, 0x5A878B, 0xFF0000, 0xCC44CC, 0xDD8855, 0xE1E1E2,
-	0x777777, 0x009BFF, 0xAAFF66, 0xAAFFEE, 0xFF7777, 0xCA94E8, 0xEEEE77, 0x483AAA
+	0x777777, 0x009BFF, 0xAAFF66, 0xAAFFEE, 0xFF7777, 0xCA94E8, 0xEEEE77, 0x483AA7
 };
 public U0 PaletteSetCommander(Bool persistent=TRUE)
-{//Activate Slate palette.
+{//Activate Commander palette.
 	GrPaletteSet(gr_palette_commander);
 	LFBFlush;
 	if (persistent)

src/System/MakeSystem.ZC

@@ -20,6 +20,7 @@ LBts(&sys_run_level, RLf_DOC);
 #include "God/MakeGod"
 #include "Hash"
 #include "TaskSettings"
+#include "PCILookUpSingle"
 #include "DevInfo"
 #include "Define"
 #include "WallPaper"

src/System/PCILookUpSingle.ZC

@@ -0,0 +1,136 @@
+#help_index "PCI;Processor;Devices;Info"
+
+// PCILookUpSingle has been moved to its own file
+// to make it simpler to update for modern PCI device lists.
+// https://www.github.com/Zeal-Operating-System/PCIDeviceList
+
+//The file was downloaded from
+//http://www.pcidatabase.com/reports.php?type=tab-delimeted
+
+#define PCI_DEV_FILE "::/Misc/PCIDevices.DD"
+
+/****
+//1) Download http://www.pcidatabase.com/reports.php?type=tab-delimeted
+//2) Rename to ::/Misc/PCIDevices.DD
+//3) ToDolDoc("::/Misc/PCIDevices.DD");
+//4) Edit and remove file header and tail
+//5) Text find-and-replace "=0A=" with "". (Doesn't seem necessary anmore.)
+//6) Run PCIDevFileGen(). (Doesn't seem necessary anmore.)
+
+public U0 PCIDevFileGen()
+{
+	Bool first=TRUE,del=FALSE,del2=FALSE,cont=FALSE;
+	CDoc *doc=DocRead(PCI_DEV_FILE,
+				DOCF_PLAIN_TEXT|DOCF_DBL_DOLLARS|DOCF_NO_CURSOR);
+	CDocEntry *doc_e=doc->head.next,*doc_e2;
+	while (doc_e!=doc) {
+		doc_e2=doc_e->next;
+		if (first) {
+			if (doc_e->type_u8==DOCT_TEXT) {
+				if (doc_e->tag[0]==';')
+					del=TRUE;
+			}
+			first=FALSE;
+		}
+		if (doc_e->type_u8==DOCT_TEXT && doc_e->tag[StrLen(doc_e->tag)-1]=='=' &&
+					doc_e2->type_u8==DOCT_NEW_LINE) {
+			doc_e->tag[StrLen(doc_e->tag)-1]=CH_SPACE;
+			cont=TRUE;
+		}
+		del2=del;
+		if (doc_e->type_u8==DOCT_NEW_LINE) {
+			first=TRUE;
+			del2=FALSE;
+			if (cont) {
+				del=TRUE;
+				cont=FALSE;
+			}
+		}
+		if (del)
+			DocEntryDel(doc,doc_e);
+		del=del2;
+		doc_e=doc_e2;
+	}
+	DocWrite(doc);
+}
+****/
+
+//$LK,"::/Misc/PCIDevices.DD",A="PI:::/Misc/PCIDevices.DD"$
+U0 PCILookUpSingle(CDoc *doc, I64 m, I64 d, U8 **_vendor, U8 **_dev)
+{
+	Bool		 first = TRUE;
+	U8			 buf[8], *vendor = NULL, *dev = NULL;
+	CDocEntry	*doc_e = doc->head.next;
+
+	while (doc_e != doc)
+	{
+		if (first)
+		{
+			if (doc_e->type_u8 == DOCT_TEXT && doc_e->tag[0] != ';' && StrLen(doc_e->tag) >= 4)
+			{
+				buf[0](U16) = '0x';
+				buf[2](U32) = doc_e->tag(U32 *)[0];
+				buf[6] = '\0';
+				if (Str2I64(buf) == m)
+				{
+					doc_e = doc_e->next->next->next;
+					if (doc_e->type_u8 == DOCT_TEXT)
+					{
+						vendor = SysStrNew(doc_e->tag);
+						first = FALSE;
+						break;
+					}
+				}
+			}
+			first=FALSE;
+		}
+		if (doc_e->type_u8 == DOCT_NEW_LINE)
+			first = TRUE;
+		doc_e = doc_e->next;
+	}
+
+	if (vendor)
+	{
+		while (doc_e != doc)
+		{
+			if (first)
+			{
+				if (doc_e->type_u8 == DOCT_TAB)
+				{
+					doc_e = doc_e->next->next->next->next;
+					if (doc_e->type_u8 == DOCT_TEXT && StrLen(doc_e->tag) >= 4)
+					{
+						buf[0](U16) = '0x';
+						buf[2](U32) = doc_e->tag(U32 *)[0];
+						buf[6] = '\0';
+						if (Str2I64(buf) == d)
+						{
+							doc_e = doc_e->next->next->next;
+							if (doc_e->type_u8 == DOCT_TEXT)
+							{
+								dev = SysStrNew(doc_e->tag);
+								break;
+							}
+						}
+					}
+				}
+				else
+					break;
+				first = FALSE;
+			}
+			if (doc_e->type_u8 == DOCT_NEW_LINE)
+				first = TRUE;
+			doc_e = doc_e->next;
+		}
+	}
+
+	if (vendor)
+		*_vendor = vendor;
+	else
+		*_vendor = SysStrNew("Unknown");
+
+	if (dev)
+		*_dev = dev;
+	else
+		*_dev = SysStrNew("Unknown");
+}

src/System/Utils/Diff.ZC

@@ -36,6 +36,7 @@ I64 DiffEntriesCompare(CDocEntry *doc_e1, CDocEntry *doc_e2)
 #define DF_ABORT_FILE 					0x10
 #define DF_ABORT_ALL_FILES				0x20
 #define DF_NO_MORE_PROMPTS_THIS_FILE	0x40
+#define DF_KEEP_FLAGS					0x80 // tells Diff NOT to &= with abort-all flag at call start
 
 U0 DiffSel(CDoc *doc, I64 *_df_flags, I64 j1_lo, I64 j1_hi, I64 j2_lo, I64 j2_hi, I64 count1, I64 count2,
 		   CDocEntry **doc_unsorted1, CDocEntry **doc_unsorted2)
@@ -181,7 +182,13 @@ Bool DiffSub(CDoc *doc, I64 *_df_flags, I64 j1_lo, I64 j1_hi, I64 j2_lo, I64 j2_
 			i2++;
 		else
 		{
-			i = StrCompare(doc_sorted1[i1]->tag, doc_sorted2[i2]->tag);
+			if (!CheckPtr(doc_sorted1[i1]) || !CheckPtr(doc_sorted2[i2]) || !CheckPtr(doc_sorted1[i1]->tag) || !CheckPtr(doc_sorted2[i2]->tag))
+			{
+				RawPrint(200, "DiffSub PANIC DEBUG FIXME: %X %X %X %X\n", doc_sorted1[i1], doc_sorted2[i2], doc_sorted1[i1]->tag, doc_sorted2[i2]->tag);
+				i = 1; // ???
+			}
+			else
+				i = StrCompare(doc_sorted1[i1]->tag, doc_sorted2[i2]->tag);
 			if (i > 0)
 				i2++;
 			else if (i < 0)
@@ -270,7 +277,9 @@ public Bool Diff(U8 *dst_file, U8 *src_file, I64 *_df_flags=NULL)
 		df_flags = *_df_flags;
 	else
 		df_flags = 0;
-	df_flags &= DF_ABORT_ALL_FILES;
+
+	if (!(df_flags & DF_KEEP_FLAGS))
+		df_flags &= DF_ABORT_ALL_FILES;
 
 	doc_e = doc1->head.next;
 	while (doc_e != doc1)

src/System/Utils/SysRep.ZC

@@ -660,6 +660,12 @@ Bool SMBIOSEntryScan(CSMBIOSEntryPoint **entry)
 	I64		 i;
 	U8 noreg checksum = 0, *mem = 0xF0000;
 
+	if (sys_smbios_entry)
+	{
+		*entry = sys_smbios_entry;
+		return TRUE;
+	}
+
 	do
 	{
 		if (!MemCompare(mem, "_SM_", 4))

src/System/Utils/VideoRep.ZC

@@ -1,66 +1,68 @@
-public I64 VideoRep(Bool full=TRUE)
-{//List available VBE modes as indicated by the BIOS. Show current mode;
-	I64 i, mode_count = 0;
-	CVBEModeShort *mode;
 
-	if (full)
+public I64 VideoRep()
-	{
+{ // List available screen resolutions, show current resolution.
-		"\nVBE Version %X.%X\n\n", sys_vbe_info.version.u8[1], sys_vbe_info.version.u8[0];
+	I64			i, count = 0, div, aspect_w, aspect_h;
-		if (!IsRaw)
+	CVideoInfo *info;
-		{
+
-			"$$PURPLE$$Manufacturer      $$FG$$: $$BLACK$$%s$$FG$$\n", sys_vbe_info.oem;
+	"\n";
-			"$$PURPLE$$Vendor name       $$FG$$: $$BLACK$$%s$$FG$$\n", sys_vbe_info.vendor;
+	if (!IsRaw)
-			"$$PURPLE$$Product name      $$FG$$: $$BLACK$$%s$$FG$$\n", sys_vbe_info.product_name;
+		"$$PURPLE$$Framebuffer pointer: $$BLACK$$0x%8X$$FG$$ \n", sys_framebuffer_addr;
-			"$$PURPLE$$Product revision  $$FG$$: $$BLACK$$%s$$FG$$\n", sys_vbe_info.product_revision;
+	else
-			"$$PURPLE$$Software revision $$FG$$: $$BLACK$$%X.%X$$FG$$\n", sys_vbe_info.software_revision.u8[1],  sys_vbe_info.software_revision.u8[0];
+		"Framebuffer pointer: 0x%8X \n", sys_framebuffer_addr;
-			"$$PURPLE$$Hardware memory   $$FG$$: $$BLACK$$%d MiB$$FG$$\n", sys_vbe_info.total_memory * 64 / 1024;
+
-		}
+	"\nAll modes shown are 32-bit color.\n\n";
-		else
-		{
-			"Manufacturer      : %s\n", sys_vbe_info.oem;
-			"Vendor name       : %s\n", sys_vbe_info.vendor;
-			"Product name      : %s\n", sys_vbe_info.product_name;
-			"Product revision  : %s\n", sys_vbe_info.product_revision;
-			"Software revision : %X.%X\n", sys_vbe_info.software_revision.u8[1],  sys_vbe_info.software_revision.u8[0];
-			"Hardware memory   : %d MiB\n", sys_vbe_info.total_memory * 64 / 1024;
-		}
-		"\n\nAll modes shown are 32-bit color.\n\n";
-	}
 
 	if (!IsRaw)
-		"$$LTCYAN$$ #    W  x   H\t\t Mode$$FG$$\n\n";
+		"$$LTCYAN$$ #    W  x   H     Aspect Ratio$$FG$$\n\n";
 	else
-		" #\t\t  W  x   H\t\t Mode\n\n";
+		"  #\t\t  W  x   H     Aspect Ratio\n\n";
 
 	for (i = 0; i < VBE_MODES_NUM; i++)
 	{
-		mode = &sys_vbe_modes[i];
+		info = &sys_framebuffer_list[i];
-		if (mode->height)
+		if (info->height)
 		{
+			// Determine aspect ratio
+			aspect_w = info->width;
+			aspect_h = info->height;
+			div = 2;
+			while (TRUE)
+			{
+				while (aspect_w % div == 0 && aspect_h % div == 0)
+				{
+					aspect_w /= div;
+					aspect_h /= div;
+					div = 2;
+				}
+				div++;
+				if (div >= aspect_h || div >= aspect_w)
+					break;
+			}
+
 			if (!IsRaw)
 				"$$PURPLE$$ $$BT+X,\"%d\",LM=\"%d\\n\"$$$$FG$$$$LM,4$$", i+1, i+1;
 			else
 				" [%d]\t", i+1;
 
-			if (sys_vbe_mode_num == mode->mode_num)
+			if (info->width == sys_framebuffer_width && info->height == sys_framebuffer_height)
 			{
 				if (!IsRaw)
-					"$$RED$$%4d x %4d 	0x%X (Current mode)$$FG$$$$LM,0$$", mode->width, mode->height, mode->mode_num;
+					"$$RED$$%4d x %4d   %0.3f =%4d:%d (Current resolution)$$FG$$$$LM,0$$", info->width, info->height,  aspect_w / ToF64(aspect_h), aspect_w, aspect_h;
 				else
-					"%4d x %4d 	0x%X (Current mode)", mode->width, mode->height, mode->mode_num;
+					"%4d x %4d   %0.3f =%4d:%d (Current resolution)", info->width, info->height,  aspect_w / ToF64(aspect_h), aspect_w, aspect_h;
 			}
 			else
 			{
 				if (!IsRaw)
-					"$$BLACK$$%4d x %4d 	$$FG$$0x%X$$LM,0$$", mode->width, mode->height, mode->mode_num;
+					"$$BLACK$$%4d x %4d$$FG$$   %0.3f =%4d:%d $$LM,0$$", info->width, info->height,  aspect_w / ToF64(aspect_h), aspect_w, aspect_h;
 				else
-					"%4d x %4d 	0x%X", mode->width, mode->height, mode->mode_num;
+					"%4d x %4d   %0.3f =%4d:%d ", info->width, info->height,  aspect_w / ToF64(aspect_h), aspect_w, aspect_h;
 			}
 
 			"\n\n\n";
-			mode_count++;
+			count++;
 		}
 	}
-	return mode_count;
-}
 
+	return count;
+}

zealbooter/GNUmakefile

@@ -0,0 +1,114 @@
+# This is the name that our final kernel executable will have.
+# Change as needed.
+override KERNEL := zealbooter.elf
+
+# Convenience macro to reliably declare overridable command variables.
+define DEFAULT_VAR =
+    ifeq ($(origin $1),default)
+        override $(1) := $(2)
+    endif
+    ifeq ($(origin $1),undefined)
+        override $(1) := $(2)
+    endif
+endef
+
+# It is highly recommended to use a custom built cross toolchain to build a kernel.
+# We are only using "cc" as a placeholder here. It may work by using
+# the host system's toolchain, but this is not guaranteed.
+$(eval $(call DEFAULT_VAR,CC,cc))
+
+# Same thing for "ld" (the linker).
+$(eval $(call DEFAULT_VAR,LD,ld))
+
+# User controllable CFLAGS.
+CFLAGS ?= -g -O2 -pipe -Wall -Wextra
+
+# User controllable preprocessor flags. We set none by default.
+CPPFLAGS ?=
+
+# User controllable nasm flags.
+NASMFLAGS ?= -F dwarf -g
+
+# User controllable linker flags. We set none by default.
+LDFLAGS ?=
+
+# Internal C flags that should not be changed by the user.
+override CFLAGS +=       \
+    -std=gnu11           \
+    -ffreestanding       \
+    -fno-stack-protector \
+    -fno-stack-check     \
+    -fno-lto             \
+    -fno-pie             \
+    -fno-pic             \
+    -m64                 \
+    -march=x86-64        \
+    -mabi=sysv           \
+    -mno-80387           \
+    -mno-mmx             \
+    -mno-sse             \
+    -mno-sse2            \
+    -mno-red-zone        \
+    -mcmodel=kernel      \
+    -MMD                 \
+    -I.                  \
+    -I./lib
+
+# Internal linker flags that should not be changed by the user.
+override LDFLAGS +=         \
+    -nostdlib               \
+    -static                 \
+    -m elf_x86_64           \
+    -z max-page-size=0x1000 \
+    -T linker.ld
+
+# Check if the linker supports -no-pie and enable it if it does
+ifeq ($(shell $(LD) --help 2>&1 | grep 'no-pie' >/dev/null 2>&1; echo $$?),0)
+    override LDFLAGS += -no-pie
+endif
+
+# Internal nasm flags that should not be changed by the user.
+override NASMFLAGS += \
+    -f elf64
+
+# Use find to glob all *.c, *.S, and *.asm files in the directory and extract the object names.
+override CFILES := $(shell find . -type f -name '*.c')
+override ASFILES := $(shell find . -type f -name '*.S')
+override NASMFILES := $(shell find . -type f -name '*.asm')
+override OBJ := $(CFILES:.c=.o) $(ASFILES:.S=.o) $(NASMFILES:.asm=.o)
+override HEADER_DEPS := $(CFILES:.c=.d) $(ASFILES:.S=.d)
+
+# Default target.
+.PHONY: all
+all: $(KERNEL)
+
+limine.h:
+	curl https://raw.githubusercontent.com/limine-bootloader/limine/trunk/limine.h -o $@ || cp ../build/limine/limine.h limine.h || echo "ERROR"
+
+# Link rules for the final kernel executable.
+$(KERNEL): $(OBJ)
+	$(LD) $(OBJ) $(LDFLAGS) -o $@
+
+# Include header dependencies.
+-include $(HEADER_DEPS)
+
+# Compilation rules for *.c files.
+%.o: %.c limine.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+# Compilation rules for *.S files.
+%.o: %.S limine.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+# Compilation rules for *.asm (nasm) files.
+%.o: %.asm
+	nasm $(NASMFLAGS) $< -o $@
+
+# Remove object files and the final executable.
+.PHONY: clean
+clean:
+	rm -rf $(KERNEL) $(OBJ) $(HEADER_DEPS)
+
+.PHONY: distclean
+distclean: clean
+	rm -f limine.h

zealbooter/Limine.CFG

@@ -0,0 +1,8 @@
+TIMEOUT=2
+INTERFACE_RESOLUTION=1024x768
+
+:ZealOS LiveCD
+PROTOCOL=limine
+RESOLUTION=1024x768
+KERNEL_PATH=boot:///Boot/ZealBooter.ELF
+MODULE_PATH=boot:///Boot/Kernel.ZXE

zealbooter/lib.c

@@ -0,0 +1,13 @@
+#include <stdint.h>
+#include <lib.h>
+
+uint64_t div_roundup_u64(uint64_t a, uint64_t b)
+{
+	return (a + (b - 1)) / b;
+}
+
+uint64_t align_up_u64(uint64_t a, uint64_t b)
+{
+	return div_roundup_u64(a, b) * b;
+}
+

zealbooter/lib.h

@@ -0,0 +1,21 @@
+#ifndef __LIB_H__
+#define __LIB_H__
+
+#include <stdint.h>
+#include <memcpy.h>
+#include <memset.h>
+#include <memmove.h>
+#include <memcmp.h>
+#include <strcpy.h>
+#include <strncpy.h>
+#include <strcmp.h>
+#include <strncmp.h>
+#include <strlen.h>
+#include <print.h>
+
+uint64_t div_roundup_u64(uint64_t a, uint64_t b);
+uint64_t align_up_u64(uint64_t a, uint64_t b);
+
+typedef char symbol[];
+
+#endif // __LIB_H__

zealbooter/lib/memcmp.c

@@ -0,0 +1,26 @@
+/* memcmp( const void *, const void *, size_t )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+int memcmp(const void *s1, const void *s2, size_t n)
+{
+    const unsigned char *p1 = (const unsigned char *)s1;
+    const unsigned char *p2 = (const unsigned char *)s2;
+
+    while (n--)
+    {
+        if (*p1 != *p2)
+        {
+            return *p1 - *p2;
+        }
+
+        ++p1;
+        ++p2;
+    }
+
+    return 0;
+}
+

zealbooter/lib/memcmp.h

@@ -0,0 +1,6 @@
+#ifndef __MEMCMP_H__
+#define __MEMCMP_H__
+
+int memcmp(const void *s1, const void *s2, size_t n);
+
+#endif // __MEMCMP_H__

zealbooter/lib/memcpy.c

@@ -0,0 +1,21 @@
+/* memcpy( void *, const void *, size_t )
+
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+void *memcpy(void *s1, const void *s2, size_t n)
+{
+    char *dest = (char *)s1;
+    const char *src = (const char *)s2;
+
+    while (n--)
+    {
+        *dest++ = *src++;
+    }
+
+    return s1;
+}
+

zealbooter/lib/memcpy.h

@@ -0,0 +1,8 @@
+#ifndef __MEMCPY_H__
+#define __MEMCPY_H__
+
+#include <stddef.h>
+
+void *memcpy(void *s1, const void *s2, size_t n);
+
+#endif // __MEMCPY_H__

zealbooter/lib/memmove.c

@@ -0,0 +1,33 @@
+/* memmove( void *, const void *, size_t )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+void *memmove(void *s1, const void *s2, size_t n)
+{
+    char *dest = (char *)s1;
+    const char *src = (const char *)s2;
+
+    if (dest <= src)
+    {
+        while (n--)
+        {
+            *dest++ = *src++;
+        }
+    }
+    else
+    {
+        src += n;
+        dest += n;
+
+        while (n--)
+        {
+            *--dest = *--src;
+        }
+    }
+
+    return s1;
+}
+

zealbooter/lib/memmove.h

@@ -0,0 +1,6 @@
+#ifndef __MEMMOVE_H__
+#define __MEMMOVE_H__
+
+void *memmove(void *s1, const void *s2, size_t n);
+
+#endif // __MEMMOVE_H__

zealbooter/lib/memset.c

@@ -0,0 +1,20 @@
+/* memset( void *, int, size_t )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+void *memset(void *s, int c, size_t n)
+{
+    unsigned char *p = (unsigned char *)s;
+
+    while (n--)
+    {
+        *p++ = (unsigned char)c;
+    }
+
+    return s;
+}
+
+

zealbooter/lib/memset.h

@@ -0,0 +1,6 @@
+#ifndef __MEMSET_H__
+#define __MEMSET_H__
+
+void *memset(void *s, int c, size_t n);
+
+#endif // __MEMSET_H__

zealbooter/lib/print.c

@@ -0,0 +1,31 @@
+#define STB_SPRINTF_DECORATE(name) name
+#define STB_SPRINTF_IMPLEMENTATION 1
+#define STB_SPRINTF_NOFLOAT 1
+#include <stb_sprintf.h>
+#include <limine.h>
+
+static volatile struct limine_terminal_request terminal_request = {
+    .id = LIMINE_TERMINAL_REQUEST,
+    .revision = 0
+};
+
+#define PRINT_BUFFER_SIZE    8192
+
+int printf(const char *format, ...)
+{
+    va_list args;
+    char buffer[PRINT_BUFFER_SIZE];
+    struct limine_terminal *terminal;
+    size_t length;
+
+    va_start(args, format);
+
+    length = vsnprintf(buffer, PRINT_BUFFER_SIZE, format, args);
+    terminal = terminal_request.response->terminals[0];
+    terminal_request.response->write(terminal, buffer, length);
+
+    va_end(args);
+
+    return length;
+}
+

zealbooter/lib/print.h

@@ -0,0 +1,6 @@
+#ifndef __PRINT_H__
+#define __PRINT_H__
+
+int printf(const char *format, ...);
+
+#endif // __PRINT_H__

zealbooter/lib/strcmp.c

@@ -0,0 +1,19 @@
+/* strcmp( const char *, const char * )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+int strcmp(const char *s1, const char *s2)
+{
+    while ((*s1) && (*s1 == *s2))
+    {
+        ++s1;
+        ++s2;
+    }
+
+    return (*(unsigned char *)s1 - *(unsigned char *)s2);
+}
+
+

zealbooter/lib/strcmp.h

@@ -0,0 +1,6 @@
+#ifndef __STRCMP_H__
+#define __STRCMP_H__
+
+int strcmp(const char *s1, const char *s2);
+
+#endif // __STRCMP_H__

zealbooter/lib/strcpy.c

@@ -0,0 +1,19 @@
+/* strcpy( char *, const char * )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+char *strcpy(char *s1, const char *s2)
+{
+    char *rc = s1;
+
+    while ((*s1++ = *s2++))
+    {
+        /* EMPTY */
+    }
+
+    return rc;
+}
+

zealbooter/lib/strcpy.h

@@ -0,0 +1,6 @@
+#ifndef __STRCPY_H__
+#define __STRCPY_H__
+
+char *strcpy(char *s1, const char *s2);
+
+#endif // __STRCPY_H__

zealbooter/lib/strlen.c

@@ -0,0 +1,19 @@
+/* strlen( const char * )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <stddef.h>
+
+size_t strlen(const char *s)
+{
+    size_t rc = 0;
+
+    while (s[rc])
+    {
+        ++rc;
+    }
+
+    return rc;
+}
+

zealbooter/lib/strlen.h

@@ -0,0 +1,6 @@
+#ifndef __STRLEN_H__
+#define __STRLEN_H__
+
+size_t strlen(const char *s);
+
+#endif // __STRLEN_H__