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.

1 files changed, 29 insertions, 26 deletions

diff --git a/translate_subx b/translate_subx
index 6d08e971..cdf7b085 100755
--- a/translate_subx
+++ b/translate_subx
@@ -1,40 +1,43 @@
 #!/bin/sh
-# Translate given SubX files by running the self-hosted translator natively on
-# Linux.
+# Translate SubX files to a bootable disk image.
+#
+# A couple of gotchas:
+# * Many phases here have no error-checking. Perhaps I should use a
+#   version of translate_subx_debug for baremetal.
+# * Don't pass in numbered .subx files without translated .mu files. Our test
+#   harness is in test.mu, and only Mu programs can run tests in baremetal.
+#
+# The top level is in general not as rigorous about avoiding dependency cycles
+# as the lower-level tools in linux/
 
 set -e
 
-./build
-
-cat $*          |apps/braces      > a.braces
+cat $*          |linux/braces            > a.braces
 
-cat a.braces    |apps/calls       > a.calls
+cat a.braces    |linux/calls             > a.calls
 
-cat a.calls     |apps/sigils      > a.sigils
+cat a.calls     |linux/sigils            > a.sigils
 
-cat a.sigils    |apps/tests       > a.tests
+cat a.sigils    |linux/tests             > a.tests
 
-cat a.tests     |apps/assort      > a.assort
+# no assort since baremetal SubX doesn't have segments yet
 
-cat a.assort    |apps/dquotes     > a.dquotes
+cat a.tests     |linux/dquotes           > a.dquotes
 
-# A little hack. We want translate_subx to always emit identical binaries to
-# the C++ translator. The C++ translator assorts segments before it processes
-# string literals, so we follow the same order above.
-#
-# However, dquotes currently emits a separate data segment for string literals.
-# So we need to run assort a second time to clean up after it.
-#
-# Potential solutions:
-#   a) modify C++ translator to process string literals before assorting.
-#   b) clean up dquotes to assume assorted segments, and append to the
-#   existing data segment.
-cat a.dquotes   |apps/assort      > a.assort2
+cat a.dquotes   |linux/pack              > a.pack
 
-cat a.assort2   |apps/pack        > a.pack
+cat a.pack      |linux/survey_baremetal  > a.survey
 
-cat a.pack      |apps/survey_elf  > a.survey
+cat a.survey    |linux/hex               > a.bin
 
-cat a.survey    |apps/hex         > a.elf
+# Create disk.img containing baremetal/boot.hex and a.bin
+dd if=/dev/zero of=disk.img count=20160  # 512-byte sectors, so 10MB
+linux/hex < boot.hex  > boot.bin
+cat boot.bin a.bin > disk.bin
+dd if=disk.bin of=disk.img conv=notrunc
 
-chmod +x a.elf
+if [ `stat --printf="%s" disk.bin` -ge 193536 ]  # 6 tracks * 63 sectors per track * 512 bytes per sector (keep this sync'd with boot.hex)
+then
+  echo "disk.bin won't all be loaded on boot"
+  exit 1
+fi