Say "boot image" where that is what is meant

"Binary" was doing three jobs. It meant an SPBT file that the machine starts
from; it meant whatever the assembler happened to produce, which is now
either that or a loadable program; and it meant a compiled host tool. A word
that means three things means none of them, and the first of the three has a
name already - this project has been calling them boot images for a while
and the manuals had not caught up.

  Where it means an SPBT file       -> boot image
  Where it means either output      -> output
  Where it means a host executable  -> left alone
  Where it means base two           -> left alone

The user facing messages move with it:

  Error: No boot image specified.
  Usage: ./SplitBit [OPTIONS] <boot image>
  Error: This is not a SplitBit boot image.
  Error: This boot image is in format version 2, and this emulator reads 1.
  Successfully wrote SplitBit boot image to "hello.bin".

The assembler's own help was the interesting case. Its -o writes either
format, so "the binary" there was never right - it is "the output" now, and
the message that names the format is the one that says which it wrote.

No recorded output contained the word, so nothing needed re-blessing.
Checked before starting rather than after.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01E2JrLzFvuFX9fgi1LDRjrW

Source/Emulator/bootstrap.c

@@ -4,7 +4,7 @@
 // 10/16/2024
 
 #include "bootstrap.h"
-#include "../Assembler/assembly.h" // For the binary format, which both tools share.
+#include "../Assembler/assembly.h" // For the boot image format, which both tools share.
 #include <stdio.h>
 #include <string.h>
 
@@ -39,14 +39,14 @@ static uint8_t readMarker(FILE *file, const char *expected, int length, char *fo
     return strncmp(found, expected, length) != 0;
 }
 
-// Reads the file header: the magic, the format version, and the features the binary
+// Reads the file header: the magic, the format version, and the features the boot image
 // says it needs from the machine.
 static uint8_t readFileHeader(FILE *file) {
     char magic[SPLITBIT_MAGIC_LENGTH + 1];
     if (readMarker(file, SPLITBIT_MAGIC, SPLITBIT_MAGIC_LENGTH, magic)) {
-        fprintf(stderr, "Error: This is not a SplitBit binary.\n");
+        fprintf(stderr, "Error: This is not a SplitBit boot image.\n");
         if (strncmp(magic, "PRG", 3) == 0) {
-            fprintf(stderr, " It looks like a binary from before the format carried a version.\n Reassemble it and try again.\n");
+            fprintf(stderr, " It looks like a boot image from before the format carried a version.\n Reassemble it and try again.\n");
         } else {
             fprintf(stderr, " Expected the file to begin with \"%s\", found \"%s\".\n", SPLITBIT_MAGIC, magic);
         }
@@ -58,7 +58,7 @@ static uint8_t readFileHeader(FILE *file) {
         return 1;
     }
     if (version != SPLITBIT_FORMAT_VERSION) {
-        fprintf(stderr, "Error: This binary is in format version %u, and this emulator reads version %u.\n", version, SPLITBIT_FORMAT_VERSION);
+        fprintf(stderr, "Error: This boot image is in format version %u, and this emulator reads version %u.\n", version, SPLITBIT_FORMAT_VERSION);
         return 1;
     }
 
@@ -68,7 +68,7 @@ static uint8_t readFileHeader(FILE *file) {
     }
     uint32_t missing = required & ~(uint32_t)SPLITBIT_FEATURES_SUPPORTED;
     if (missing) {
-        fprintf(stderr, "Error: This binary was built for a machine this emulator cannot provide.\n");
+        fprintf(stderr, "Error: This boot image was built for a machine this emulator cannot provide.\n");
         fprintf(stderr, " It asks for feature bits 0x%08X, which are not implemented here.\n", missing);
         return 1;
     }
@@ -135,7 +135,7 @@ static uint8_t readVectorSegment(FILE *file, uint8_t *Program) {
             return 1;
         }
         if (slot < SOFTWARE_VECTOR_BASE) {
-            fprintf(stderr, "Error: This binary puts a vector at 0x%04X, which is below the vector table.\n", slot);
+            fprintf(stderr, "Error: This boot image puts a vector at 0x%04X, which is below the vector table.\n", slot);
             return 1;
         }
         Program[slot] = (handler >> 8) & 0xFF;

Source/Emulator/cpu.c

@@ -10,7 +10,7 @@
 uint16_t shiftRegister;
 
 // Reads one entry out of a vector table. Most significant byte first, matching the
-// branch instructions and the binary format.
+// branch instructions and both file formats.
 static uint16_t readVector(const uint8_t *programMemory, uint16_t base, uint8_t index) {
     uint16_t address = base + (uint16_t)index * VECTOR_ENTRY_BYTES;
     return ((uint16_t)programMemory[address] << 8) | (uint16_t)programMemory[address + 1];

Source/Emulator/emulator.c

@@ -79,7 +79,7 @@ int main (int argc, char *argv[]) {
         programFile = argv[optind];
         optind++;
     } else {
-        fprintf(stderr, "Error: No binary file specified.\n");
+        fprintf(stderr, "Error: No boot image specified.\n");
         printHelp(argv[0]);
         return 1;
     }

Source/Emulator/utility.c

@@ -11,7 +11,7 @@
 #include "../Assembler/assembly.h"
 
 void printHelp(const char *programName) {
-    printf("Usage: %s [OPTIONS] <binaryfile>\n", programName);
+    printf("Usage: %s [OPTIONS] <boot image>\n", programName);
     printf("\n");
     printf("Options:\n");
     printf("  -d, --debug       Enable debug mode.\n");