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. --- baremetal/502test.mu | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 baremetal/502test.mu (limited to 'baremetal/502test.mu') diff --git a/baremetal/502test.mu b/baremetal/502test.mu deleted file mode 100644 index 00d55d34..00000000 --- a/baremetal/502test.mu +++ /dev/null @@ -1,43 +0,0 @@ -# print msg to screen if a != b, otherwise print "." -fn check-ints-equal _a: int, b: int, msg: (addr array byte) { - var a/eax: int <- copy _a - compare a, b - { - break-if-!= - draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ".", 3/fg/cyan, 0/bg - return - } - draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, msg, 3/fg/cyan, 0/bg - move-cursor-to-start-of-next-line 0/screen - count-test-failure -} - -fn test-check-ints-equal { - check-ints-equal 0, 0, "abc" -} - -fn check _a: boolean, msg: (addr array byte) { - var a/eax: int <- copy _a - compare a, 0/false - { - break-if-= - draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ".", 3/fg/cyan, 0/bg - return - } - draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, msg, 3/fg/cyan, 0/bg - move-cursor-to-start-of-next-line 0/screen - count-test-failure -} - -fn check-not _a: boolean, msg: (addr array byte) { - var a/eax: int <- copy _a - compare a, 0/false - { - break-if-!= - draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, ".", 3/fg/cyan, 0/bg - return - } - draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, msg, 3/fg/cyan, 0/bg - move-cursor-to-start-of-next-line 0/screen - count-test-failure -} -- cgit 1.4.1-2-gfad0