fix: Allocator Merge Conflicts Resolved

# Conflicts:
#	src/kernel.pas
#	src/lmemorymanager.pas
#	src/progmanager.pas

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).
-# Cache liblvgl.a on host mount (/code/lvgl/) to skip rebuild.
+# Copy source + objects to /lvgl (host mount) for debugging.
 set -e
 
 LVGL_VERSION="v9.2.2"
@@ -10,7 +10,6 @@ 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 \
@@ -27,17 +26,6 @@ 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}..."
@@ -117,16 +105,14 @@ else
     echo "No custom LVGL files in lvglh/."
 fi
 
-# Cache liblvgl.a and source to host mount for next build
+# Copy source + objects to /lvgl host mount for debugging
-echo "Caching LVGL to host mount..."
+echo "Copying LVGL source and objects to host mount..."
-mkdir -p "$CACHE_DIR"
+mkdir /code/lvgl 2>/dev/null || true
-rm -rf ${CACHE_DIR}/* ${CACHE_DIR}/.[!.]* ${CACHE_DIR}/..?* 2>/dev/null || true
+rm -rf /code/lvgl/* /code/lvgl/.[!.]* /code/lvgl/..?* 2>/dev/null || true
-cp "${OUT_DIR}/liblvgl.a" "${CACHE_DIR}/liblvgl.a"
+cp -a "$LVGL_DIR/src" /code/lvgl/src
-cp -a "$LVGL_DIR/src" "${CACHE_DIR}/src"
+cp -a "$OBJ_DIR" /code/lvgl/obj
-cp -a "$LVGL_DIR"/*.h "${CACHE_DIR}/" 2>/dev/null || true
-cp -a "$OBJ_DIR" "${CACHE_DIR}/obj"
 echo "Done."
 
 echo " "
 echo "LVGL compilation complete."
-echo " "
+echo " "

compile_sources.sh

@@ -4,4 +4,4 @@ echo "======================="
 echo " "
 echo "Compiling FPC Sources..."
 echo " "
-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
+fpc -Aelf -gw -g -gl -n -v0ew -O3 -OpPENTIUM3 -Si -Sc -Sg -Xd -CX -XXs -CfSSE -CfSSE2 -Rintel -Pi386 -Tlinux -FElib/ -Fusrc/* -Fusrc/driver/* -Fusrc/driver/net/* -Fusrc/driver/bus/* -Fusrc/driver/bus/usb/* -Fusrc/driver/hid/* src/kernel.pas

src/kernel.pas

@@ -69,9 +69,10 @@ uses
      hashmap, vfs,
      video, vesa, doublebuffer, color, lvgl, desktop, uidebug,
      vterminal,
-     graphicsrefresh, usbhotplug,
+     graphicsrefresh, usbhotplug;
-     fifo, cfifo, cfifols, lifo, circ, minh, maxh, prio;
  
+procedure terminal_command_bsod(params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
+
 procedure kmain(mbinfo: Pmultiboot_info_t; mbmagic: uint32); stdcall;
  
 implementation
@@ -168,7 +169,6 @@ begin
 
      { Stdio Init }
      stdio.init();
-     stdio.registerCommand('BSOD', @terminal_command_bsod, 'Force a Panic Screen.');
 
      tss.init();
      scheduler.init();
@@ -259,14 +259,6 @@ 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/progmanager.pas

@@ -24,7 +24,7 @@ interface
 uses
     tracer,
     //progs
-    base64_prog, md5sum, dhclient, vbeinfo, testcmd, ping, meminfo;
+    base64_prog, md5sum, dhclient, vbeinfo, meminfo, testcmd, ping;
 
 { Initialize all baked-in programs }
 procedure init();
@@ -43,6 +43,7 @@ begin
     tracer.push_trace('progmanager.init');
 
     { Register commands from provider units }
+    stdio.registerCommand('BSOD', @kernel.terminal_command_bsod, 'Force a Panic Screen.');
     stdio.registerCommand('CPU', @cpu.Terminal_Command_CPU, 'CPU Info.');
     stdio.registerCommand('DEV', @drivermanagement.terminal_command_dev, 'Driver Management Interface.');
     stdio.registerCommand('PS', @processmanager.terminal_command_ps, 'List running processes.');
@@ -61,9 +62,9 @@ begin
     base64_prog.init();
     dhclient.init();
     vbeinfo.init();
+    meminfo.init();
     testcmd.init();
     ping.init();
-    meminfo.init();
 end;
 
 end.