M2: the native assembler builds applications
> load Asm.sbx
> run Say.asm
wrote Say.sbx: program 46, data 93, labels 7
> load Say.sbx
> run built by the machine itself
it says: built by the machine itself
The machine assembles an application and then runs what it built. Say,
greet and Files all come out byte for byte identical to the C assembler's,
and Tests/native.sh checks all three on every run alongside the boot image
M1 already covered.
WHAT IT TOOK, and it was more than #Include and #Base:
#Include The reader is a stack of readers. The current file's whole
state goes aside - buffer and all, 292 bytes - the new one
opens, and the end of it pops the old one back. A file goes in
once; including it twice does nothing, which is what lets two
libraries depend on a third. The list is forgotten between the
passes, because the second has to walk the same tree.
#Base Cursors start there, so labels hold the addresses the program
will really have. A program that says where it goes gets the
SBEX header and a .sbx name; one that says nothing gets SPBT
and .bin. A program that bases one segment and leaves the
other unbased with content in it is refused.
#Reserve Runs of zeroes, moved over in the first pass and written in
#Align the second. How many an #Align comes to depends on where the
cursor has reached, which is why both passes keep a cursor.
#Vectors Names are read and numbered, pinned where the source pins
them, so SWI osPrintString resolves. Every application needs
this - a program that calls a service names a vector declared
in a file it includes.
THE TWO PASSES ARE NOW ONE LOOP, walked twice, with Emitting the only
difference. They have to agree about the length of every token, and the way
they stop agreeing is by being two pieces of code that drifted apart -
which is the exact shape of the bug this assembler found in the C one.
Sharing the body means there is nothing to drift. What is left is checked
anyway: the second pass compares its own totals against the first's and
refuses to write the file if they differ.
THE BUG WORTH RECORDING. The tokenizer holds one character of lookahead,
and at an #Include that character belongs to the file being put aside. It
was carried across and handed back on the way out, which is wrong: a file
runs out in the middle of whatever the tokenizer happens to be doing, so
the character arrives in the middle of a word. `start:` came back as `s`
and then `tart:` - and the result assembled into a perfectly plausible
file. The fix is to undo the read instead, so the character is simply still
there when the file is opened again and the question of when to hand it
back never arises.
Three smaller ones, all old friends: three places took the CONTENTS of a
buffer where they wanted its ADDRESS; vecTakeAuto returned its answer in A,
which a RET puts back; and pass two re-declared every vector because only
the label table was being skipped on the second walk.
sameText moved down into numbers.asm from the label table - four parts want
it now, and a reader test that includes neither labels nor tokens has to
build on its own.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01E2JrLzFvuFX9fgi1LDRjrW
This commit is contained in:
co-authored by
Claude Opus 5
parent
affe9d09ea
commit
c5e4ec3455
+36
-3
@@ -10,6 +10,10 @@
|
||||
# Then it runs what the machine built, because a file that matches and does not work would
|
||||
# mean both assemblers were wrong together.
|
||||
#
|
||||
# It checks a boot image and three loadable programs. The loadable ones are the harder case
|
||||
# and the interesting one: they include another file, they are based somewhere other than
|
||||
# zero, and every service they call is a name declared in that included file.
|
||||
#
|
||||
# Written by Anachronaut
|
||||
|
||||
set -u
|
||||
@@ -55,8 +59,21 @@ mkdir -p "$WORK"
|
||||
"$TOOL" put "$WORK/native.img" "$ROOT/Programs/hello.asm" hello.asm >/dev/null
|
||||
"$TOOL" put "$WORK/native.img" "$WORK/Asm.sbx" Asm.sbx >/dev/null
|
||||
|
||||
printf 'load Asm.sbx\nrun hello.asm\nexit\n' \
|
||||
| "$EMU" --fast --cycles 50000000 -D "$WORK/native.img" "$WORK/cosmos.bin" \
|
||||
# The applications, and the file of service names they all include. These are the reason
|
||||
# the second milestone exists: an assembler that cannot follow an #Include cannot build
|
||||
# anything that asks the system for anything.
|
||||
APPS="Say greet Files"
|
||||
"$TOOL" put "$WORK/native.img" "$ROOT/Programs/CosmOS/Source/services.asm" services.asm >/dev/null
|
||||
for app in $APPS; do
|
||||
"$TOOL" put "$WORK/native.img" "$ROOT/Programs/CosmOS/Apps/$app.asm" "$app.asm" >/dev/null
|
||||
done
|
||||
|
||||
{
|
||||
echo "load Asm.sbx"
|
||||
echo "run hello.asm"
|
||||
for app in $APPS; do echo "run $app.asm"; done
|
||||
echo "exit"
|
||||
} | "$EMU" --fast --cycles 600000000 -D "$WORK/native.img" "$WORK/cosmos.bin" \
|
||||
> "$WORK/session.txt" 2>&1
|
||||
|
||||
# ---- It got as far as writing something ----
|
||||
@@ -75,9 +92,25 @@ check "byte for byte" cmp -s "$WORK/native.bin" "$WORK/reference.bin"
|
||||
check "and it runs" grep -q "^Hello, World!$" "$WORK/ran.txt"
|
||||
|
||||
# ---- The report it printed says what it did ----
|
||||
REPORT="$(grep -o 'program [0-9]*, data [0-9]*, labels [0-9]*' "$WORK/session.txt" || true)"
|
||||
REPORT="$(grep -o 'program [0-9]*, data [0-9]*, labels [0-9]*' "$WORK/session.txt" | head -1 || true)"
|
||||
check "it counted right" grep -q "program 17, data 14, labels 2" "$WORK/session.txt"
|
||||
|
||||
# ---- And the applications, which need an include, a base and the service names ----
|
||||
#
|
||||
# A loadable program is the harder case and the one that matters: #Include splices another
|
||||
# file in, #Base moves every label to where the program will really live, and every SWI in
|
||||
# them names a vector declared in a file the source never mentions by number.
|
||||
for app in $APPS; do
|
||||
"$ASM" -I "$ROOT/Programs/CosmOS/Source" -o "$WORK/ref-$app.sbx" \
|
||||
"$ROOT/Programs/CosmOS/Apps/$app.asm" >/dev/null
|
||||
rm -f "$WORK/got-$app.sbx"
|
||||
"$TOOL" get "$WORK/native.img" "$app.sbx" "$WORK/got-$app.sbx" >/dev/null 2>&1
|
||||
if [ -f "$WORK/got-$app.sbx" ]; then
|
||||
REPORT="$(wc -c < "$WORK/got-$app.sbx" | tr -d ' ') bytes"
|
||||
fi
|
||||
check "$app byte for byte" cmp -s "$WORK/got-$app.sbx" "$WORK/ref-$app.sbx"
|
||||
done
|
||||
|
||||
echo
|
||||
if [ "$FAIL" -eq 0 ]; then
|
||||
echo "All $PASS native assembler checks passed."
|
||||
|
||||
Reference in New Issue
Block a user