getting ready

.drone.yml

@@ -22,8 +22,8 @@ steps:
     commands:
       - git fetch --tags
       - find . -type f -print0 | xargs -0 dos2unix
-      - chmod +x /drone/src/toolchain/*.sh
-      - /drone/src/toolchain/compile.sh
+      - chmod +x /drone/src/*.sh
+      - /drone/src/compile.sh
       
   - name: upload-iso-artifact
     image: alpine/git

.gitignore

@@ -1,21 +1,17 @@
-/lib/*.ppu
-/lib/*.a
-/lib/*.o
-/release/*.svg
-/release/*.iso
-/bin/*.bin
-/iso/boot/asuro.bin
-/*.iso
-/*.md5
-/*.sh~
+*.o
+*.ppu
+*.s
+*.iso
+*.elf
+lib/
+release/
+doc/
+bin/
 /*.img
 src/include/asuro.pas
 localenv.json
 /lvgl/
 dockerout.txt
 AGENTS.md
-lessons_learnt.md
 *.log
-/doc/*.md
-wasuro
-src/core/core.version.pas
+/doc/*.md

Dockerfile

@@ -14,9 +14,10 @@ RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSIO
 	pushd fpc-$FPC_VERSION.i386-linux && ./install.sh && popd && \
 	rm -rf fpc-$FPC_VERSION.i386-linux
 
+COPY compile.sh /compile.sh
 ADD https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver /usr/bin/semver
 RUN chmod +x /usr/bin/semver
 WORKDIR /code
 RUN find . -type f -print0 | xargs -0 dos2unix
 ENTRYPOINT ["/bin/bash", "-c"]
-CMD ["find toolchain -name '*.sh' -exec dos2unix {} + 2>/dev/null; find toolchain -name '*.sh' -exec chmod +x {} +; bash toolchain/compile.sh"]
+CMD ["/compile.sh"]

checksums.md5

@@ -0,0 +1,135 @@
+
+c1e267c6b88cab4d1e3c86fa7f2f8ab1  src//contextswitcher.pas
+0be0d543ea50325c0dee1693c5854c48  src//cpu.pas
+ac76654ddebbeb1d3cc16ca4c85e77ff  src//drivermanagement.pas
+693ca299a852a25d3d8820bb0d76dfeb  src//faults.pas
+eff5f36e129bc22770d643173c426cbd  src//gdt.pas
+42d014445ddc0fd4d01c59e690795532  src//idt.pas
+b40f0c2f3ec166a0bf2ebcf8f11f5614  src//irq.pas
+160ca7f01eb779595a5c90174f8d545e  src//isr.pas
+03963c1b5cf5f661df5598de9af51458  src//kernel.pas
+71a3e1a6c21a76ff71e06e0743c0c57f  src//lmemorymanager.pas
+8e6a6f36c53ecd90e4669189aa9312b4  src//pmemorymanager.pas
+4a5f5bf0f2ca7fff89074ad02813091c  src//processloader.pas
+e600e339593a8bb35964e7531c074e7b  src//progmanager.pas
+81d4b5c4a25a1a855d75a88c725b77fe  src//scheduler.pas
+1be263e53e4838f6a06d2ece86400ef2  src//stdio.pas
+940a7ed5808841c6ba344b67965ecba7  src//syslog.pas
+fe1dba288d3a3ab427a9dea0a9f747ae  src//tracer.pas
+4598f9b19f3e3748394b6f1cb8e52043  src//tss.pas
+1a0461e1028921131594edae0a01e608  src//vmemorymanager.pas
+44b09f7af29af7d7fb9711ee0ea5968d  src/driver/bus/PCI.pas
+6e970ae957a3fbc600c8ee6b42634c78  src/driver/bus/usb/EHCI.pas
+181e6c09e33ff59b3eb827085591d19f  src/driver/bus/usb/OHCI.pas
+820defeb214b59d2329881670cbb493f  src/driver/bus/usb/UHCI.pas
+6edd4a1e9c92e092aea1368d9aa2724f  src/driver/bus/usb/USB.pas
+8588f4da48c37646c969b7d51aa28676  src/driver/bus/usb/XHCI.pas
+e064e466ca4a89b2c88df80f75ab0bdc  src/driver/bus/usb/usbcore.pas
+e8aabf9e1ba0c09ede43ed2844802aa0  src/driver/bus/usb/usbhub.pas
+631d06f67ee6af6bfdcec3279967bca0  src/driver/bus/usb/usbtypes.pas
+45f1afa1170ab00ec92e52de18f1de19  src/driver/exp/testdriver.pas
+28e9e1ff635893639c4442656b763d4b  src/driver/hid/keyboard.pas
+25a86d7379eae581d6c69ccbcfb9d722  src/driver/hid/mouse.pas
+84ceeacce04bc9659c73cba838c94cca  src/driver/hid/ps2/ps2_keyboard.pas
+16a706312825c01b6dd13f51aa385c5f  src/driver/hid/ps2/ps2_keyboard_isr.pas
+d272f2bd62399a119e93118a81a74833  src/driver/hid/ps2/ps2_mouse.pas
+57615a202dd2cf26c64601d86bd5e36c  src/driver/hid/usb/usb_keyboard.pas
+da94fe43ff22d2050ccd8eec602aa4b5  src/driver/hid/usb/usb_mouse.pas
+3f6f56b05d141194fa1e48d46d441042  src/driver/include/drivertypes.pas
+8a6f0bf9d2c77d32f2ce5dede4e15d9a  src/driver/interface/serial.pas
+2d3bcfceef94d7e1138ca465bb32aea5  src/driver/net/include/nettypes.pas
+63a3fa928b17ffd31c9ea033f3443b41  src/driver/net/include/netutils.pas
+9aca959358eaa2159421434a4d1855df  src/driver/net/l1/net.pas
+033c08a36b2e99d573e09f1e182937e0  src/driver/net/l2/eth2.pas
+418cdb2657980f11172bb0c70ff4326d  src/driver/net/l3/arp.pas
+e71bc0e877d736be29378ecdfb91c615  src/driver/net/l3/ipv4.pas
+38facb711f1153b80011e1adee8cfba5  src/driver/net/l4/icmp.pas
+fd577fe3e13389f4ffddfe7480935ae1  src/driver/net/l4/tcp.pas
+0cda1d5d8c298b577b49cc8f1ae031bf  src/driver/net/l4/udp.pas
+004a93b3d4cc1efe1172564239eaf795  src/driver/net/l5/dhcp.pas
+1cf47de6c18308e1d140ce47e74bb204  src/driver/netdev/E1000.pas
+bd529497b38ce6bc7697a6dcde6f7fd7  src/driver/storage/MBR.pas
+333c3bb46b3ca14746281b4921a25630  src/driver/storage/iobuffer.pas
+08a8280503120f3a90a9a041bc8b67d3  src/driver/storage/partitiontable.pas
+2bc09f8f54dd10717440b74017bdeb3d  src/driver/storage/storagemanager.pas
+91d10f7ef29d62e633968d72ceeea2b1  src/driver/storage/storagetypes.pas
+76e01e83220c1882dc429129c0ad937b  src/driver/storage/usb_storage.pas
+e42fdff36185dd92498378ab470a4b35  src/driver/storage/vfs.pas
+621d834536a649b3b483016060bbfafc  src/driver/storage/volumemanager.pas
+0e300d4c833bab776e8d91a348a5b60c  src/driver/storage/AHCI/AHCI.pas
+16304358a6278c23a751e31bb464eae5  src/driver/storage/AHCI/AHCITypes.pas
+b5e3bcb914b585a95ac646cfea7d016e  src/driver/storage/Filesystems/asfs.pas
+cb23855b8bad502999656d3121882c74  src/driver/storage/Filesystems/fat32.pas
+9bceba956d3eeffe97e07bdd45a9476f  src/driver/storage/Filesystems/filesystemmanager.pas
+e03d028cc2915c3cb0a8245407c99b7b  src/driver/storage/Filesystems/flatfs.pas
+5bd48e9a8c97ea11edc2789d2ec7902a  src/driver/storage/Filesystems/iso9660.pas
+753c6bbb3c5f84cdd7300330456980d7  src/driver/storage/IDE/IDE.pas
+f5e13673000388c7b8fa980824139163  src/driver/storage/IDE/ata.pas
+5760feea5b9a4ce3fad820b542113c56  src/driver/storage/IDE/atapi.pas
+900eb584e797111c1a54ca86542e71d0  src/driver/storage/IDE/idetypes.pas
+6d9508503dca0543fe932c32ef8267fc  src/driver/timers/RTC.pas
+c025ffabb5bba2272578d04903637d11  src/driver/timers/TMR_0_ISR.pas
+4a7434e5567f738b8545d56558902d9f  src/driver/timers/TMR_1_ISR.pas
+a4459a13e30281d020d0a8730e243b02  src/driver/timers/graphicsrefresh.pas
+4503465b3f62464f25e17e1d1a67e54d  src/driver/timers/usbhotplug.pas
+0434cc7b77429f971d372e89a8a6972d  src/driver/video/desktop.pas
+fef57dc0269caad191652df07da04466  src/driver/video/doublebuffer.pas
+a2c0d973e133f2624599d12fc0ec13f6  src/driver/video/lvgl.pas
+dce8755865885e41c08b062c162b06c9  src/driver/video/uidebug.pas
+20dc95321989d632fa4c39a5faf74733  src/driver/video/vesa.pas
+19c988cfcc36bcc78e73747662672d8f  src/driver/video/vesa16.pas
+f6714e6972770155cf2c72822ab76128  src/driver/video/vesa24.pas
+81e2f271055c2a89dfc8b7f1d19bf509  src/driver/video/vesa32.pas
+8ea870a31f4a9b11b3dcd639a65d9ca8  src/driver/video/vesa8.pas
+542aa1da8f8e9d6e5cb5e0b90a3c9de5  src/driver/video/video.pas
+d499b828752660e1a03272eb4f63eebb  src/driver/video/videotypes.pas
+b9f4c8f07d26c77cb49bd032202775c0  src/driver/video/windows.pas
+aadcb02abac658feec02042bf5ea4ad0  src/fault/ACE.pas
+d530d3094d335ce5ab78475de5b5a39a  src/fault/BPE.pas
+84c5c4e3981b9718403e7fdeb9ef9f7f  src/fault/BTSSE.pas
+01acde61a8f3f27592e9c6d15349348d  src/fault/CFE.pas
+0f5db45e5979949114dba7d9ba205103  src/fault/CSOE.pas
+a7565ac9d1dadc801c16758d2c4e84fe  src/fault/DBGE.pas
+c45fb023b19f7240a911e189c1771c41  src/fault/DBZ.pas
+b5453d37dd18e375a15f50a870c6dea2  src/fault/DFE.pas
+25fdec8dd1c72680acd5a6246ced55eb  src/fault/GPF.pas
+3c7671f86051aa727adcf547f175d338  src/fault/IDOE.pas
+710aadf1e601c74a0cd8563632f35c50  src/fault/IOPE.pas
+85d27bbbe7002ec3e5e73ff9e971844f  src/fault/MCE.pas
+3f81337468d131b0c9896a588f230772  src/fault/NCE.pas
+7548539c52222f081d75841b929d439f  src/fault/NMIE.pas
+f6a105e5873cc14a8a5c5b05298bdfd1  src/fault/OOBE.pas
+8f976f5663439e533347758cc79add39  src/fault/PF.pas
+3870beacc5b322fa63f633f14b1a8320  src/fault/SFE.pas
+522c6788021d8ebf966096311dd1f38d  src/fault/SNPE.pas
+f32ed5dffb58626b7657a24866c6af4e  src/fault/UIE.pas
+b6bfdc59f9962fc257e9adc7b57a3273  src/include/base64.pas
+dee8388dac0ca79ee6aef73469d75f6b  src/include/bios_data_area.pas
+717b8c0a42983f6b8864d5deda4dd532  src/include/color.pas
+1987f262a6053e02080023554d942ae1  src/include/crc.pas
+7f6c812b5d7ae1a8af5ef00d42a4eb1d  src/include/fonts.pas
+bf9fe2883789147e08980ab4c43220f7  src/include/hashmap.pas
+513d59ae08ba6d753a871e1a82b46ed4  src/include/lists.pas
+c5ef14ac60dad5a32ebfa43da153d05c  src/include/md5.pas
+124f12d75de7ade6993ccd2f02b53ad4  src/include/multiboot.pas
+d8beadde6ebb05c8a3e74aae57d61f34  src/include/rand.pas
+cfa50e59e4bd9ea3a5b05c6b1275858d  src/include/strings.pas
+cb254f95c5e09595c90db690bf98794f  src/include/system.pas
+5df11e0052010580d13f1a5ce3acd60f  src/include/targa.pas
+833967cf14697db6da421a4be58e9044  src/include/texture.pas
+635e5a8936a088a244ddfe48cd658a3f  src/include/types.pas
+a770014537fb6c8d70cf4bc3ec325500  src/include/util.pas
+e23b0bef333262860e1f68034331e529  src/isr/ioapic.pas
+63f4a330383220a5cfad0253c09afde3  src/isr/isr_types.pas
+851217f90e902ca65bebb017eeb172e7  src/isr/isrmanager.pas
+027f34dc6d4e67d15cf10d6db5edd514  src/prog/base64_prog.pas
+2e9d0c9db496dafc3c3423deee644c83  src/prog/dhclient.pas
+6c58870722f8b5fd86308123ae8c934b  src/prog/diskcmd.pas
+a0fa8cf89bee89802d506f2cd3a4dad7  src/prog/diskutil.pas
+31c7601131e09b0dfcc427cdb14bffb6  src/prog/edit.pas
+6fff6024194143a6ebbe849f9aff0326  src/prog/inio.pas
+1ff556cd50088e3ee3efa3103fdc6ba0  src/prog/md5sum.pas
+0f0e6dc1b2d1a6e14b2fd103826d1f12  src/prog/partcmd.pas
+0c7c7f62e8bf76fc2eec7f02e7a092b7  src/prog/vbeinfo.pas
+60bf159fa0a3efb34f73fa15a93acd7c  src/prog/volcmd.pas
+88d71b607256928831a33b363a44c006  src/prog/vterminal.pas

compat/lmemorymanager.pas

@@ -1,75 +0,0 @@
-{ Compatibility shim: wasuro references the old unit name 'lmemorymanager'.
-  Since wasuro/ cannot be modified, this unit re-exports the public API of
-  memory.heap so that 'uses lmemorymanager' continues to compile. }
-unit lmemorymanager;
-
-interface
-
-uses
-    memory.heap;
-
-const
-    ALLOC_UNIT        = memory.heap.ALLOC_UNIT;
-    DATA_OFFSET       = memory.heap.DATA_OFFSET;
-    PAGE_SIZE_LMM     = memory.heap.PAGE_SIZE_LMM;
-    TOTAL_UNITS       = memory.heap.TOTAL_UNITS;
-    BITMAP_DWORDS     = memory.heap.BITMAP_DWORDS;
-    SIZE_PREFIX       = memory.heap.SIZE_PREFIX;
-    LARGE_ALLOC_MAGIC = memory.heap.LARGE_ALLOC_MAGIC;
-
-type
-    PHeapPageHeader = memory.heap.PHeapPageHeader;
-    THeapPageHeader = memory.heap.THeapPageHeader;
-
-procedure init;
-function kalloc(size : uint32) : void;
-function klalloc(size : uint32) : void;
-procedure klfree(address : uint32);
-function kpalloc(address : uint32) : void;
-procedure kfree(area : void);
-function lmm_total_free : uint32;
-function lmm_page_count : uint32;
-
-implementation
-
-procedure init;
-begin
-    memory.heap.init;
-end;
-
-function kalloc(size : uint32) : void; inline;
-begin
-    kalloc := memory.heap.kalloc(size);
-end;
-
-function klalloc(size : uint32) : void; inline;
-begin
-    klalloc := memory.heap.klalloc(size);
-end;
-
-procedure klfree(address : uint32); inline;
-begin
-    memory.heap.klfree(address);
-end;
-
-function kpalloc(address : uint32) : void; inline;
-begin
-    kpalloc := memory.heap.kpalloc(address);
-end;
-
-procedure kfree(area : void); inline;
-begin
-    memory.heap.kfree(area);
-end;
-
-function lmm_total_free : uint32; inline;
-begin
-    lmm_total_free := memory.heap.lmm_total_free;
-end;
-
-function lmm_page_count : uint32; inline;
-begin
-    lmm_page_count := memory.heap.lmm_page_count;
-end;
-
-end.

compat/types.pas

@@ -1,7 +0,0 @@
-unit types;
-
-interface
-
-implementation
-
-end.

compile.sh

@@ -20,13 +20,10 @@ runOrFail() {
 	fi
 }
 
-TOOLCHAIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
 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!"
@@ -36,7 +33,7 @@ for ((i=0; i<${#run_steps[@]}; i+=2))
 do
 	if [ "$ERRCOUNT" -eq "0" ]
 	then
-			script="${TOOLCHAIN_DIR}/${run_steps[$i]}"
+			script=$(pwd)/"${run_steps[$i]}"
 			message="${run_steps[$i+1]}"
 			runOrFail "$script" "$message"
 	fi
@@ -45,9 +42,9 @@ done
 #Call generate final artifacts based on failure or success of the above.
 if [ "$ERRCOUNT" -ne "0" ]
 then
-	. "${TOOLCHAIN_DIR}/compile_finish.sh" "failed"
+	. ./compile_finish.sh "failed"
 else
-	. "${TOOLCHAIN_DIR}/compile_finish.sh" "success"
+	. ./compile_finish.sh "success"
 fi
 
 cd ..

compile_link.sh

@@ -19,4 +19,4 @@ echo " "
 LIBGCC=$(gcc -m32 -print-libgcc-file-name)
 echo "libgcc: ${LIBGCC}"
 
-ld -m elf_i386 -s --gc-sections -Ttoolchain/linker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group
+ld -m elf_i386 -s --gc-sections -Tlinker.script -o bin/kernel.bin $objstring --start-group lib/liblvgl.a ${LIBGCC} --end-group

compile_sources.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Compiling FPC Sources..."
+echo " "
+# Build -Fu flags for all directories under src/ and wasuro/
+FU_PATHS="-Fusrc -Fuwasuro"
+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

compile_stub.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+echo " "
+echo "======================="
+echo " "
+echo "Compiling Stub..."
+echo " "
+nasm -f elf src/stub/stub.asm -o lib/stub.o

compile_vergen.sh

@@ -1,15 +1,14 @@
 #!/usr/bin/env bash
 set -e
-TOOLCHAIN_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 echo " "
 echo "======================="
 echo " "
 echo "Generating Versioning Info..."
 echo " "
-chmod +x "${TOOLCHAIN_DIR}/compile_checksum.sh"
-"${TOOLCHAIN_DIR}/compile_checksum.sh"
-outfile="src/core/core.version.pas"
-file="toolchain/version"
+chmod +x ./compile_checksum.sh
+./compile_checksum.sh
+outfile="src/include/asuro.pas"
+file="version"
 {
 	# this script requires semver tool
 	wget -q https://raw.githubusercontent.com/fsaintjacques/semver-tool/master/src/semver -O bin/semver && chmod +x bin/semver
@@ -23,7 +22,7 @@ sub=$(semver get patch $tagref)
 version=$(semver get release $tagref)
 release=$(semver get prerel $tagref)
 build=$(semver get build $tagref)
-linecount=$("${TOOLCHAIN_DIR}/loc.sh" | awk '{print $1}')
+linecount=$(./loc.sh | awk '{print $1}')
 sourcecount=$(find src -type f | wc -l)
 drivercount=$(find src/driver -type f | wc -l)
 fpcversion=$(fpc -h | grep -m 1 version | awk '{print $5}')
@@ -35,7 +34,7 @@ checksum=$(md5sum checksums.md5 | awk '{print $1}')
 
 [[ -n "$release" ]] && version="$version-$release"
 cat > $outfile <<EOF
-unit core.version;
+unit asuro;
  
 interface