5790

Standardize conventions for labels within objects in the data segment. We're going to use this in a new tool.
author: Kartik Agaram <vc@akkartik.com> 2019-12-05 22:57:51 -0800
committer: Kartik Agaram <vc@akkartik.com> 2019-12-05 22:57:51 -0800
commit: 686a52bd2ef94fb6a2f255e59b17d9e71f719918 (patch)
tree: 5ff66558e54a98b5738ea4b7111137f508a06bf5
parent: 714d6e15ba096e47253905eb63bf4066f72cf46f (diff)
download: mu-686a52bd2ef94fb6a2f255e59b17d9e71f719918.tar.gz
25 files changed, 386 insertions, 386 deletions
diff --git a/053new-segment.subx b/053new-segment.subx
index 51f321fd..719413ab 100644
--- a/053new-segment.subx
+++ b/053new-segment.subx
@@ -47,7 +47,7 @@ new-segment:  # len : int, ad : (address allocation-descriptor)
     53/push-ebx
     # copy len to _mmap-new-segment->len
     8b/copy                         1/mod/*+disp8   5/rm32/ebp    .           .             .           0/r32/eax   8/disp8         .                 # copy *(ebp+8) to eax
-    89/copy                         0/mod/indirect  5/rm32/.disp32            .             .           0/r32/eax   _mmap-new-segment:len/disp32      # copy eax to *_mmap-new-segment:len
+    89/copy                         0/mod/indirect  5/rm32/.disp32            .             .           0/r32/eax   $_mmap-new-segment:len/disp32     # copy eax to *$_mmap-new-segment:len
     # mmap(_mmap-new-segment)
     bb/copy-to-ebx  _mmap-new-segment/imm32
     b8/copy-to-eax  0x5a/imm32/mmap
@@ -75,7 +75,7 @@ $new-segment:end:
 _mmap-new-segment:  # type mmap_arg_struct
     # addr
     0/imm32
-_mmap-new-segment:len:
+$_mmap-new-segment:len:
     # len
     0/imm32
     # protection flags
diff --git a/061read-byte.subx b/061read-byte.subx
index 7ba6dc6b..4806a9f5 100644
--- a/061read-byte.subx
+++ b/061read-byte.subx
@@ -14,7 +14,7 @@
 Stdin:
     # file descriptor or (address stream)
     0/imm32  # standard input
-Stdin->buffer:
+$Stdin->buffer:
     # inlined fields for a stream
     #   current write index
     0/imm32
@@ -102,7 +102,7 @@ test-read-byte-buffered-single:
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # . clear-stream(_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -144,9 +144,9 @@ test-read-byte-buffered-multiple:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -195,9 +195,9 @@ test-read-byte-buffered-end-of-file:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -231,9 +231,9 @@ test-read-byte-buffered-refills-buffer:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -275,7 +275,7 @@ test-read-byte-buffered-refills-buffer:
 _test-buffered-file:
     # file descriptor or (address stream)
     _test-stream/imm32
-_test-buffered-file->buffer:
+$_test-buffered-file->buffer:
     # current write index
     0/imm32
     # current read index
@@ -314,7 +314,7 @@ _test-input-stream:
 _test-input-buffered-file:
     # file descriptor or (address stream)
     _test-input-stream/imm32
-_test-input-buffered-file->buffer:
+$_test-input-buffered-file->buffer:
     # current write index
     0/imm32
     # current read index
diff --git a/064write-byte.subx b/064write-byte.subx
index 3b96bbd6..ec849c6d 100644
--- a/064write-byte.subx
+++ b/064write-byte.subx
@@ -10,7 +10,7 @@
 Stdout:
     # file descriptor or (address stream)
     1/imm32  # standard output
-Stdout->buffer:
+$Stdout->buffer:
     # inlined fields for a stream
     #   current write index
     0/imm32
@@ -115,9 +115,9 @@ test-write-byte-buffered-single:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -159,18 +159,18 @@ test-write-byte-buffered-multiple-flushes:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
     # fill up the buffer for _test-buffered-file
-    # . write(_test-buffered-file->buffer, "abcdef")
+    # . write($_test-buffered-file->buffer, "abcdef")
     # . . push args
     68/push  "abcdef"/imm32
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  write/disp32
     # . . discard args
@@ -328,7 +328,7 @@ _test-output-stream:
 _test-output-buffered-file:
     # file descriptor or (address stream)
     _test-output-stream/imm32
-_test-output-buffered-file->buffer:
+$_test-output-buffered-file->buffer:
     # current write index
     0/imm32
     # current read index
@@ -359,7 +359,7 @@ _test-error-stream:
 _test-error-buffered-file:
     # file descriptor or (address stream)
     _test-error-stream/imm32
-_test-error-buffered-file->buffer:
+$_test-error-buffered-file->buffer:
     # current write index
     0/imm32
     # current read index
diff --git a/065write-buffered.subx b/065write-buffered.subx
index 2361ea3d..bc829a51 100644
--- a/065write-buffered.subx
+++ b/065write-buffered.subx
@@ -114,9 +114,9 @@ test-write-buffered:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -158,9 +158,9 @@ test-write-buffered-with-intermediate-flush:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -209,7 +209,7 @@ test-write-buffered-with-intermediate-flush:
 Stderr:
     # file descriptor or (address stream)
     2/imm32  # standard error
-Stderr->buffer:
+$Stderr->buffer:
     # inlined fields for a stream
     #   current write index
     0/imm32
diff --git a/066print-int.subx b/066print-int.subx
index 10fb1000..cf043635 100644
--- a/066print-int.subx
+++ b/066print-int.subx
@@ -140,9 +140,9 @@ test-print-byte-buffered:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -330,9 +330,9 @@ test-print-int32-buffered:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/067parse-hex.subx b/067parse-hex.subx
index 0843c52f..b5694b8c 100644
--- a/067parse-hex.subx
+++ b/067parse-hex.subx
@@ -833,11 +833,11 @@ $from-hex-char:abort:
     e8/call  _write/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-    # . clear-stream(Stderr->buffer)
+    # . clear-stream($Stderr->buffer)
     # . . save eax
     50/push-eax
     # . . push args
-    68/push  Stderr->buffer/imm32
+    68/push  $Stderr->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/071read-line.subx b/071read-line.subx
index c729d364..6fe8deb7 100644
--- a/071read-line.subx
+++ b/071read-line.subx
@@ -118,9 +118,9 @@ test-read-line-buffered:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -170,9 +170,9 @@ test-read-line-buffered-reads-final-line-until-Eof:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/072slice.subx b/072slice.subx
index 89948be9..6ecdc003 100644
--- a/072slice.subx
+++ b/072slice.subx
@@ -964,9 +964,9 @@ test-write-slice-buffered:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/074write-stream-data.subx b/074write-stream-data.subx
index dfce0b17..25a8f87c 100644
--- a/074write-stream-data.subx
+++ b/074write-stream-data.subx
@@ -60,9 +60,9 @@ test-write-stream-data:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/078emit-hex.subx b/078emit-hex.subx
index 79a599db..2c642481 100644
--- a/078emit-hex.subx
+++ b/078emit-hex.subx
@@ -69,9 +69,9 @@ test-emit-hex-single-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -115,9 +115,9 @@ test-emit-hex-multiple-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -159,9 +159,9 @@ test-emit-hex-zero-pad:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -203,9 +203,9 @@ test-emit-hex-negative:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/079emit.subx b/079emit.subx
index 117d8d57..61ed425e 100644
--- a/079emit.subx
+++ b/079emit.subx
@@ -107,9 +107,9 @@ test-emit-number:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -166,9 +166,9 @@ test-emit-negative-number:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -224,9 +224,9 @@ test-emit-number-with-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -283,9 +283,9 @@ test-emit-non-number:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -341,9 +341,9 @@ test-emit-non-number-with-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -399,9 +399,9 @@ test-emit-non-number-with-all-hex-digits-and-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/081table.subx b/081table.subx
index 161fbde8..83cd9102 100644
--- a/081table.subx
+++ b/081table.subx
@@ -1043,9 +1043,9 @@ test-get-or-stop:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1259,9 +1259,9 @@ test-get-slice-or-stop:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/082slurp.subx b/082slurp.subx
index 0874f1d8..a00f252b 100644
--- a/082slurp.subx
+++ b/082slurp.subx
@@ -113,9 +113,9 @@ test-slurp:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/084emit-hex-array.subx b/084emit-hex-array.subx
index edc509df..e284b2c8 100644
--- a/084emit-hex-array.subx
+++ b/084emit-hex-array.subx
@@ -64,9 +64,9 @@ test-emit-hex-array:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/assort.subx b/apps/assort.subx
index c3a98a87..123ad64e 100644
--- a/apps/assort.subx
+++ b/apps/assort.subx
@@ -168,9 +168,9 @@ test-subx-assort:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -182,9 +182,9 @@ test-subx-assort:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -624,9 +624,9 @@ $read-segments:check-for-segment-header:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -684,9 +684,9 @@ $read-segments:check-for-segment-header:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
diff --git a/apps/braces.subx b/apps/braces.subx
index abdcdfbe..27810a86 100644
--- a/apps/braces.subx
+++ b/apps/braces.subx
@@ -263,8 +263,8 @@ test-subx-braces-passes-most-words-through:
     # setup
     (clear-stream _test-input-stream)
     (clear-stream _test-output-stream)
-    (clear-stream _test-input-buffered-file->buffer)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # test
     (write _test-input-stream "== abcd 0x1")
     (subx-braces _test-input-buffered-file _test-output-buffered-file)
@@ -300,8 +300,8 @@ test-subx-braces-1:
     # setup
     (clear-stream _test-input-stream)
     (clear-stream _test-output-stream)
-    (clear-stream _test-input-buffered-file->buffer)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # test
     (write _test-input-stream "{\nab break/imm32\ncd loop/imm32\n}")
     (subx-braces _test-input-buffered-file _test-output-buffered-file)
@@ -341,8 +341,8 @@ test-subx-braces-2:
     # setup
     (clear-stream _test-input-stream)
     (clear-stream _test-output-stream)
-    (clear-stream _test-input-buffered-file->buffer)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # test
     (write _test-input-stream "{\n{\nab break/imm32\n}\ncd loop/imm32\n}")
     (subx-braces _test-input-buffered-file _test-output-buffered-file)
diff --git a/apps/calls.subx b/apps/calls.subx
index f6de6c7f..28e2ff63 100644
--- a/apps/calls.subx
+++ b/apps/calls.subx
@@ -280,9 +280,9 @@ $parse-line:check1:
 #?     e8/call write/disp32
 #?     # . . discard args
 #?     81 0/subop/add %esp 8/imm32
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call clear-stream/disp32
 #?     # . . discard args
@@ -551,9 +551,9 @@ test-subx-calls-passes-most-lines-through:
     e8/call clear-stream/disp32
     # . . discard args
     81 0/subop/add %esp 4/imm32
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call clear-stream/disp32
     # . . discard args
@@ -565,9 +565,9 @@ test-subx-calls-passes-most-lines-through:
     e8/call clear-stream/disp32
     # . . discard args
     81 0/subop/add %esp 4/imm32
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call clear-stream/disp32
     # . . discard args
@@ -622,9 +622,9 @@ test-subx-calls-processes-calls:
     e8/call clear-stream/disp32
     # . . discard args
     81 0/subop/add %esp 4/imm32
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call clear-stream/disp32
     # . . discard args
@@ -636,9 +636,9 @@ test-subx-calls-processes-calls:
     e8/call clear-stream/disp32
     # . . discard args
     81 0/subop/add %esp 4/imm32
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call clear-stream/disp32
     # . . discard args
diff --git a/apps/crenshaw2-1.subx b/apps/crenshaw2-1.subx
index 4c1daa3a..2217e430 100644
--- a/apps/crenshaw2-1.subx
+++ b/apps/crenshaw2-1.subx
@@ -306,9 +306,9 @@ test-get-num-reads-single-digit:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -395,9 +395,9 @@ test-get-num-aborts-on-non-digit-in-Look:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/crenshaw2-1b.subx b/apps/crenshaw2-1b.subx
index b47b8409..58467aa9 100644
--- a/apps/crenshaw2-1b.subx
+++ b/apps/crenshaw2-1b.subx
@@ -324,9 +324,9 @@ test-get-num-reads-single-digit:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -413,9 +413,9 @@ test-get-num-aborts-on-non-digit-in-Look:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -496,9 +496,9 @@ test-get-num-reads-multiple-digits:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -585,9 +585,9 @@ test-get-num-reads-multiple-digits-followed-by-nondigit:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/dquotes.subx b/apps/dquotes.subx
index 8220f582..5186eda6 100644
--- a/apps/dquotes.subx
+++ b/apps/dquotes.subx
@@ -404,9 +404,9 @@ test-subx-dquotes-is-idempotent-by-default:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -418,9 +418,9 @@ test-subx-dquotes-is-idempotent-by-default:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -657,9 +657,9 @@ test-subx-dquotes-processes-string-literals:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -671,9 +671,9 @@ test-subx-dquotes-processes-string-literals:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1482,9 +1482,9 @@ test-emit-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1539,9 +1539,9 @@ test-emit-metadata-none:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1596,9 +1596,9 @@ test-emit-metadata-multiple:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1653,9 +1653,9 @@ test-emit-metadata-when-no-datum:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1712,9 +1712,9 @@ test-emit-metadata-in-string-literal:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/hex.subx b/apps/hex.subx
index 95947899..80469961 100644
--- a/apps/hex.subx
+++ b/apps/hex.subx
@@ -216,9 +216,9 @@ test-convert-next-octet:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -230,9 +230,9 @@ test-convert-next-octet:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -314,9 +314,9 @@ test-convert-next-octet-handles-Eof:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -328,9 +328,9 @@ test-convert-next-octet-handles-Eof:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -404,9 +404,9 @@ test-convert-next-octet-aborts-on-single-hex-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -418,9 +418,9 @@ test-convert-next-octet-aborts-on-single-hex-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -573,9 +573,9 @@ test-scan-next-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -587,9 +587,9 @@ test-scan-next-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -671,9 +671,9 @@ test-scan-next-byte-skips-whitespace:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -685,9 +685,9 @@ test-scan-next-byte-skips-whitespace:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -769,9 +769,9 @@ test-scan-next-byte-skips-comment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -783,9 +783,9 @@ test-scan-next-byte-skips-comment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -875,9 +875,9 @@ test-scan-next-byte-skips-comment-and-whitespace:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -889,9 +889,9 @@ test-scan-next-byte-skips-comment-and-whitespace:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -981,7 +981,7 @@ test-scan-next-byte-skips-whitespace-and-comment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
     b8/copy-to-eax  _test-buffered-file/imm32
     05/add-to-eax  4/imm32
@@ -997,9 +997,9 @@ test-scan-next-byte-skips-whitespace-and-comment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1089,9 +1089,9 @@ test-scan-next-byte-reads-final-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1103,9 +1103,9 @@ test-scan-next-byte-reads-final-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1187,9 +1187,9 @@ test-scan-next-byte-handles-Eof:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1201,9 +1201,9 @@ test-scan-next-byte-handles-Eof:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1277,9 +1277,9 @@ test-scan-next-byte-aborts-on-invalid-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1291,9 +1291,9 @@ test-scan-next-byte-aborts-on-invalid-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-error-buffered-file->buffer)
+    # . clear-stream($_test-error-buffered-file->buffer)
     # . . push args
-    68/push  _test-error-buffered-file->buffer/imm32
+    68/push  $_test-error-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1395,9 +1395,9 @@ test-skip-until-newline:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-buffered-file->buffer)
+    # . clear-stream($_test-buffered-file->buffer)
     # . . push args
-    68/push  _test-buffered-file->buffer/imm32
+    68/push  $_test-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/mu.subx b/apps/mu.subx
index 6e092331..50139ab9 100644
--- a/apps/mu.subx
+++ b/apps/mu.subx
@@ -382,9 +382,9 @@ test-convert-empty-input:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (convert-mu _test-input-buffered-file _test-output-buffered-file)
     (flush _test-output-buffered-file)
@@ -412,9 +412,9 @@ test-convert-function-skeleton:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo {\n")
     (write _test-input-stream "}\n")
@@ -469,9 +469,9 @@ test-convert-multiple-function-skeletons:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo {\n")
     (write _test-input-stream "}\n")
@@ -527,9 +527,9 @@ test-convert-function-with-arg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo n : int {\n")
     (write _test-input-stream "}\n")
@@ -578,9 +578,9 @@ test-convert-function-with-arg-and-body:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-input-stream)
-    (clear-stream _test-input-buffered-file->buffer)
+    (clear-stream $_test-input-buffered-file->buffer)
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     #
     (write _test-input-stream "fn foo n : int {\n")
     (write _test-input-stream "  increment n\n")
@@ -3148,7 +3148,7 @@ test-emit-subx-statement-primitive:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var
     68/push 0/imm32/no-register
     68/push -8/imm32/stack-offset
@@ -3221,7 +3221,7 @@ test-emit-subx-statement-primitive-register:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3308,7 +3308,7 @@ test-emit-subx-statement-select-primitive:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3405,7 +3405,7 @@ test-emit-subx-statement-select-primitive-2:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3496,7 +3496,7 @@ test-increment-register:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3556,7 +3556,7 @@ test-increment-var:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3606,7 +3606,7 @@ test-add-reg-to-reg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3662,7 +3662,7 @@ test-add-reg-to-mem:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var
     68/push 0/imm32/no-register
     68/push 8/imm32/stack-offset
@@ -3718,7 +3718,7 @@ test-add-mem-to-reg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3774,7 +3774,7 @@ test-add-literal-to-reg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var in eax
     68/push "eax"/imm32/register
     68/push 0/imm32/no-stack-offset
@@ -3830,7 +3830,7 @@ test-add-literal-to-mem:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-var1/ecx : var
     68/push 0/imm32/no-register
     68/push 8/imm32/stack-offset
@@ -3901,7 +3901,7 @@ test-emit-subx-statement-function-call:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : var
     68/push 0/imm32/no-register
     68/push -8/imm32/stack-offset
@@ -3960,7 +3960,7 @@ test-emit-subx-statement-function-call-with-literal-arg:
     89/<- %ebp 4/r32/esp
     # setup
     (clear-stream _test-output-stream)
-    (clear-stream _test-output-buffered-file->buffer)
+    (clear-stream $_test-output-buffered-file->buffer)
     # var-foo/ecx : literal
     68/push 0/imm32/no-register
     68/push 0/imm32/no-stack-offset
diff --git a/apps/pack.subx b/apps/pack.subx
index 26a47cc1..6079a896 100644
--- a/apps/pack.subx
+++ b/apps/pack.subx
@@ -216,9 +216,9 @@ $subx-pack:check2:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -276,9 +276,9 @@ $subx-pack:check2:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -398,9 +398,9 @@ test-subx-pack-passes-empty-lines-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -412,9 +412,9 @@ test-subx-pack-passes-empty-lines-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -463,9 +463,9 @@ test-subx-pack-passes-lines-with-just-whitespace-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -477,9 +477,9 @@ test-subx-pack-passes-lines-with-just-whitespace-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -536,9 +536,9 @@ test-subx-pack-passes-segment-headers-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -550,9 +550,9 @@ test-subx-pack-passes-segment-headers-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -609,9 +609,9 @@ test-subx-pack-in-data-segment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -623,9 +623,9 @@ test-subx-pack-in-data-segment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -745,9 +745,9 @@ test-subx-pack-code-and-data-segments:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -759,9 +759,9 @@ test-subx-pack-code-and-data-segments:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -984,9 +984,9 @@ $convert-data:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -1145,9 +1145,9 @@ test-convert-data-passes-comments-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1237,9 +1237,9 @@ test-convert-data-passes-labels-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1304,9 +1304,9 @@ test-convert-data-passes-names-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1370,9 +1370,9 @@ test-convert-data-handles-imm32:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1437,9 +1437,9 @@ test-convert-data-handles-single-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1503,9 +1503,9 @@ test-convert-data-multiple-bytes:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1569,9 +1569,9 @@ test-convert-data-byte-then-name:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1635,9 +1635,9 @@ test-convert-data-multiple-words:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1727,9 +1727,9 @@ test-convert-data-trailing-comment:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -2355,9 +2355,9 @@ $emit-modrm:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -2664,9 +2664,9 @@ $emit-sib:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -2927,9 +2927,9 @@ $emit-disp:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -3146,9 +3146,9 @@ $emit-imm:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -3331,9 +3331,9 @@ test-convert-instruction-passes-comments-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3397,9 +3397,9 @@ test-convert-instruction-passes-labels-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3463,9 +3463,9 @@ test-convert-instruction-handles-single-opcode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3555,9 +3555,9 @@ test-convert-instruction-handles-0f-opcode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3647,9 +3647,9 @@ test-convert-instruction-handles-f2-opcode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3739,9 +3739,9 @@ test-convert-instruction-handles-f3-opcode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3831,9 +3831,9 @@ test-convert-instruction-handles-f2-0f-opcode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3923,9 +3923,9 @@ test-convert-instruction-handles-f3-0f-opcode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4015,9 +4015,9 @@ test-convert-instruction-handles-unused-opcodes:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4107,9 +4107,9 @@ test-convert-instruction-handles-unused-second-opcodes:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4199,9 +4199,9 @@ test-convert-instruction-handles-unused-second-opcodes-2:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4291,9 +4291,9 @@ test-convert-instruction-emits-modrm-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4382,9 +4382,9 @@ test-convert-instruction-emits-modrm-byte-with-non-zero-mod:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4474,9 +4474,9 @@ test-convert-instruction-emits-modrm-byte-from-subop:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4566,9 +4566,9 @@ test-convert-instruction-emits-modrm-byte-with-missing-mod:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4658,9 +4658,9 @@ test-convert-instruction-emits-modrm-byte-with-missing-rm32:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4750,9 +4750,9 @@ test-convert-instruction-emits-modrm-byte-with-missing-r32:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4842,9 +4842,9 @@ test-convert-instruction-emits-sib-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4934,9 +4934,9 @@ test-convert-instruction-emits-sib-byte-with-missing-base:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5026,9 +5026,9 @@ test-convert-instruction-emits-sib-byte-with-missing-index:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5118,9 +5118,9 @@ test-convert-instruction-emits-sib-byte-with-missing-scale:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5210,9 +5210,9 @@ test-convert-instruction-handles-disp32-operand:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5302,9 +5302,9 @@ test-convert-instruction-handles-disp16-operand:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5394,9 +5394,9 @@ test-convert-instruction-handles-disp8-operand:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5486,9 +5486,9 @@ test-convert-instruction-handles-disp8-name:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5578,9 +5578,9 @@ test-convert-instruction-handles-imm32-operand:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5671,9 +5671,9 @@ test-convert-instruction-handles-imm16-operand:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -5764,9 +5764,9 @@ test-convert-instruction-handles-imm8-operand:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/sigils.subx b/apps/sigils.subx
index be743cc3..e6aba87a 100644
--- a/apps/sigils.subx
+++ b/apps/sigils.subx
@@ -216,9 +216,9 @@ $subx-sigils:direct-mode:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -442,9 +442,9 @@ test-subx-sigils-passes-most-words-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -456,9 +456,9 @@ test-subx-sigils-passes-most-words-through:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -540,9 +540,9 @@ test-subx-sigils-direct-mode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -554,9 +554,9 @@ test-subx-sigils-direct-mode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -638,9 +638,9 @@ test-subx-sigils-direct-mode-with-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -652,9 +652,9 @@ test-subx-sigils-direct-mode-with-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -710,9 +710,9 @@ test-subx-sigils-register-indirect-mode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -724,9 +724,9 @@ test-subx-sigils-register-indirect-mode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -808,9 +808,9 @@ test-subx-sigils-register-indirect-mode-with-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -822,9 +822,9 @@ test-subx-sigils-register-indirect-mode-with-metadata:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -880,9 +880,9 @@ test-subx-sigils-register-indirect-mode-without-displacement:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -894,9 +894,9 @@ test-subx-sigils-register-indirect-mode-without-displacement:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -978,9 +978,9 @@ test-subx-sigils-register-indirect-mode-with-displacement:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -992,9 +992,9 @@ test-subx-sigils-register-indirect-mode-with-displacement:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1077,9 +1077,9 @@ test-subx-sigils-register-indirect-mode-with-sib-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1091,9 +1091,9 @@ test-subx-sigils-register-indirect-mode-with-sib-byte:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1175,9 +1175,9 @@ test-subx-sigils-register-indirect-mode-with-sib-byte-negative-displacement:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1189,9 +1189,9 @@ test-subx-sigils-register-indirect-mode-with-sib-byte-negative-displacement:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1273,9 +1273,9 @@ test-subx-sigils-indirect-mode-without-register:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1287,9 +1287,9 @@ test-subx-sigils-indirect-mode-without-register:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1439,9 +1439,9 @@ test-emit-direct-mode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -1522,9 +1522,9 @@ test-emit-direct-mode-2:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3331,9 +3331,9 @@ test-emit-indirect-mode:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3408,9 +3408,9 @@ test-emit-indirect-mode-2:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3485,9 +3485,9 @@ test-emit-indirect-mode-with-disp:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3562,9 +3562,9 @@ test-emit-indirect-mode-with-disp-negative:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3639,9 +3639,9 @@ test-emit-indirect-mode-with-sib:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3716,9 +3716,9 @@ test-emit-indirect-mode-ebp:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3793,9 +3793,9 @@ test-emit-indirect-mode-esp:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -4100,11 +4100,11 @@ $next-hex-int:abort:
     e8/call  _write/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-    # . clear-stream(Stderr->buffer)
+    # . clear-stream($Stderr->buffer)
     # . . save eax
     50/push-eax
     # . . push args
-    68/push  Stderr->buffer/imm32
+    68/push  $Stderr->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
diff --git a/apps/survey.subx b/apps/survey.subx
index fcb70d8d..701e4abe 100644
--- a/apps/survey.subx
+++ b/apps/survey.subx
@@ -166,9 +166,9 @@ subx-survey:  # infile : (address buffered-file), out : (address buffered-file)
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -224,9 +224,9 @@ subx-survey:  # infile : (address buffered-file), out : (address buffered-file)
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -374,9 +374,9 @@ subx-survey:  # infile : (address buffered-file), out : (address buffered-file)
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -460,9 +460,9 @@ test-subx-survey-computes-addresses:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-input-buffered-file->buffer)
+    # . clear-stream($_test-input-buffered-file->buffer)
     # . . push args
-    68/push  _test-input-buffered-file->buffer/imm32
+    68/push  $_test-input-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -474,9 +474,9 @@ test-subx-survey-computes-addresses:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -761,9 +761,9 @@ $compute-offsets:word-loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -912,9 +912,9 @@ $compute-offsets:construct-next-segment:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -1093,9 +1093,9 @@ $compute-offsets:case-default:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -2570,9 +2570,9 @@ test-emit-segments-global-variable:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -2807,9 +2807,9 @@ test-emit-segments-code-label:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3009,9 +3009,9 @@ test-emit-segments-code-label-absolute:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               4/imm32           # add to esp
-    # . clear-stream(_test-output-buffered-file->buffer)
+    # . clear-stream($_test-output-buffered-file->buffer)
     # . . push args
-    68/push  _test-output-buffered-file->buffer/imm32
+    68/push  $_test-output-buffered-file->buffer/imm32
     # . . call
     e8/call  clear-stream/disp32
     # . . discard args
@@ -3228,9 +3228,9 @@ $emit-headers:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
@@ -4205,9 +4205,9 @@ $num-bytes:loop:
 #?     e8/call  write/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/esp    .           .             .           .           .               8/imm32           # add to esp
-#?     # . clear-stream(Stderr->buffer)
+#?     # . clear-stream($Stderr->buffer)
 #?     # . . push args
-#?     68/push  Stderr->buffer/imm32
+#?     68/push  $Stderr->buffer/imm32
 #?     # . . call
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
author	Kartik Agaram <vc@akkartik.com>	2019-12-05 22:57:51 -0800
committer	Kartik Agaram <vc@akkartik.com>	2019-12-05 22:57:51 -0800
commit	686a52bd2ef94fb6a2f255e59b17d9e71f719918 (patch)
tree	5ff66558e54a98b5738ea4b7111137f508a06bf5
parent	714d6e15ba096e47253905eb63bf4066f72cf46f (diff)
download	mu-686a52bd2ef94fb6a2f255e59b17d9e71f719918.tar.gz