diff options
| author | salmonik <salmonik@tuta.io> | 2026-11-01 15:53:29 +0100 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-11-01 15:53:29 +0100 |
| commit | 7958276c9f0d230053520ba20f2a00f5ecda18e4 (patch) | |
| tree | 596f5f71ad597ed951bae98de818cb37f171a18d /scripts/debug-kernel.py | |
| parent | fs: /bin alias for the system volume (diff) | |
| download | rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.tar.gz rs-dos-7958276c9f0d230053520ba20f2a00f5ecda18e4.zip | |
scripts: rebuild the dev loop around build.sh/run.sh
`make` did not parse at all (missing separator at line 139), so every
make target was dead. The folder also carried three overlapping
launchers (boot.sh, qemu.sh, boot-image.sh) plus a fourth partial one
in the Makefile, `cargo build --package rsdos` copy-pasted eight times,
the QEMU invocation copy-pasted per script, and the test helpers
(fail/wait_log/wait_qemu_exit/qemu_hmp) duplicated in five tests.
New layout:
- scripts/lib.sh: single config (image, OVMF, mem/smp), the one cargo
invocation (build_all), the one QEMU shape (qemu_args), and the test
harness (test_boot, wait_log, wait_qemu_exit, qemu_hmp, sendkeys)
- scripts/build.sh: kernel + every bins/* in one pass
- scripts/mksystem.sh: freshness-aware image build that now stages
every bins/*.efi into /bin/cli|gui (they were never copied before)
- scripts/run.sh: build + stage + boot in one command; --headless,
--debug (GDB stub), --monitor (HMP socket), --fresh, --mem/--smp/
--bios/--image; on Wayland it auto-selects XWayland plus
grab-on-hover so the mouse can be captured (Ctrl+Alt+G toggles)
- scripts/tests/: the five automated tests on the shared harness
- deleted: boot.sh, qemu.sh, boot-image.sh, lib-boot-args.sh,
build-image-release.sh, build-bootloader.sh (rsboot chain dropped)
The Makefile is now a thin wrapper: make run, make test, make system,
make inspect, make help. Two-command flow: ./scripts/build.sh then
./scripts/run.sh (run.sh alone also works).
Stale test assumptions fixed so the suite is green again: test-gfx
waited for "gfx: check" while the shell prints "gfx check: PASS";
test-mouse/test-msg hardcoded msgrecv = task 3 (wm-input took slot 3 —
ids are parsed from the log now); the queue-full probe targeted task 0,
whose exec pump drains its own queue as completion codes (moved to the
cursor task, which never recvs).
Verified in QEMU: make test -> test-disk, test-gfx, test-mouse,
test-msg, test-fault all PASS.
Diffstat (limited to '')
| -rwxr-xr-x | scripts/debug-kernel.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/debug-kernel.py b/scripts/debug-kernel.py index c794ad6..c675045 100755 --- a/scripts/debug-kernel.py +++ b/scripts/debug-kernel.py | |||
| @@ -2,20 +2,22 @@ | |||
| 2 | GDB Python script for debugging raisernics under QEMU. | 2 | GDB Python script for debugging raisernics under QEMU. |
| 3 | 3 | ||
| 4 | Usage: | 4 | Usage: |
| 5 | 1. Terminal 1: ./tools/qemu.sh --debug | 5 | 1. Terminal 1: ./scripts/run.sh --debug (GDB stub on :1234) |
| 6 | 2. Terminal 2: gdb -x tools/debug-kernel.py target/x86_64-unknown-uefi/debug/raisernics.efi | 6 | Add PROFILE=debug for line-level symbols (slower guest). |
| 7 | 2. Terminal 2: gdb -x scripts/debug-kernel.py | ||
| 7 | """ | 8 | """ |
| 8 | 9 | ||
| 9 | import gdb | 10 | import gdb |
| 10 | import os | 11 | import os |
| 11 | 12 | ||
| 12 | # Find the kernel binary | 13 | # Find the kernel binary (debug profile preferred, release as fallback) |
| 13 | script_dir = os.path.dirname(os.path.abspath(__file__)) | 14 | script_dir = os.path.dirname(os.path.abspath(__file__)) |
| 14 | project_root = os.path.dirname(script_dir) | 15 | project_root = os.path.dirname(script_dir) |
| 15 | binary = os.path.join( | 16 | candidates = [ |
| 16 | project_root, | 17 | os.path.join(project_root, "target/x86_64-unknown-uefi/debug/rsdos.efi"), |
| 17 | "target/x86_64-unknown-uefi/debug/raisernics.efi" | 18 | os.path.join(project_root, "target/x86_64-unknown-uefi/release/rsdos.efi"), |
| 18 | ) | 19 | ] |
| 20 | binary = next((c for c in candidates if os.path.exists(c)), candidates[0]) | ||
| 19 | 21 | ||
| 20 | # Connect to QEMU's GDB stub | 22 | # Connect to QEMU's GDB stub |
| 21 | gdb.execute("target remote :1234") | 23 | gdb.execute("target remote :1234") |
