about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-08-22 20:23:21 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-08-22 20:24:37 -0700
commitb41aed4a9adda23ca2613a24fefa3eafbd611987 (patch)
treefbdcec6988d632397f08cf39e6d8d195c4315076
parent52e3ea8a4bec791e4c2d64fb8aca9e26cdf60f25 (diff)
downloadmu-b41aed4a9adda23ca2613a24fefa3eafbd611987.tar.gz
.
-rw-r--r--linux/labels_baremetal.subx16
-rw-r--r--linux/survey_baremetal.subx12
2 files changed, 12 insertions, 16 deletions
diff --git a/linux/labels_baremetal.subx b/linux/labels_baremetal.subx
index a4ea991d..e1743c0b 100644
--- a/linux/labels_baremetal.subx
+++ b/linux/labels_baremetal.subx
@@ -1,16 +1,14 @@
-# Assign addresses (co-ordinates) to instructions (landmarks) in a program
-# (landscape).
-# Read a list of addresses and labels from a file called 'labels',
-# then replace labels in stdin with their addresses.
+# Read a list of labels and their addresses from a file called 'labels', then
+# replace labels in stdin with their addresses.
 #
 # To build:
 #   $ bootstrap/bootstrap translate [01]*.subx subx-params.subx labels_baremetal.subx  -o labels_baremetal
 #
 # Stdin should be a stream of bytes and some interspersed labels. Comments and
-# '==' segment headers are allowed, but names are ignored. The emitted code
-# will all lie in a single contiguous address range starting at address 0x7c00.
-# Addresses in segment headers are optional. If provided, this program will
-# insert padding in the output until the desired address is reached.
+# '==' segment headers are allowed, but segment names are ignored. The emitted
+# code will all lie in a single contiguous address range starting at address
+# 0x7c00. Addresses in segment headers are optional. If provided, this program
+# will insert padding in the output until the desired address is reached.
 #
 #   $ cat x
 #   == code
@@ -26,7 +24,7 @@
 # The output is the stream of bytes without segment headers or label definitions,
 # and with label references replaced with numeric values/displacements.
 #
-#   $ cat x  |bootstrap/bootstrap run survey_baremetal labels
+#   $ cat x  |bootstrap/bootstrap run labels_baremetal labels
 #   # 0x7c00
 #   aa bb nn  # some computed address
 #   cc dd nn nn nn nn  # some computed displacement
diff --git a/linux/survey_baremetal.subx b/linux/survey_baremetal.subx
index 5a8f46af..40115cd8 100644
--- a/linux/survey_baremetal.subx
+++ b/linux/survey_baremetal.subx
@@ -1,15 +1,13 @@
-# Assign addresses (co-ordinates) to instructions (landmarks) in a program
-# (landscape).
+# Assign addresses (co-ordinates) to labels (landmarks) in a program
+# (landscape) on stdin.
 #
 # To build:
 #   $ bootstrap/bootstrap translate [01]*.subx subx-params.subx survey_baremetal.subx  -o survey_baremetal
 #
 # The expected input is a stream of bytes and some interspersed labels.
-# Comments and '==' segment headers are allowed, but names are ignored. The
-# emitted code will all lie in a single contiguous address range starting at
-# address 0x7c00. Addresses in segment headers are optional. If provided, this
-# program will insert padding in the output until the desired address is
-# reached.
+# Comments and '==' segment headers are allowed, but segment names are ignored.
+# Mappings between labels and addresses are emitted to stdout, assuming the
+# program starts at address 0x7c00. Addresses in segment headers are optional.
 #
 #   $ cat x
 #   == code