rebase fix: stdio.registerCommand('BSOS') removed from progmanager.pas

- This can sit in kernel for now, given that's where the handler is.
- TODO: Move everything to sit under prog/

.gitignore

@@ -16,4 +16,3 @@ dockerout.txt
 AGENTS.md
 *.log
 /doc/*.md
-wasuro

compile.sh

@@ -24,7 +24,6 @@ declare -a run_steps=(
 	"compile_stub.sh" "Failed to compile stub!"
 	"compile_vergen.sh" "Versions failed to compile"
 	"compile_lvgl.sh" "Failed to compile LVGL!"
-	"compile_wasuro.sh" "Failed to pull Wasuro!"
 	"compile_sources.sh" "Failed to compile FPC Sources!"
 	"compile_link.sh" "Failed linking!"
 	"compile_isogen.sh" "Failed to create ISO!"

compile_lvgl.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # compile_lvgl.sh — Download LVGL v9.2 source and compile into lib/liblvgl.a
 # Clone & compile in /tmp (fast container-local fs).
-# Copy source + objects to /lvgl (host mount) for debugging.
+# Cache liblvgl.a on host mount (/code/lvgl/) to skip rebuild.
 set -e
 
 LVGL_VERSION="v9.2.2"
@@ -10,6 +10,7 @@ LVGL_DIR="/tmp/lvgl"
 OBJ_DIR="/tmp/lvgl_obj"
 CONF_DIR="$(pwd)/lvglh"
 OUT_DIR="$(pwd)/lib"
+CACHE_DIR="/code/lvgl"
 
 CC="gcc"
 CFLAGS="-m32 -march=i686 -ffreestanding \
@@ -26,6 +27,17 @@ echo " "
 echo "Compiling LVGL..."
 echo " "
 
+# If cached liblvgl.a exists on host mount, just copy it and skip everything
+if [ -f "${CACHE_DIR}/liblvgl.a" ]; then
+    echo "Found cached liblvgl.a in ${CACHE_DIR}, copying to ${OUT_DIR}..."
+    cp "${CACHE_DIR}/liblvgl.a" "${OUT_DIR}/liblvgl.a"
+    echo "(Delete lvgl/liblvgl.a to force a full rebuild.)"
+    echo " "
+    echo "LVGL compilation complete (cached)."
+    echo " "
+    exit 0
+fi
+
 # Clone LVGL into /tmp (container-local)
 rm -rf "$LVGL_DIR"
 echo "Downloading LVGL ${LVGL_VERSION}..."
@@ -105,12 +117,14 @@ else
     echo "No custom LVGL files in lvglh/."
 fi
 
-# Copy source + objects to /lvgl host mount for debugging
-echo "Copying LVGL source and objects to host mount..."
-mkdir /code/lvgl 2>/dev/null || true
-rm -rf /code/lvgl/* /code/lvgl/.[!.]* /code/lvgl/..?* 2>/dev/null || true
-cp -a "$LVGL_DIR/src" /code/lvgl/src
-cp -a "$OBJ_DIR" /code/lvgl/obj
+# Cache liblvgl.a and source to host mount for next build
+echo "Caching LVGL to host mount..."
+mkdir -p "$CACHE_DIR"
+rm -rf ${CACHE_DIR}/* ${CACHE_DIR}/.[!.]* ${CACHE_DIR}/..?* 2>/dev/null || true
+cp "${OUT_DIR}/liblvgl.a" "${CACHE_DIR}/liblvgl.a"
+cp -a "$LVGL_DIR/src" "${CACHE_DIR}/src"
+cp -a "$LVGL_DIR"/*.h "${CACHE_DIR}/" 2>/dev/null || true
+cp -a "$OBJ_DIR" "${CACHE_DIR}/obj"
 echo "Done."
 
 echo " "

compile_sources.sh

@@ -4,11 +4,4 @@ echo "======================="
 echo " "
 echo "Compiling FPC Sources..."
 echo " "
-
-# Build -Fu flags for all directories under src/ and wasuro/
-FU_PATHS=""
-for dir in $(find src wasuro -type d 2>/dev/null); do
-    FU_PATHS="$FU_PATHS -Fu$dir"
-done
-
-fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ $FU_PATHS src/kernel.pas
+fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/include/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas

compile_wasuro.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# compile_wasuro.sh — Pull Wasuro WASM runtime source into /wasuro
-# Clones the repo (sparse, src/wasm only) and copies the Pascal sources
-# into /code/wasuro so the FPC build can reference them via -Fu.
-set -e
-
-WASURO_REPO="https://gitea.spexeah.com/Spexeah/Wasuro.git"
-WASURO_BRANCH="develop"
-WASURO_TMP="/tmp/wasuro"
-WASURO_OUT="/code/wasuro"
-
-echo " "
-echo "======================="
-echo " "
-echo "Pulling Wasuro WASM runtime..."
-echo " "
-
-# Skip if wasuro/ already has .pas files (cached from previous build)
-if [ -n "$(find "${WASURO_OUT}" -name '*.pas' 2>/dev/null | head -1)" ]; then
-    echo "Wasuro sources already present in ${WASURO_OUT}, skipping pull."
-    echo " "
-    exit 0
-fi
-
-# Clone sparse checkout (only src/wasm)
-rm -rf "$WASURO_TMP"
-git clone --depth 1 --branch "${WASURO_BRANCH}" --filter=blob:none --sparse \
-    "${WASURO_REPO}" "${WASURO_TMP}" 2>&1
-cd "$WASURO_TMP"
-git sparse-checkout set src/wasm 2>&1
-cd /code
-
-echo "Copying src/wasm to ${WASURO_OUT}..."
-rm -rf "$WASURO_OUT"
-mkdir -p "$WASURO_OUT"
-cp -a "${WASURO_TMP}/src/wasm/"* "$WASURO_OUT"/
-rm -rf "$WASURO_TMP"
-
-TOTAL=$(find "$WASURO_OUT" -name '*.pas' | wc -l)
-echo "Copied ${TOTAL} Pascal source files."
-echo " "
-echo "Wasuro pull complete."
-echo " "

src/kernel.pas

@@ -70,33 +70,12 @@ uses
      video, vesa, doublebuffer, color, lvgl, desktop, uidebug,
      vterminal,
      graphicsrefresh, usbhotplug,
-     
-     wasm, wasm.vm.io, wasm.test, wasm.test.framework;
- 
-procedure terminal_command_meminfo(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
-procedure terminal_command_bsod(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
+     fifo, cfifo, cfifols, lifo, circ, minh, maxh, prio;
  
 procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall;
  
 implementation
 
-procedure terminal_command_meminfo(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
-begin
-    push_trace('kernel.terminal_command_meminfo');
-
-    stdio.bufWriteStr(stdout_buf, 'Lower Memory = ');
-    stdio.bufWriteInt(stdout_buf, multibootinfo^.mem_lower);
-    stdio.bufWriteStrLn(stdout_buf, 'KB');
-    stdio.bufWriteStr(stdout_buf, 'Higher Memory = ');
-    stdio.bufWriteInt(stdout_buf, multibootinfo^.mem_upper);
-    stdio.bufWriteStrLn(stdout_buf, 'KB');
-    stdio.bufWriteStr(stdout_buf, 'Total Memory = ');
-    stdio.bufWriteInt(stdout_buf, ((multibootinfo^.mem_upper + 1000) div 1024) + 1);
-    stdio.bufWriteStrLn(stdout_buf, 'MB');
-
-    pop_trace;
-end;
-
 procedure terminal_command_bsod(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
 begin
     push_trace('kernel.terminal_command_bsod');
@@ -189,6 +168,7 @@ begin
 
      { Stdio Init }
      stdio.init();
+     stdio.registerCommand('BSOD', @terminal_command_bsod, 'Force a Panic Screen.');
 
      tss.init();
      scheduler.init();
@@ -211,12 +191,6 @@ begin
      { VFS Init }
      vfs.init();
 
-     { Let's test Wasuro! }
-     wasm.vm.io.io_set_writechar(@syslog.logchar);
-     wasm.wasm_init;
-     wasm.test.run_all_tests;
-     kernel.yield();
-
      { Management Interfaces }
      tracer.push_trace('kmain.DRVMGMT');
      drivermanagement.init();
@@ -285,6 +259,14 @@ begin
      usbhub.UnitTest;
      usb_keyboard.UnitTest;
      usb_mouse.UnitTest;
+     fifo.UnitTest;
+     cfifo.UnitTest;
+     cfifols.UnitTest;
+     lifo.UnitTest;
+     circ.UnitTest;
+     minh.UnitTest;
+     maxh.UnitTest;
+     prio.UnitTest;
 
      { Register timer-driven tasks }
      graphicsrefresh.init;

src/prog/meminfo.pas

@@ -0,0 +1,83 @@
+//  Copyright 2021 Kieron Morris
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+
+{ 
+	Prog->meminfo - Print memory statistics (PMM / LMM).
+	
+	@author(Kieron Morris <[email protected]>)
+}
+unit meminfo;
+
+interface
+
+uses
+    stdio, multiboot, pmemorymanager, lmemorymanager, tracer;
+
+procedure init();
+
+implementation
+
+procedure run(Params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
+var
+    pmm_total, pmm_free, pmm_used : uint32;
+    lmm_pages, lmm_free           : uint32;
+begin
+    { Multiboot memory info }
+    stdio.bufWriteStrLn(stdout_buf, '--- Multiboot ---');
+    stdio.bufWriteStr(stdout_buf, 'Lower Memory  : ');
+    stdio.bufWriteInt(stdout_buf, multibootinfo^.mem_lower);
+    stdio.bufWriteStrLn(stdout_buf, ' KB');
+    stdio.bufWriteStr(stdout_buf, 'Upper Memory  : ');
+    stdio.bufWriteInt(stdout_buf, multibootinfo^.mem_upper);
+    stdio.bufWriteStrLn(stdout_buf, ' KB');
+    stdio.bufWriteStr(stdout_buf, 'Total Memory  : ');
+    stdio.bufWriteInt(stdout_buf, ((multibootinfo^.mem_upper + 1000) div 1024) + 1);
+    stdio.bufWriteStrLn(stdout_buf, ' MB');
+
+    { PMM stats }
+    stdio.bufWriteStrLn(stdout_buf, '--- PMM (4 MB blocks) ---');
+    pmm_total := pmemorymanager.pmm_total_blocks;
+    pmm_free  := pmemorymanager.pmm_free_blocks;
+    pmm_used  := pmm_total - pmm_free;
+    stdio.bufWriteStr(stdout_buf, 'Total Blocks  : ');
+    stdio.bufWriteIntLn(stdout_buf, pmm_total);
+    stdio.bufWriteStr(stdout_buf, 'Free Blocks   : ');
+    stdio.bufWriteIntLn(stdout_buf, pmm_free);
+    stdio.bufWriteStr(stdout_buf, 'Used Blocks   : ');
+    stdio.bufWriteIntLn(stdout_buf, pmm_used);
+    stdio.bufWriteStr(stdout_buf, 'Free Physical : ');
+    stdio.bufWriteInt(stdout_buf, pmm_free * 4);
+    stdio.bufWriteStrLn(stdout_buf, ' MB');
+
+    { LMM heap stats }
+    stdio.bufWriteStrLn(stdout_buf, '--- LMM (Heap) ---');
+    lmm_pages := lmemorymanager.lmm_page_count;
+    lmm_free  := lmemorymanager.lmm_total_free;
+    stdio.bufWriteStr(stdout_buf, 'Heap Pages    : ');
+    stdio.bufWriteIntLn(stdout_buf, lmm_pages);
+    stdio.bufWriteStr(stdout_buf, 'Heap Size     : ');
+    stdio.bufWriteInt(stdout_buf, lmm_pages * 4);
+    stdio.bufWriteStrLn(stdout_buf, ' MB');
+    stdio.bufWriteStr(stdout_buf, 'Heap Free     : ');
+    stdio.bufWriteInt(stdout_buf, lmm_free div 1024);
+    stdio.bufWriteStrLn(stdout_buf, ' KB');
+end;
+
+procedure init();
+begin
+    tracer.push_trace('meminfo.init');
+    stdio.registerCommand('MEMINFO', @Run, 'Print memory statistics (PMM/LMM).');
+end;
+
+end.