5790

Standardize conventions for labels within objects in the data segment.

We're going to use this in a new tool.

1 files changed, 62 insertions, 62 deletions

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