From 71e4f3812982dba2efb471283d310224e8db363e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 3 Mar 2021 22:09:50 -0800 Subject: 7842 - new directory organization Baremetal is now the default build target and therefore has its sources at the top-level. Baremetal programs build using the phase-2 Mu toolchain that requires a Linux kernel. This phase-2 codebase which used to be at the top-level is now under the linux/ directory. Finally, the phase-2 toolchain, while self-hosting, has a way to bootstrap from a C implementation, which is now stored in linux/bootstrap. The bootstrap C implementation uses some literate programming tools that are now in linux/bootstrap/tools. So the whole thing has gotten inverted. Each directory should build one artifact and include the main sources (along with standard library). Tools used for building it are relegated to sub-directories, even though those tools are often useful in their own right, and have had lots of interesting programs written using them. A couple of things have gotten dropped in this process: - I had old ways to run on just a Linux kernel, or with a Soso kernel. No more. - I had some old tooling for running a single test at the cursor. I haven't used that lately. Maybe I'll bring it back one day. The reorg isn't done yet. Still to do: - redo documentation everywhere. All the README files, all other markdown, particularly vocabulary.md. - clean up how-to-run comments at the start of programs everywhere - rethink what to do with the html/ directory. Do we even want to keep supporting it? In spite of these shortcomings, all the scripts at the top-level, linux/ and linux/bootstrap are working. The names of the scripts also feel reasonable. This is a good milestone to take stock at. --- 309stream.subx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to '309stream.subx') diff --git a/309stream.subx b/309stream.subx index adc92cfd..56b19272 100644 --- a/309stream.subx +++ b/309stream.subx @@ -98,10 +98,10 @@ $write-to-stream:end: c3/return $write-to-stream:abort: - (write-buffered Stderr "write-to-stream: stream full\n") - (flush Stderr) - bb/copy-to-ebx 1/imm32 - (syscall_exit) + (draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0 "write-to-stream: stream full" 3 0) # 3=cyan + { + eb/jump loop/disp8 + } # never gets here read-from-stream: # s: (addr stream _), out: (addr byte), n: int @@ -151,10 +151,10 @@ $read-from-stream:end: c3/return $read-from-stream:abort: - (write-buffered Stderr "read-from-stream: stream empty\n") - (flush Stderr) - bb/copy-to-ebx 1/imm32 - (syscall_exit) + (draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0 "read-from-stream: stream empty" 3 0) # 3=cyan + { + eb/jump loop/disp8 + } # never gets here stream-first: # s: (addr stream byte) -> result/eax: byte -- cgit 1.4.1-2-gfad0