fix: minor cleanup after namespace refactor

- Shorten 'driver.video.windows: ' label to 'Windows: ' in uidebug
- Shorten e1000 terminal command name from 'driver.net.dev.e1000' to 'E1000'
- Auto-generated version bump (build artifact)

3 files changed, 7 insertions(+), 7 deletions(-)

.drone.yml

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

.gitignore

@@ -14,5 +14,8 @@ localenv.json
 /lvgl/
 dockerout.txt
 AGENTS.md
+lessons_learnt.md
 *.log
-/doc/*.md
+/doc/*.md
+wasuro
+src/core/core.version.pas

Dockerfile

@@ -14,10 +14,9 @@ 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 ["/compile.sh"]
+CMD ["find toolchain -name '*.sh' -exec dos2unix {} + 2>/dev/null; find toolchain -name '*.sh' -exec chmod +x {} +; bash toolchain/compile.sh"]

compat/lmemorymanager.pas

@@ -0,0 +1,75 @@
+{ 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

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

compile_sources.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-echo " "
-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

compile_stub.sh

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

doc/flatfs.md

@@ -0,0 +1,32 @@
+#Flat filesystem
+
+A super simple filesystem for asuro. Folders are emulated in filenames.
+
+Starts with disk info sector, sector 0 of volume
+
+---
+#### disk info
+
+jmp2boot        : ubit24;
+OEMName         : array[0..7] of char;
+version         : uint16 // numerical version of filesystem
+sectorCount      : uint16;
+fileCount       : uint16
+signature       : uint32 = 0x0B00B1E5
+
+
+the Rest of the sector is reserved
+
+---
+
+Starting from sector 1 is the file table. Table size is determined by entry size (64) * fileCount
+
+---
+####File entry
+
+name : array[0..59] of char //file name max 60 chars
+fileStart : 16bit // start sector of data
+fileSize : 16bit // data size in sectors
+
+---
+

iso/hello.txt

@@ -0,0 +1 @@
+Hello from the Asuro ISO!

src/app/app.base64.pas

@@ -17,12 +17,12 @@
 	
 	@author(Angus C <angus@actm.uk>)
 }
-unit base64_prog;
+unit app.base64;
 
 interface
 
 uses
-    stdio, util, strings, tracer, base64, lmemorymanager;
+    io.stdio, core.util, arch.x86.util, core.strings, debug.tracer, core.enc.base64, memory.heap;
 
 procedure init();
 
@@ -38,7 +38,7 @@ var
     PSize     : uInt32;
 
 begin
-    tracer.push_trace('base64_prog.run');
+    debug.tracer.push_trace('base64_prog.run');
     if paramCount(Params) > 1 then begin
         encdec := getParam(0, Params);
         if stringEquals(encdec, 'encode') then begin
@@ -58,23 +58,23 @@ begin
             dec(pinput);
             pinput^ := #0;
             result := b64_encode_str(input);
-            stdio.bufWriteStrLn(stdout_buf, result);
+            io.stdio.bufWriteStrLn(stdout_buf, result);
             kfree(void(result));
         end else if stringEquals(encdec, 'decode') then begin
             input := getParam(1, Params);
             result := b64_decode_str(input);
-            stdio.bufWriteStrLn(stdout_buf, result);
+            io.stdio.bufWriteStrLn(stdout_buf, result);
             kfree(void(result));
-        end else stdio.bufWriteStrLn(stderr_buf, 'Usage: base64 <encode/decode> <text>');
+        end else io.stdio.bufWriteStrLn(stderr_buf, 'Usage: core.enc.base64 <encode/decode> <text>');
     end else begin
-        stdio.bufWriteStrLn(stderr_buf, 'Usage: base64 <encode/decode> <text>');
+        io.stdio.bufWriteStrLn(stderr_buf, 'Usage: core.enc.base64 <encode/decode> <text>');
     end;
 end;
 
 procedure init();
 begin
-    tracer.push_trace('base64_prog.init');
-    stdio.registerCommand('BASE64', @Run, 'Perform Base64 Encode/Decode.');
+    debug.tracer.push_trace('base64_prog.init');
+    io.stdio.registerCommand('BASE64', @Run, 'Perform Base64 Encode/Decode.');
 end;
 
 end.

src/app/app.dhclient.pas

@@ -17,12 +17,12 @@
 	
 	@author(Kieron Morris <kjm@kieronmorris.me>)
 }
-unit dhclient;
+unit app.dhclient;
 
 interface
 
 uses
-    stdio, util, strings, tracer, dhcp;
+    io.stdio, core.util, arch.x86.util, core.strings, debug.tracer, driver.net.proto.dhcp;
 
 procedure init();
 
@@ -30,14 +30,14 @@ implementation
 
 procedure run(Params : PParamList; stdin_buf, stdout_buf, stderr_buf : POutBuf);
 begin
-    tracer.push_trace('dhclient.run');
+    debug.tracer.push_trace('dhclient.run');
     DHCPDiscover();
 end;
 
 procedure init();
 begin
-    tracer.push_trace('dhclient.init');
-    stdio.registerCommand('DHClient', @Run, 'Run the DHCP configuration utility.');
+    debug.tracer.push_trace('dhclient.init');
+    io.stdio.registerCommand('DHClient', @Run, 'Run the DHCP configuration utility.');
 end;
 
 end.

src/app/app.inio.pas

@@ -0,0 +1,145 @@
+{
+    Prog->app.inio - Inline IO
+
+    Usage:
+        app.inio <file> <       Read file contents to terminal
+        app.inio <file> > text  Write text to file
+
+    @author(Aaron Hance <[email protected]>)
+}
+unit app.inio;
+
+interface
+
+uses
+    io.syslog,
+    memory.heap,
+    driver.storage.types,
+    core.strings,
+    io.stdio,
+    debug.tracer,
+    core.util, arch.x86.util,
+    driver.storage.vfs;
+
+procedure init();
+
+implementation
+
+procedure Run(Params : PParamList; stdin_buf, stdout_buf, stderr_buf: POutBuf);
+var
+    filePath   : pchar;
+    absPath    : pchar;
+    op         : pchar;
+    fError     : driver.storage.types.TError;
+    fHandle    : driver.storage.vfs.TFileHandle;
+    buf        : pchar;
+    bytesRead  : uint32;
+    content    : pchar;
+    part       : pchar;
+    tmp        : pchar;
+    i          : uint32;
+    pCount     : uint32;
+    contentLen : uint32;
+begin
+    debug.tracer.push_trace('inio.run');
+
+    pCount := paramCount(Params);
+    if pCount < 2 then begin
+        io.syslog.writestringln('Usage: app.inio <file> < | app.inio <file> > text');
+        exit;
+    end;
+
+    filePath := getParam(0, Params);
+    op       := getParam(1, Params);
+
+    if filePath = nil then begin
+        io.syslog.writestringln('Error: no file specified.');
+        exit;
+    end;
+    if op = nil then begin
+        io.syslog.writestringln('Error: no operation specified.');
+        exit;
+    end;
+
+    absPath := driver.storage.vfs.MakeAbsolutePath(filePath);
+
+    { ---- READ ---- }
+    if op[0] = '<' then begin
+        fHandle := driver.storage.vfs.OpenFile(absPath, omReadOnly, wmRewrite, @fError);
+        if (fHandle = 0) or (fError <> eNone) then begin
+            io.syslog.writestringln('Error: cannot open file for reading.');
+            kfree(void(absPath));
+            exit;
+        end;
+        buf := pchar(kalloc(32768));
+        memset(uint32(buf), 0, 32768);
+        bytesRead := driver.storage.vfs.ReadFile(fHandle, 0, puint8(buf), 32767);
+        driver.storage.vfs.CloseFile(fHandle);
+
+        if bytesRead > 0 then begin
+            buf[bytesRead] := char(0);
+            io.syslog.writestring(buf);
+            io.syslog.writestringln(' ');
+        end else begin
+            io.syslog.writestringln('(0 bytes read)');
+        end;
+        kfree(puint32(buf));
+    end
+
+    { ---- WRITE ---- }
+    else if op[0] = '>' then begin
+        if pCount < 3 then begin
+            io.syslog.writestringln('Error: no content to write.');
+            kfree(void(absPath));
+            exit;
+        end;
+
+        { Build content string by joining params 2..N with spaces }
+        content := stringCopy(getParam(2, Params));
+        i := 3;
+        while i < pCount do begin
+            part := getParam(i, Params);
+            if part <> nil then begin
+                { content + ' ' + part }
+                tmp := stringConcat(content, ' ');
+                kfree(void(content));
+                content := stringConcat(tmp, part);
+                kfree(void(tmp));
+            end;
+            i := i + 1;
+        end;
+
+        contentLen := stringSize(content);
+
+        { Try read-write rewrite first (existing file) }
+        fHandle := driver.storage.vfs.OpenFile(absPath, omReadWrite, wmRewrite, @fError);
+        if (fHandle = 0) or (fError <> eNone) then begin
+            { Try creating new file }
+            fHandle := driver.storage.vfs.OpenFile(absPath, omWriteOnly, wmNew, @fError);
+        end;
+
+        if (fHandle = 0) or (fError <> eNone) then begin
+            io.syslog.writestringln('Error: cannot open file for writing.');
+            kfree(void(content));
+            kfree(void(absPath));
+            exit;
+        end;
+
+        driver.storage.vfs.WriteFile(fHandle, 0, puint8(content), contentLen);
+        driver.storage.vfs.CloseFile(fHandle);
+        io.syslog.writestringln('Written.');
+        kfree(void(content));
+    end else begin
+        io.syslog.writestringln('Error: operation must be < or >.');
+    end;
+
+    kfree(void(absPath));
+end;
+
+procedure init();
+begin
+    debug.tracer.push_trace('inio.init');
+    io.stdio.registerCommand('INIO', @Run, 'Inline IO: app.inio <file> < | app.inio <file> > text');
+end;
+
+end.

src/app/app.md5sum.pas

@@ -17,12 +17,12 @@
 	
 	@author(Kieron Morris <kjm@kieronmorris.me>)
 }
-unit md5sum;
+unit app.md5sum;
 
 interface
 
 uses
-    stdio, util, strings, tracer, md5;
+    io.stdio, core.util, arch.x86.util, core.strings, debug.tracer, core.enc.md5;
 
 procedure init();
 
@@ -40,15 +40,15 @@ begin
     wordlen:= stringSize(md5word);
     MD5_Hash := MD5Buffer(puint8(md5word), wordlen);
     for i:=0 to 15 do begin
-        stdio.bufWriteHexPair(stdout_buf, MD5_Hash^[i]);
+        io.stdio.bufWriteHexPair(stdout_buf, MD5_Hash^[i]);
     end;
-    stdio.bufWriteStrLn(stdout_buf, ' ');
+    io.stdio.bufWriteStrLn(stdout_buf, ' ');
 end;
 
 procedure init();
 begin
-    tracer.push_trace('md5sum.init');
-    stdio.registerCommand('MD5SUM', @Run, 'Perform MD5SUM on a word.');
+    debug.tracer.push_trace('md5sum.init');
+    io.stdio.registerCommand('MD5SUM', @Run, 'Perform MD5SUM on a word.');
 end;
 
 end.

src/app/app.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->app.meminfo - Print memory statistics (PMM / LMM).
+	
+	@author(Kieron Morris <[email protected]>)
+}
+unit app.meminfo;
+
+interface
+
+uses
+    io.stdio, arch.x86.multiboot, arch.x86.memory.physical, memory.heap, debug.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 }
+    io.stdio.bufWriteStrLn(stdout_buf, '--- Multiboot ---');
+    io.stdio.bufWriteStr(stdout_buf, 'Lower Memory  : ');
+    io.stdio.bufWriteInt(stdout_buf, multibootinfo^.mem_lower);
+    io.stdio.bufWriteStrLn(stdout_buf, ' KB');
+    io.stdio.bufWriteStr(stdout_buf, 'Upper Memory  : ');
+    io.stdio.bufWriteInt(stdout_buf, multibootinfo^.mem_upper);
+    io.stdio.bufWriteStrLn(stdout_buf, ' KB');
+    io.stdio.bufWriteStr(stdout_buf, 'Total Memory  : ');
+    io.stdio.bufWriteInt(stdout_buf, ((multibootinfo^.mem_upper + 1000) div 1024) + 1);
+    io.stdio.bufWriteStrLn(stdout_buf, ' MB');
+
+    { PMM stats }
+    io.stdio.bufWriteStrLn(stdout_buf, '--- PMM (4 MB blocks) ---');
+    pmm_total := arch.x86.memory.physical.pmm_total_blocks;
+    pmm_free  := arch.x86.memory.physical.pmm_free_blocks;
+    pmm_used  := pmm_total - pmm_free;
+    io.stdio.bufWriteStr(stdout_buf, 'Total Blocks  : ');
+    io.stdio.bufWriteIntLn(stdout_buf, pmm_total);
+    io.stdio.bufWriteStr(stdout_buf, 'Free Blocks   : ');
+    io.stdio.bufWriteIntLn(stdout_buf, pmm_free);
+    io.stdio.bufWriteStr(stdout_buf, 'Used Blocks   : ');
+    io.stdio.bufWriteIntLn(stdout_buf, pmm_used);
+    io.stdio.bufWriteStr(stdout_buf, 'Free Physical : ');
+    io.stdio.bufWriteInt(stdout_buf, pmm_free * 4);
+    io.stdio.bufWriteStrLn(stdout_buf, ' MB');
+
+    { LMM heap stats }
+    io.stdio.bufWriteStrLn(stdout_buf, '--- LMM (Heap) ---');
+    lmm_pages := memory.heap.lmm_page_count;
+    lmm_free  := memory.heap.lmm_total_free;
+    io.stdio.bufWriteStr(stdout_buf, 'Heap Pages    : ');
+    io.stdio.bufWriteIntLn(stdout_buf, lmm_pages);
+    io.stdio.bufWriteStr(stdout_buf, 'Heap Size     : ');
+    io.stdio.bufWriteInt(stdout_buf, lmm_pages * 4);
+    io.stdio.bufWriteStrLn(stdout_buf, ' MB');
+    io.stdio.bufWriteStr(stdout_buf, 'Heap Free     : ');
+    io.stdio.bufWriteInt(stdout_buf, lmm_free div 1024);
+    io.stdio.bufWriteStrLn(stdout_buf, ' KB');
+end;
+
+procedure init();
+begin
+    debug.tracer.push_trace('meminfo.init');
+    io.stdio.registerCommand('MEMINFO', @Run, 'Print memory statistics (PMM/LMM).');
+end;
+
+end.