about summary refs log tree commit diff stats
path: root/apps/pack.subx
diff options
context:
space:
mode:
Diffstat (limited to 'apps/pack.subx')
-rw-r--r--apps/pack.subx216
1 files changed, 108 insertions, 108 deletions
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