Merge branch 'master' into TweetNaCL

Author: y4my4my4m

.github/workflows/build.yml

@@ -0,0 +1,69 @@
+name: Build ZealOS ISOs
+
+on:
+  push:
+    branches:
+      - 'master'
+    paths-ignore:
+      - '**.md'
+      - 'screenshots/**'
+      - '**/LICENSE'
+  pull_request:
+    branches:
+      - 'master'
+    paths-ignore:
+      - '**.md'
+      - 'screenshots/**'
+      - '**/LICENSE'
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+
+      - name: Install Dependencies
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install build-essential git xorriso qemu-system-x86
+
+      - name: Enable KVM Group Perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Run ISOs Build Script
+        timeout-minutes: 10
+        if: ${{ success() }}
+        run: |
+          cd build
+          ./build-iso.sh --headless
+          cd ..
+
+      - name: ISO Check
+        if: ${{ success() && hashFiles('./build/*.iso') == '' }}
+        run: |
+          echo "ISOs not built!"
+          exit 1
+
+      - name: Releasing Latest ISOs
+        if: ${{ success() && github.event_name == 'push'}}
+        uses: "GutPuncher/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: false
+          title: "Pre-Built ISOs [${{ github.sha }}]"
+          files: ./build/*.iso
+
+      - name: OK
+        if: ${{ success() }}
+        run: |
+          echo "Build OK"

README.md

@@ -1,6 +1,6 @@
 # ZealOS
 
-[![Discord](https://img.shields.io/discord/934200098144022609?color=7289DA&label=Discord&logo=discord&logoColor=white)](https://discord.gg/rK6U3xdr7D) [![](https://img.shields.io/badge/wiki-documentation-forestgreen)](https://zeal-operating-system.github.io/ZealOS-wiki/)
+[![Discord](https://img.shields.io/discord/934200098144022609?color=7289DA&label=Discord&logo=discord&logoColor=white)](https://discord.gg/rK6U3xdr7D) [![](https://img.shields.io/badge/wiki-documentation-forestgreen)](https://zeal-operating-system.github.io/ZealOS-wiki/) [![Build ZealOS ISOs](https://github.com/Zeal-Operating-System/ZealOS/actions/workflows/build.yml/badge.svg)](https://github.com/Zeal-Operating-System/ZealOS/actions/workflows/build.yml)
 
 The Zeal Operating System is a modernized fork of the 64-bit Temple Operating System. Guiding principles of development include transparency, full user control, and adherence to public-domain/open-source implementations.
 
@@ -14,7 +14,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)
+  - UEFI booting via [BSD2-licensed Limine bootloader](https://github.com/limine-bootloader/limine) and [Public Domain ZealBooter prekernel](/zealbooter/src/zealbooter.c)
 
 [Changes include](https://zeal-operating-system.github.io/Doc/ChangeLog.DD.html):
   - 60 FPS

build/AUTO.ISO

@@ -13,8 +13,10 @@ then
 	exit
 fi
 
-# Uncomment if you use doas instead of sudo
-#alias sudo=doas 
+[ "$1" = "--headless" ] && QEMU_HEADLESS='-display none'
+
+KVM=''
+(lsmod | grep -q kvm) && KVM=' -accel kvm'
 
 # Set this true if you want to test ISOs in QEMU after building.
 TESTING=false
@@ -50,7 +52,7 @@ set +e
 
 echo "Making temp vdisk, running auto-install ..."
 $QEMU_BIN_PATH/qemu-img create -f raw $TMPDISK 1024M
-$QEMU_BIN_PATH/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
+$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35 $KVM -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -cdrom AUTO.ISO -device isa-debug-exit $QEMU_HEADLESS
 
 echo "Copying all src/ code into vdisk Tmp/OSBuild/ ..."
 rm ../src/Home/Registry.ZC 2> /dev/null
@@ -62,9 +64,9 @@ sudo cp -r ../src/* $TMPMOUNT/Tmp/OSBuild
 umount_tempdisk
 
 echo "Rebuilding kernel headers, kernel, OS, and building Distro ISO ..."
-$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35,accel=kvm -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -device isa-debug-exit
+$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35 $KVM -drive format=raw,file=$TMPDISK -m 1G -rtc base=localtime -smp 4 -device isa-debug-exit $QEMU_HEADLESS
 
-LIMINE_BINARY_BRANCH="v6.x-branch-binary"
+LIMINE_BINARY_BRANCH="v8.x-binary"
 
 if [ -d "limine" ]
 then
@@ -73,6 +75,8 @@ then
 	git fetch
 	git remote set-head origin $LIMINE_BINARY_BRANCH
 	git switch $LIMINE_BINARY_BRANCH
+	git config --local pull.ff true
+	git config --local pull.rebase true
 	git pull
 	rm limine
 
@@ -106,7 +110,7 @@ sudo cp limine/limine-uefi-cd.bin $TMPISODIR/Boot/Limine-UEFI-CD.BIN
 sudo cp limine/limine-bios-cd.bin $TMPISODIR/Boot/Limine-BIOS-CD.BIN
 sudo cp limine/limine-bios.sys $TMPISODIR/Boot/Limine-BIOS.SYS
 sudo cp ../zealbooter/bin/kernel $TMPISODIR/Boot/ZealBooter.ELF
-sudo cp ../zealbooter/Limine.CFG $TMPISODIR/Boot/Limine.CFG
+sudo cp ../zealbooter/limine.conf $TMPISODIR/Boot/Limine.CONF
 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
@@ -130,11 +134,11 @@ if [ "$TESTING" = true ]; then
 	    cd ..
 	fi
 	echo "Testing limine-zealbooter-xorriso isohybrid boot in UEFI mode ..."
-	$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -bios ovmf/OVMF.fd -smp 4 -cdrom ZealOS-limine.iso
+	$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35 $KVM -m 1G -rtc base=localtime -bios ovmf/OVMF.fd -smp 4 -cdrom ZealOS-limine.iso $QEMU_HEADLESS
 	echo "Testing limine-zealbooter-xorriso isohybrid boot in BIOS mode ..."
-	$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -smp 4 -cdrom ZealOS-limine.iso
+	$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35 $KVM -m 1G -rtc base=localtime -smp 4 -cdrom ZealOS-limine.iso $QEMU_HEADLESS
 	echo "Testing native ZealC MyDistro legacy ISO in BIOS mode ..."
-	$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35,accel=kvm -m 1G -rtc base=localtime -smp 4 -cdrom ZealOS-MyDistro.iso
+	$QEMU_BIN_PATH/qemu-system-x86_64 -machine q35 $KVM -m 1G -rtc base=localtime -smp 4 -cdrom ZealOS-MyDistro.iso $QEMU_HEADLESS
 fi
 
 # comment these 2 lines if you want lingering old Distro ISOs

build/build-iso.sh

@@ -15,7 +15,7 @@ read -p "Enter fork branch name: " FORK_BRANCH
 echo $FORK_BRANCH
 FORK_LOCAL=$FORK_BRANCH"-testing"
 echo "Creating new local branch for testing: "$FORK_LOCAL" ..."
-git checkout -b $FORK_LOCAL
+git checkout -B $FORK_LOCAL
 echo "Pulling changes from user's branch into new local branch..."
 git pull https://github.com/$FORK_USERNAME/ZealOS.git $FORK_BRANCH
 

build/git-pr-switch.sh

@@ -44,9 +44,10 @@ DOCS_DIR=
 TMPMOUNT=/tmp/zealtmp
 
 print_usage() {
-	echo "Usage: $0 ( repo | vm ) [OPTION]"
+	echo "Usage: $0 ( repo | vm | diff ) [OPTION]"
 	echo "    repo             Overwrites src/ with virtual disk contents."
 	echo "    vm               Overwrites virtual disk with src/ contents."
+	echo "    diff             Runs a 'diff' between src/ and virtual disk."
 	echo "Options:"
 	echo "    --ignore-dots    Ignore dotfiles/dotfolders during synchronize."
 }
@@ -73,6 +74,18 @@ else
 	sudo modprobe nbd
 	[ ! -d $TMPMOUNT ] && mkdir $TMPMOUNT
 	case $1 in
+		flush)
+			mount_vdisk
+			sudo blockdev --flushbufs /dev/nbd0
+			sudo dosfsck -w -r -l -v -t /dev/nbd0
+			umount_vdisk
+			;;
+		diff)
+			mount_vdisk
+			diff -x *.MAP --color=always -r ../src/ $TMPMOUNT/ | less -R -p "diff -x.*|Only in.*"
+			umount_vdisk
+			echo "Finished."
+			;;
 		repo)
 			echo "Emptying src..."
 			rm -rf ../src/*
@@ -90,6 +103,7 @@ else
 			umount_vdisk
 			[ -f ../src/Tmp/AUTO.ISO.C ] && mv ../src/Tmp/AUTO.ISO.C ./AUTO.ISO
 			echo "Finished."
+			cd ../
 			git status
 			;;
 		vm)

build/sync.sh

@@ -584,9 +584,9 @@ Bool MoveDo(GameState *state, I64 piece_num, I64 x2, I64 y2, Bool final)
 			game_over = TRUE;
 		}
 		GameSnapShot;
-  }
+	}
 
-  return ToBool(score_adjust);
+	return ToBool(score_adjust);
 }
 
 I64 MoveFind(I64 x, I64 y, Move *mvs, I64 mv_cnt)
@@ -664,18 +664,25 @@ I64 MoveCnt(GameState *state)
 {
 	I64  i, res = 0, mv_cnt;
 	Move mvs[32];
+	Bool king_stalemate = TRUE;
 
 	for (i = 0; i < 32; i++)
+	{
 		if (state->pieces[i].player == state->cur_player)
 		{
 			mv_cnt = PieceMoves(state, i, mvs);
 			mv_cnt = ChkPieceMoves(state, i, mvs,mv_cnt);
 			res += mv_cnt;
 		}
-	return res;
+		if (state->pieces[i].type != P_KING && state->pieces[i].player >= 0)
+			king_stalemate = FALSE;
+	}
+	if (king_stalemate)
+		return 0;
+	else
+		return res;
 }
 
-
 U0 DrawIt(CTask *task, CDC *dc)
 {
 	I64			 i, x, y, z, k0, k1;

src/Demo/Games/Chess.ZC

@@ -4,7 +4,7 @@
 
 I0 DrawPixel(I64 x, I64 y, CBGR24 color)
 {
-	text.fb_alias[x + y * GR_WIDTH] = color;
+	text.fb_alias[x + y * sys_framebuffer_width] = color;
 }
 
 I0 Color32Demo()

src/Demo/Graphics/32BitColor.ZC

@@ -32,12 +32,12 @@ U0 PaintGlobalsInit()
 
 I0 DrawImagePixel(I64 x, I64 y, CBGR24 color)
 {
-	paint.fb[x + y * GR_WIDTH] = color;
+	paint.fb[x + y * sys_framebuffer_width] = color;
 }
 
 I0 DrawScreenPixel(I64 x, I64 y, CBGR24 color)
 {
-	text.fb_alias[x + y * GR_WIDTH] = color;
+	text.fb_alias[x + y * sys_framebuffer_width] = color;
 }
 
 I0 DrawScreenChar(I64 x, I64 y, I64 char)
@@ -136,7 +136,7 @@ U0 PaintLoadImage()
 
 U32 PaintImagePeek(I64 x, I64 y)
 {
-	return paint.fb[x + y * GR_WIDTH];
+	return paint.fb[x + y * sys_framebuffer_width];
 }
 
 I0 Paint32()
@@ -176,7 +176,7 @@ I0 Paint32()
 		// draw the image where the brush was last covering it
 		for (i = paint.last_x; i < paint.last_x + paint.last_thick; i++)
 			for (j = paint.last_y; j < paint.last_y + paint.last_thick; j++)
-				DrawScreenPixel(i, j, paint.fb[i + j * GR_WIDTH]);
+				DrawScreenPixel(i, j, paint.fb[i + j * sys_framebuffer_width]);
 
 		// draw the brush on the screen
 		DrawScreenBrush(mouse.pos.x, mouse.pos.y, paint.color, paint.thick);
@@ -193,7 +193,7 @@ I0 Paint32()
 		// draw the image where the color strings where covering it 
 		for (i = 0; i < 3 * FONT_HEIGHT; i++)
 			for (j = 0; j < 12 * FONT_WIDTH; j++)
-				DrawScreenPixel(j, i, paint.fb[j + i * GR_WIDTH]);
+				DrawScreenPixel(j, i, paint.fb[j + i * sys_framebuffer_width]);
 
 		// draw the color strings on screen
 		DrawScreenStr(0, 0 * FONT_HEIGHT, str_r);