Merge pull request 'Automate boot unit inclusion with architecture-aware Moderne analysis' (#74) from feature/dangling-unit-resolution into develop

Reviewed-on: #74

.drone.yml

@@ -17,6 +17,7 @@ steps:
 
   - name: compile
     image: t3hn3rd/asuro-build:latest
+    pull: always
     depends_on:
       - build-image
     commands:

.gitignore

@@ -20,3 +20,7 @@ wasuro
 src/core/core.version.pas
 site/*
 !site/.gitkeep
+/src/boot/dangling_units.inc
+/lib/dangling/
+.moderne
+CLAUDE.md

Dockerfile

@@ -1,4 +1,5 @@
-FROM ubuntu:latest
+ARG RECIPES_IMAGE=t3hn3rd/moderne-asuro-recipes:0.1.1@sha256:eaf54188053511dad9c620a8fb98b0f50c41770cd49a0b3d71a0538386522011
+FROM ${RECIPES_IMAGE}
 
 VOLUME ["/code"]
 
@@ -7,7 +8,7 @@ RUN dpkg --add-architecture i386
 RUN apt-get update && apt-get install -y \
 	curl dos2unix wget git make nasm binutils xorriso grub-pc-bin gcc gcc-multilib \
 	python3 python3-pip python3-pil && \
-	apt-get clean my room
+	apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN pip3 install --no-cache-dir --break-system-packages "mkdocs>=1.6,<2" mkdocs-material
 
@@ -20,6 +21,5 @@ RUN curl -sL https://sourceforge.net/projects/freepascal/files/Linux/$FPC_VERSIO
 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"]

Dockerfile.dockerignore

@@ -0,0 +1,8 @@
+**/.git
+**/.gradle
+**/build
+**/.moderne
+wasuro
+site
+lib
+release

doc/toolchain/dangling_units.md

@@ -0,0 +1,45 @@
+# Automatic boot-unit inclusion
+
+Run the usual `docker compose build builder` and `docker compose run builder`
+from Asuro. Only this repository is required. Compose and Drone use the same
+Dockerfile and repository build context, producing `t3hn3rd/asuro-build:latest`.
+The Dockerfile inherits the published `t3hn3rd/moderne-asuro-recipes:0.1.1` image,
+pinned by digest. It already includes Java, Moderne CLI, the Pascal LST generator,
+and the registered recipe. The Asuro layer installs FPC and the kernel build tools.
+
+To upgrade tooling, publish the upstream images first and update `RECIPES_IMAGE`
+in the Dockerfile to the new tag and digest. Local tooling image testing can use
+`docker compose build --build-arg RECIPES_IMAGE=<local-tag> builder`.
+
+`ASURO_ARCH` selects the source architecture, defaulting to `x86`. For example:
+
+```sh
+export ASURO_ARCH=x86
+docker compose run --rm builder
+```
+
+Compose forwards this variable to the builder; Drone inherits it from its compile
+environment. Only `src/arch/$ASURO_ARCH` is added to FPC's unit search paths.
+Other architecture folders are excluded from LST generation and from the recipe's
+dependency graph and results. Common units outside `src/arch` remain eligible.
+The selected architecture folder must exist. This source selection does not
+change the existing i386 compiler target, assembly stub, or linker settings;
+an x86_64 port still needs those platform-specific changes.
+
+`compile_dangling.sh` runs after Wasuro synchronization and before FPC. It copies
+only `src/` and `compat/` into an isolated temporary analysis repository, generates
+LSTs with rewrite-pascal, runs the standalone Moderne recipe, exports its
+datatable, and writes `src/boot/dangling_units.inc`. Wasuro is not parsed.
+Datatable conversion is provided by the standalone project's Java exporter.
+Parse errors, recipe failures, and malformed datatables stop the build. The
+generated include is ignored by Git and removed before each generation attempt.
+
+Use `{$DEFINE NOT_DANGLING}` near a unit declaration to exclude an experimental
+or legacy unit from automatic inclusion. It can still be referenced normally.
+This is a file-level marker; conditional definitions are not evaluated. The
+analysis follows both interface and implementation uses, without expanding
+includes or evaluating conditional compilation.
+
+Moderne runs through its CLI normally; any license or tenant configuration
+required by your CLI installation must be provided to the container separately.
+No host credentials are copied into the image.

docker-compose.yml

@@ -1,5 +1,8 @@
 services:
   builder:
+    image: t3hn3rd/asuro-build:latest
     build: .
+    environment:
+      ASURO_ARCH: ${ASURO_ARCH:-x86}
     volumes:
       - .:/code

mkdocs.yml

@@ -283,6 +283,7 @@ nav:
     - Version Generation: toolchain/compile_vergen.md
     - LVGL Compilation: toolchain/compile_lvgl.md
     - Wasuro Pull: toolchain/compile_wasuro.md
+    - Automatic Boot Units: toolchain/dangling_units.md
     - Source List: toolchain/compile_sourcelist.md
     - Source Compilation: toolchain/compile_sources.md
     - Checksum: toolchain/compile_checksum.md

readme.md

@@ -28,7 +28,8 @@ We welcome everyone to give building/breaking/fixing/shooting Asuro a go, feel f
 4. Install Git for Windows.
 5. Install VSCode & the listed plugins.
 6. Install VirtualBox (v7+).
-7. Clone this repository.
+7. Clone this repository. The builder inherits the published Moderne/Pascal
+   tooling image; see [boot-unit generation](doc/toolchain/dangling_units.md).
 8. Run the following command in the root of the repo to build the docker image:
     ```powershell
     docker compose build builder

src/app/app.filebrowser.pas

@@ -195,7 +195,6 @@ procedure do_refresh_load(state: PFileBrowserState); forward;
 procedure do_refresh_build(state: PFileBrowserState); forward;
 procedure schedule_refresh(state: PFileBrowserState); forward;
 procedure fb_refresh_poll_cb(tmr: Plv_timer); cdecl; forward;
-function fb_error_name(err : TError) : pchar; forward;
 procedure fb_collect_cb(key: pchar; data: void; ud: void); forward;
 procedure do_refresh(state: PFileBrowserState); forward;
 procedure navigate_to(state: PFileBrowserState; newDir: pchar); forward;
@@ -583,51 +582,6 @@ begin
     puint32(@state^.refresh_pending)^ := 1;
 end;
 
-function fb_error_name(err : TError) : pchar;
-begin
-    case err of
-        eNone: fb_error_name := 'eNone';
-        eUnknown: fb_error_name := 'eUnknown';
-        eNotSupported: fb_error_name := 'eNotSupported';
-        eOutOfMemory: fb_error_name := 'eOutOfMemory';
-        eInvalidArgument: fb_error_name := 'eInvalidArgument';
-        eFileInUse: fb_error_name := 'eFileInUse';
-        eFileDoesNotExist: fb_error_name := 'eFileDoesNotExist';
-        eInvalidFileName: fb_error_name := 'eInvalidFileName';
-        eInvalidFileExtension: fb_error_name := 'eInvalidFileExtension';
-        eFilenameTooLong: fb_error_name := 'eFilenameTooLong';
-        eDirectoryDoesNotExist: fb_error_name := 'eDirectoryDoesNotExist';
-        eDirectoryAlreadyExists: fb_error_name := 'eDirectoryAlreadyExists';
-        eDirectoryNotEmpty: fb_error_name := 'eDirectoryNotEmpty';
-        eDirectoryFull: fb_error_name := 'eDirectoryFull';
-        eNotADirectory: fb_error_name := 'eNotADirectory';
-        eWriteOnly: fb_error_name := 'eWriteOnly';
-        eReadOnly: fb_error_name := 'eReadOnly';
-        ePermissionDenied: fb_error_name := 'ePermissionDenied';
-        eInvalidPath: fb_error_name := 'eInvalidPath';
-        eTooManyOpenFiles: fb_error_name := 'eTooManyOpenFiles';
-        eInvalidHandle: fb_error_name := 'eInvalidHandle';
-        eFileNotLoaded: fb_error_name := 'eFileNotLoaded';
-        eAlreadyExists: fb_error_name := 'eAlreadyExists';
-        eDiskFull: fb_error_name := 'eDiskFull';
-        eIOError: fb_error_name := 'eIOError';
-        eIOTimeout: fb_error_name := 'eIOTimeout';
-        eIOCancelled: fb_error_name := 'eIOCancelled';
-        eDeviceNotReady: fb_error_name := 'eDeviceNotReady';
-        eDeviceRemoved: fb_error_name := 'eDeviceRemoved';
-        eDeviceNotFound: fb_error_name := 'eDeviceNotFound';
-        eQueueFull: fb_error_name := 'eQueueFull';
-        eNoFreeSlot: fb_error_name := 'eNoFreeSlot';
-        eCorruptFilesystem: fb_error_name := 'eCorruptFilesystem';
-        eBadSector: fb_error_name := 'eBadSector';
-        eAlreadyMounted: fb_error_name := 'eAlreadyMounted';
-        eNotMounted: fb_error_name := 'eNotMounted';
-        eUnsupportedFilesystem: fb_error_name := 'eUnsupportedFilesystem';
-        eInvalidPartitionTable: fb_error_name := 'eInvalidPartitionTable';
-        eVolumeNotFound: fb_error_name := 'eVolumeNotFound';
-    end;
-end;
-
 { fb_refresh_poll_cb — 50ms LVGL poll timer; when rd_ready=1, build UI }
 procedure fb_refresh_poll_cb(tmr: Plv_timer); cdecl;
 var
@@ -650,12 +604,9 @@ begin
             case state^.wop_kind of
                 1: lv_msgbox_add_text(mbox, 'Could not create folder.');
                 2: lv_msgbox_add_text(mbox, 'Could not rename item.');
-                3: lv_msgbox_add_text(mbox, 'Could not create file.');
-                4: lv_msgbox_add_text(mbox, 'Could not delete item.');
             else
                 lv_msgbox_add_text(mbox, 'Operation failed.');
             end;
-            lv_msgbox_add_text(mbox, fb_error_name(state^.wop_result));
             ok_b := lv_msgbox_add_footer_button(mbox, 'OK');
             lv_obj_add_event_cb(ok_b, @fb_mbox_close_cb, LV_EVENT_CLICKED, mbox);
         end;
@@ -668,8 +619,8 @@ begin
             kfree(void(state^.wop_path2));
             state^.wop_path2 := nil;
         end;
-        { For rename/delete, clear selection }
-        if (state^.wop_kind = 2) or (state^.wop_kind = 4) then
+        { For rename, clear selection }
+        if state^.wop_kind = 2 then
             clear_selection(state);
         schedule_refresh(state);
     end;
@@ -1640,16 +1591,15 @@ begin
             @fb_delete_done, state);
 end;
 
-{ Async completion callback — runs outside the LVGL thread, so only set flags. }
+{ Async completion callback — runs in ISR/worker context, defer to LVGL }
 procedure fb_delete_done(error: TError; userdata: pointer);
 var
     state: PFileBrowserState;
 begin
     state := PFileBrowserState(userdata);
     if state = nil then exit;
-    state^.wop_kind := 4;
-    state^.wop_result := error;
-    puint32(@state^.wop_done)^ := 1;
+    state^.op_err := error;
+    lv_timer_create(@fb_delete_done_timer, 1, state);
 end;
 
 { Deferred UI update after delete }
@@ -1910,20 +1860,15 @@ begin
     if (error = eNone) and (nfctx^.handle <> 0) then begin
         { WriteFileAsync needs a non-nil buffer; Length=0 so it is never read }
         driver.storage.vfs.WriteFileAsync(nfctx^.handle, 0,
-            puint8(@nfctx^.err), 0, nil, @fb_newfile_written, nfctx);
+            puint8(@nfctx^.err), 0, @fb_newfile_written, nfctx);
     end else begin
         if nfctx^.handle <> 0 then
             driver.storage.vfs.CloseFile(nfctx^.handle);
-        if nfctx^.state <> nil then begin
-            nfctx^.state^.wop_kind := 3;
-            nfctx^.state^.wop_result := nfctx^.err;
-            puint32(@nfctx^.state^.wop_done)^ := 1;
-        end;
-        kfree(void(nfctx));
+        lv_timer_create(@fb_newfile_done_timer, 1, nfctx);
     end;
 end;
 
-{ Async step 2: write complete — close handle and defer UI work via poll flags }
+{ Async step 2: write complete — close handle and schedule UI refresh }
 procedure fb_newfile_written(error: TError; userdata: pointer);
 var
     nfctx : PNewFileCtx;
@@ -1933,12 +1878,7 @@ begin
     if error <> eNone then nfctx^.err := error;
     if nfctx^.handle <> 0 then
         driver.storage.vfs.CloseFile(nfctx^.handle);
-    if nfctx^.state <> nil then begin
-        nfctx^.state^.wop_kind := 3;
-        nfctx^.state^.wop_result := nfctx^.err;
-        puint32(@nfctx^.state^.wop_done)^ := 1;
-    end;
-    kfree(void(nfctx));
+    lv_timer_create(@fb_newfile_done_timer, 1, nfctx);
 end;
 
 procedure fb_newfile_done_timer(tmr: Plv_timer); cdecl;

src/app/app.mgr.pas

@@ -26,7 +26,7 @@ uses
     boot.mgr,
     debug.tracer, io.stdio, proc.mgr,
     //progs
-    app.base64, app.md5sum, app.dhclient, app.vbeinfo, app.testcmd, app.ping, app.meminfo, app.setres, app.iotest,
+    app.base64, app.md5sum, app.dhclient, app.vbeinfo, app.testcmd, app.ping, app.meminfo, app.setres,
     //drivers
     driver.storage.ctl.ram, driver.mgr,
     //network
@@ -92,7 +92,6 @@ begin
     app.bsod.init();
     app.vterminal.init;
     app.filebrowser.init();
-    app.iotest.init();
 end;
 
 Initialization

src/app/app.partcmd.pas

@@ -288,9 +288,7 @@ begin
     if bootrecord <> nil then begin
         if bootrecord^.boot_sector <> $AA55 then begin
             println('No valid mbr found, initialising disk...');
-            if driver.storage.vol.mgr.init_disk(device) <> eNone then begin
-                println('Error: disk initialization failed.'); exit;
-            end;
+            driver.storage.vol.mgr.init_disk(device);
         end;
         kfree(puint32(bootrecord));
     end;
@@ -337,9 +335,7 @@ begin
 
     driver.storage.vol.mbr.setup_partition(@part, lba, sectors);
     part.system_id := 0;
-    if driver.storage.vol.mgr.add_partition(device, slot, part) <> eNone then begin
-        println('Error: partition creation failed.'); exit;
-    end;
+    driver.storage.vol.mgr.add_partition(device, slot, part);
 
     print('Partition added in slot ');
     printint(slot);
@@ -411,9 +407,7 @@ begin
         exit;
     end;
 
-    if driver.storage.vol.mgr.remove_partition(device, slot) <> eNone then begin
-        println('Error: partition removal failed.'); exit;
-    end;
+    driver.storage.vol.mgr.remove_partition(device, slot);
 
     print('Partition slot ');
     printint(slot);
@@ -529,14 +523,11 @@ begin
         exit;
     end;
 
-    i := 0;
-    while i < driver.storage.vol.mgr.get_volume_count() do begin
-        if driver.storage.vol.mgr.get_volume(i) = vol then break;
-        Inc(i);
-    end;
-    if not driver.storage.vol.mgr.format_volume(device, i, fsName, nil) then begin
-        println('Error: format failed; the volume was not reported ready.'); exit;
-    end;
+    vol^.filesystem := fs;
+    fs^.createCallback(vol, vol^.sectorCount, vol^.sectorStart, nil);
+
+    { Re-probe filesystem so identify picks up the new signature }
+    driver.storage.fs.mgr.probe_volume(vol);
 
     print('Partition ');
     printint(slot);

src/arch/x86/arch.x86.util.pas

@@ -44,7 +44,6 @@ function inl(port : uint16) : uint32;
 procedure io_wait;
 
 procedure __SSE_128_memcpy(source : uint32; dest : uint32);
-procedure __REP_MOVSB_memcpy(source : uint32; dest : uint32; size : uint32);
 
 procedure halt_and_catch_fire();
 procedure halt_and_dont_catch_fire();
@@ -114,19 +113,6 @@ asm
     MOVAPS [EAX], XMM1
 end;
 
-procedure __REP_MOVSB_memcpy(source : uint32; dest : uint32; size : uint32); assembler;
-asm
-    push esi
-    push edi
-    cld
-    mov esi, source
-    mov edi, dest
-    mov ecx, size
-    rep movsb
-    pop edi
-    pop esi
-end;
-
 function getESP : uint32;
 var
     tmp: uint32;

src/arch/x86/isr/arch.x86.isr.tmr1.pas

@@ -19,6 +19,8 @@
 }
 unit arch.x86.isr.tmr1;
 
+{$DEFINE NOT_DANGLING} { Unused legacy timer ISR; not part of the kernel boot sequence. }
+
 interface
 
 uses

src/arch/x86/proc/arch.x86.proc.loader.pas

@@ -19,6 +19,8 @@
 }
 unit arch.x86.proc.loader;
 
+{$DEFINE NOT_DANGLING} { Unimplemented process-loader stub. }
+
 interface
 
 implementation;

src/arch/x86/system.pas

@@ -271,7 +271,6 @@ procedure fpc_shortstr_assign(len: longint; sstr, dstr: Pointer); compilerproc;
   any int64/uint64 arithmetic occurs (e.g. sint32 * uint32 promotion).
   Must live in the system unit so the compiler can resolve it. }
 function fpc_mul_int64(f1, f2: int64): int64; compilerproc;
-function fpc_mul_dword_to_qword(f1, f2: uint32): qword; compilerproc;
 function fpc_div_int64(d, n: int64): int64; compilerproc;
 function fpc_mod_int64(d, n: int64): int64; compilerproc;
 function fpc_mod_qword(d, n: qword): qword; compilerproc;
@@ -524,18 +523,6 @@ begin
     fpc_mul_int64 := res;
 end;
 
-function fpc_mul_dword_to_qword(f1, f2: uint32): qword; [public, alias: 'FPC_MUL_DWORD_TO_QWORD']; compilerproc;
-var res: qword;
-begin
-    asm
-        MOV EAX, f1
-        MUL f2
-        MOV DWORD [res], EAX
-        MOV DWORD [res+4], EDX
-    end;
-    fpc_mul_dword_to_qword := res;
-end;
-
 { ---------- 64-bit division / modulo ---------- }
 
 { Helper: unsigned 64÷64→64 using shift-subtract (binary long division).

src/boot/boot.mgr.pas

@@ -71,107 +71,9 @@ procedure run;
 implementation
 
 uses
-    io.syslog, boot.splash,
-
-    // Silo units that must be included here to compile
-    driver.storage.boot,
-    test,
-    core,
-    app.wasm,
-    driver.storage.ctl.ahci,
-    core.enc.base64,
-    core.panic,
-    driver.video.bga,
-    arch.x86.bda,
-    arch.x86.panic,
-    core.ds.cfifo,
-    core.ds.cfifols,
-    core.ds.circ,
-    core.gfx.color,
-    arch.x86.proc.sched,
-    arch.x86.cpu,
-    driver.video.desktop,
-    driver.video.doublebuffer,
-    driver.mgr,
-    driver.net.dev.e1000,
-    driver.bus.usb.ehci,
-    driver.storage.fs.fat32,
-    arch.x86.fault,
-    core.ds.fifo,
-    driver.storage.fs.mgr,
-    driver.storage.fs.flatfs,
-    core.gfx.fonts,
-    arch.x86.gdt,
-    driver.video.gpu,
-    svc.gfxd,
-    core.ds.hashmap,
-    arch.x86.idt,
-    arch.x86.isr.ioapic,
-    arch.x86.irq,
-    driver.storage.fs.iso9660,
-    arch.x86.isr,
-    arch.x86.isr.mgr,
-    driver.hid.keyboard,
-    core.ds.lifo,
-    core.ds.lists,
-    memory.heap,
-    driver.video.lvgl,
-    core.ds.maxh,
-    core.enc.md5,
-    core.ds.minh,
-    driver.hid.mouse,
-    arch.x86.multiboot,
-    driver.net,
-    driver.bus.usb.ohci,
-    app.partcmd,
-    driver.bus.pci,
-    arch.x86.memory.physical,
-    core.ds.prio,
-    proc.mgr,
-    app.mgr,
-    driver.hid.ps2.keyboard,
-    driver.hid.ps2.mouse,
-    core.rand,
-    driver.timer.rtc,
-    driver.io.serial,
-    io.stdio,
-    driver.storage.mgr,
-    driver.storage.test,
-    core.strings,
-    driver.exp.testdriver,
-    proc.testprocs,
-    arch.x86.isr.tmr0,
-    debug.tracer,
-    driver.bus.usb.uhci,
-    app.uidebug,
-    driver.bus.usb,
-    driver.hid.usb.keyboard,
-    driver.hid.usb.mouse,
-    driver.storage.ctl.usb,
-    driver.bus.usb.core,
-    svc.usbd,
-    driver.bus.usb.hub,
-    driver.bus.usb.types,
-    core.util, 
-    arch.x86.util,
-    arch.x86.v86,
-    driver.video.vesa,
-    driver.storage.vfs,
-    driver.video,
-    arch.x86.memory.virtual,
-    core.enc.fnv1a,
-    core.enc.djb2,
-    core.ds.bloom,
-    app.volcmd,
-    driver.storage.vol.mgr,
-    app.vterminal,
-    wasm, 
-    wasm.vm.io, 
-    wasm.test, 
-    wasm.test.framework,
-    driver.video.windows,
-    driver.bus.usb.xhci,
-    core.fmt.json;
+    io.syslog, boot.splash
+    {$INCLUDE dangling_units.inc}
+    ;
 
 type
     { Resolved execution order — indices into Entries[] }

src/core/core.util.pas

@@ -42,26 +42,6 @@ function HexCharToDecimal(hex : char) : uint8;
 function abs(x : sint32) : uint32;
 
 implementation
-{$ifdef CPU386}
-uses
-    arch.x86.util;
-
-const
-    MEMCPY_X86_SMALL_COPY_THRESHOLD = 16;
-{$endif}
-
-procedure scalar_memcpy(source : uint32; dest : uint32; size : uint32);
-var
-    src, dst : puint8;
-    i : uint32;
-begin
-    if size = 0 then exit;
-    for i := 0 to size - 1 do begin
-        src := puint8(source + i);
-        dst := puint8(dest + i);
-        dst^ := src^;
-    end;
-end;
 
 function abs(x : sint32) : uint32;
 var
@@ -143,16 +123,17 @@ begin
 end;
 
 procedure memcpy(source : uint32; dest : uint32; size : uint32);
+var
+    src, dst : puint8;
+    i : uint32;
+
 begin
     if size = 0 then exit;
-{$ifdef CPU386}
-    if size < MEMCPY_X86_SMALL_COPY_THRESHOLD then
-        scalar_memcpy(source, dest, size)
-    else
-        arch.x86.util.__REP_MOVSB_memcpy(source, dest, size);
-{$else}
-    scalar_memcpy(source, dest, size);
-{$endif}
+    for i:=0 to size-1 do begin
+        src:= puint8(source + i);
+        dst:= puint8(dest + i);
+        dst^:= src^;
+    end;
 end;
 
 function getWord(i : uint32; hi : boolean) : uint16;