about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-03-09 00:43:59 -0800
committerKartik K. Agaram <vc@akkartik.com>2021-03-09 00:43:59 -0800
commit7e87c36c3aec7d715f7fbb04ca6bd6557eeedef3 (patch)
treefe09078bd06312ca8d1dbcdc428fe444657f0c22
parent9586db164cb80f2344f96b0af8a180ff4f50f2bb (diff)
downloadmu-7e87c36c3aec7d715f7fbb04ca6bd6557eeedef3.tar.gz
.
-rw-r--r--README.md2
-rw-r--r--linux/bootstrap/README.md18
-rw-r--r--linux/bootstrap/bootstrap.md17
3 files changed, 18 insertions, 19 deletions
diff --git a/README.md b/README.md
index 4abf4891..4c5dc88c 100644
--- a/README.md
+++ b/README.md
@@ -205,8 +205,6 @@ If you're still reading, here are some more things to check out:
   to SubX. Most Mu statements map to a single x86 instruction.
   ([colorized version](http://akkartik.github.io/mu/html/mu_instructions.html))
 
-- [Commandline reference for the bootstrap C++ program.](bootstrap.md)
-
 - [Some details on the unconventional organization of this project.](http://akkartik.name/post/four-repos)
 
 - Previous prototypes: [mu0](https://github.com/akkartik/mu0), [mu1](https://github.com/akkartik/mu1).
diff --git a/linux/bootstrap/README.md b/linux/bootstrap/README.md
index ca4ea4b3..dcf1f79d 100644
--- a/linux/bootstrap/README.md
+++ b/linux/bootstrap/README.md
@@ -7,3 +7,21 @@ b) A second translator for SubX programs that emits identical binaries to the
 self-hosting versions in the parent directory. Having two diverse compilers
 (one in a familiar language, one with minimal syscall surface area) that emit
 identical binaries should help gain confidence in Mu.
+
+## Running
+
+`bootstrap` currently has the following sub-commands:
+
+- `bootstrap help`: some helpful documentation to have at your fingertips.
+
+- `bootstrap test`: runs all automated tests.
+
+- `bootstrap translate <input files> -o <output ELF binary>`: translates `.subx`
+  files into an executable ELF binary.
+
+- `bootstrap run <ELF binary> <args>`: simulates running the ELF binaries emitted
+  by `bootstrap translate`. Useful for testing and debugging.
+
+  Remember, not all 32-bit Linux binaries are guaranteed to run. I'm not
+  building general infrastructure here for all of the x86 instruction set.
+  SubX is about programming with a small, regular subset of 32-bit x86.
diff --git a/linux/bootstrap/bootstrap.md b/linux/bootstrap/bootstrap.md
deleted file mode 100644
index ca9320e5..00000000
--- a/linux/bootstrap/bootstrap.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## Running
-
-`bootstrap` currently has the following sub-commands:
-
-- `bootstrap help`: some helpful documentation to have at your fingertips.
-
-- `bootstrap test`: runs all automated tests.
-
-- `bootstrap translate <input files> -o <output ELF binary>`: translates `.subx`
-  files into an executable ELF binary.
-
-- `bootstrap run <ELF binary> <args>`: simulates running the ELF binaries emitted
-  by `bootstrap translate`. Useful for testing and debugging.
-
-  Remember, not all 32-bit Linux binaries are guaranteed to run. I'm not
-  building general infrastructure here for all of the x86 instruction set.
-  SubX is about programming with a small, regular subset of 32-bit x86.