about summary refs log tree commit diff stats
path: root/subx/apps
diff options
context:
space:
mode:
Diffstat (limited to 'subx/apps')
-rwxr-xr-xsubx/apps/assortbin21302 -> 21401 bytes
-rw-r--r--subx/apps/assort.subx14
-rwxr-xr-xsubx/apps/crenshaw2-1bin18490 -> 18589 bytes
-rw-r--r--subx/apps/crenshaw2-1.subx4
-rwxr-xr-xsubx/apps/crenshaw2-1bbin19049 -> 19148 bytes
-rw-r--r--subx/apps/crenshaw2-1b.subx7
-rw-r--r--subx/apps/dquotesbin21933 -> 22553 bytes
-rw-r--r--subx/apps/dquotes.subx12
-rwxr-xr-xsubx/apps/factorialbin17406 -> 17505 bytes
-rwxr-xr-xsubx/apps/handlebin18180 -> 18279 bytes
-rwxr-xr-xsubx/apps/hexbin21499 -> 21598 bytes
-rw-r--r--subx/apps/hex.subx18
-rwxr-xr-xsubx/apps/packbin36091 -> 36190 bytes
-rw-r--r--subx/apps/pack.subx72
-rw-r--r--subx/apps/subx-common.subx6
15 files changed, 67 insertions, 66 deletions
diff --git a/subx/apps/assort b/subx/apps/assort
index 007ddaa7..ba20910f 100755
--- a/subx/apps/assort
+++ b/subx/apps/assort
Binary files differdiff --git a/subx/apps/assort.subx b/subx/apps/assort.subx
index ecb1c213..20566806 100644
--- a/subx/apps/assort.subx
+++ b/subx/apps/assort.subx
@@ -428,7 +428,7 @@ read-segments:  # in : (address buffered-file), table : (address stream row)
     #   var line = new-stream(512, 1)
     #   while true
     #     clear-stream(line)
-    #     read-line(in, line)
+    #     read-line-buffered(in, line)
     #     if (line->write == 0) break             # end of file
     #     var word-slice = next-word(line)
     #     if slice-empty?(word-slice)             # whitespace
@@ -479,12 +479,12 @@ $read-segments:loop:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # read-line(in, line)
+    # read-line-buffered(in, line)
     # . . push args
     51/push-ECX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-line/disp32
+    e8/call  read-line-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 $read-segments:check0:
@@ -566,12 +566,12 @@ $read-segments:check-for-segment-header:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     52/push-EDX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -630,12 +630,12 @@ $read-segments:check-for-segment-header:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     52/push-EDX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
diff --git a/subx/apps/crenshaw2-1 b/subx/apps/crenshaw2-1
index 51765a39..b5614efb 100755
--- a/subx/apps/crenshaw2-1
+++ b/subx/apps/crenshaw2-1
Binary files differdiff --git a/subx/apps/crenshaw2-1.subx b/subx/apps/crenshaw2-1.subx
index 20560288..2f1fec9e 100644
--- a/subx/apps/crenshaw2-1.subx
+++ b/subx/apps/crenshaw2-1.subx
@@ -512,11 +512,11 @@ get-char:  # f : (address buffered-file) -> <void>
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
     # . save registers
     50/push-EAX
-    # read-byte(f)
+    # EAX = read-byte-buffered(f)
     # . . push args
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-byte/disp32
+    e8/call  read-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # save EAX to Look
diff --git a/subx/apps/crenshaw2-1b b/subx/apps/crenshaw2-1b
index 6f8a2228..0a7e2e13 100755
--- a/subx/apps/crenshaw2-1b
+++ b/subx/apps/crenshaw2-1b
Binary files differdiff --git a/subx/apps/crenshaw2-1b.subx b/subx/apps/crenshaw2-1b.subx
index 2c396fb3..8dee0dbc 100644
--- a/subx/apps/crenshaw2-1b.subx
+++ b/subx/apps/crenshaw2-1b.subx
@@ -195,7 +195,8 @@ get-num:  # in : (address buffered-file), out : (address stream), err : fd or (a
     #     Look = get-char(in)
     #   while is-digit?(Look)
     # This is complicated because I don't want to hard-code the error strategy in
-    # a general helper like write-byte. Maybe I should just create a local helper.
+    # a general helper like write-byte-buffered. Maybe I should just create a
+    # local helper.
     #
     # within the loop we'll try to keep things in registers:
     #   in: ESI
@@ -711,11 +712,11 @@ get-char:  # f : (address buffered-file) -> <void>
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
     # . save registers
     50/push-EAX
-    # read-byte(f)
+    # EAX = read-byte-buffered(f)
     # . . push args
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-byte/disp32
+    e8/call  read-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # save EAX to Look
diff --git a/subx/apps/dquotes b/subx/apps/dquotes
index 6537abcb..83fac224 100644
--- a/subx/apps/dquotes
+++ b/subx/apps/dquotes
Binary files differdiff --git a/subx/apps/dquotes.subx b/subx/apps/dquotes.subx
index 67a215fa..749fc6aa 100644
--- a/subx/apps/dquotes.subx
+++ b/subx/apps/dquotes.subx
@@ -82,7 +82,7 @@ convert:  # in : (address buffered-file), out : (address buffered-file) -> <void
     #   write-stream(new-data-segment, "== data\n")
     #   while true
     #     clear-stream(line)
-    #     read-line(in, line)
+    #     read-line-buffered(in, line)
     #     if (line->write == 0) break               # end of file
     #     while true
     #       var word-slice = next-word(line)
@@ -93,7 +93,7 @@ convert:  # in : (address buffered-file), out : (address buffered-file) -> <void
     #       if slice-starts-with?(word-slice, '"')  # string literal <== what we're here for
     #         process-string-literal(word-slice, out, new-data-segment)
     #       else
-    #         write-slice(out, word-slice)
+    #         write-slice-buffered(out, word-slice)
     #   write-stream-data(out, new-data-segment)
     #   flush(out)
     #
@@ -145,12 +145,12 @@ $convert:line-loop:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # read-line(in, line)
+    # read-line-buffered(in, line)
     # . . push args
     51/push-ECX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-line/disp32
+    e8/call  read-line-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 $convert:check0:
@@ -204,12 +204,12 @@ $convert:string-literal:
     # continue
     eb/jump  $convert:next-word/disp8
 $convert:regular-word:
-    # write-slice(out, word-slice)
+    # write-slice-buffered(out, word-slice)
     # . . push args
     52/push-EDX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           0xc/disp8       .                 # push *(EBP+12)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # fall through
diff --git a/subx/apps/factorial b/subx/apps/factorial
index 74d03c89..dbda72ae 100755
--- a/subx/apps/factorial
+++ b/subx/apps/factorial
Binary files differdiff --git a/subx/apps/handle b/subx/apps/handle
index 17ae017d..650cdd55 100755
--- a/subx/apps/handle
+++ b/subx/apps/handle
Binary files differdiff --git a/subx/apps/hex b/subx/apps/hex
index 1d455fbd..99ac5466 100755
--- a/subx/apps/hex
+++ b/subx/apps/hex
Binary files differdiff --git a/subx/apps/hex.subx b/subx/apps/hex.subx
index c0627c77..3730351f 100644
--- a/subx/apps/hex.subx
+++ b/subx/apps/hex.subx
@@ -75,7 +75,7 @@ convert:  # in : (address buffered-file), out : (address buffered-file), err : (
     #   while true
     #     EAX = convert-next-octet(in, err, ed)
     #     if (EAX == Eof) break
-    #     write-byte(out, AL)
+    #     write-byte-buffered(out, AL)
     #   flush(out)
     #
     # . prolog
@@ -96,12 +96,12 @@ $convert:loop:
     # if (EAX == Eof) break
     3d/compare-EAX-and  0xffffffff/imm32/Eof
     74/jump-if-equal  $convert:loop-end/disp8
-    # write-byte(out, AL)
+    # write-byte-buffered(out, AL)
     # . . push args
     50/push-EAX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           0xc/disp8       .                 # push *(EBP+12)
     # . . call
-    e8/call  write-byte/disp32
+    e8/call  write-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # loop
@@ -489,7 +489,7 @@ $test-convert-next-octet-aborts-on-single-hex-byte:end:
 scan-next-byte:  # in : (address buffered-file), err : (address buffered-file), ed : (address exit-descriptor) -> byte-or-Eof/EAX
     # pseudocode:
     #   while true
-    #     EAX = read-byte(in)
+    #     EAX = read-byte-buffered(in)
     #     if (EAX == Eof) return EAX
     #     if (is-hex-digit?(EAX)) return EAX
     #     if (EAX == ' ' or '\t' or '\n') continue
@@ -501,11 +501,11 @@ scan-next-byte:  # in : (address buffered-file), err : (address buffered-file),
     89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
     # . save registers
 $scan-next-byte:loop:
-    # EAX = read-byte(in)
+    # EAX = read-byte-buffered(in)
     # . . push args
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-byte/disp32
+    e8/call  read-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # if (EAX == Eof) return EAX
@@ -1389,7 +1389,7 @@ skip-until-newline:  # in : (address buffered-file) -> <void>
     # pseudocode:
     #   push EAX
     #   while true
-    #     EAX = read-byte(in)
+    #     EAX = read-byte-buffered(in)
     #     if (EAX == Eof) break
     #     if (EAX == 0x0a) break
     #   pop EAX
@@ -1399,11 +1399,11 @@ skip-until-newline:  # in : (address buffered-file) -> <void>
     # . save registers
     50/push-EAX
 $skip-until-newline:loop:
-    # . EAX = read-byte(in)
+    # . EAX = read-byte-buffered(in)
     # . . push args
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-byte/disp32
+    e8/call  read-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
     # . if (EAX == Eof) break
diff --git a/subx/apps/pack b/subx/apps/pack
index 54c3f203..318dc3d4 100755
--- a/subx/apps/pack
+++ b/subx/apps/pack
Binary files differdiff --git a/subx/apps/pack.subx b/subx/apps/pack.subx
index 6ac03fc4..88ed23b6 100644
--- a/subx/apps/pack.subx
+++ b/subx/apps/pack.subx
@@ -96,7 +96,7 @@ convert:  # in : (address buffered-file), out : (address buffered-file) -> <void
     #   var in-code? = false
     #   while true
     #     clear-stream(line)
-    #     read-line(in, line)
+    #     read-line-buffered(in, line)
     #     if (line->write == 0) break             # end of file
     #     var word-slice = next-word(line)
     #     if slice-empty?(word-slice)             # whitespace
@@ -141,12 +141,12 @@ $convert:loop:
     e8/call  clear-stream/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-    # read-line(in, line)
+    # read-line-buffered(in, line)
     # . . push args
     51/push-ECX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  read-line/disp32
+    e8/call  read-line-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 $convert:check0:
@@ -218,12 +218,12 @@ $convert:check2:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     52/push-EDX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -283,12 +283,12 @@ $convert:check2:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     52/push-EDX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -937,7 +937,7 @@ convert-data:  # line : (address stream byte), out : (address buffered-file) ->
     #     if slice-empty?(word-slice)                 # end of file (maybe including trailing whitespace)
     #       break  # skip emitting some whitespace
     #     if slice-starts-with?(word-slice, "#")      # comment
-    #       write-slice(out, word-slice)
+    #       write-slice-buffered(out, word-slice)
     #       break
     #     if slice-ends-with?(word-slice, ":")        # label
     #       write-stream-data(out, line)
@@ -1012,12 +1012,12 @@ $convert-data:loop:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     51/push-ECX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -1059,12 +1059,12 @@ $convert-data:check-for-comment:
     3d/compare-EAX-and  0x23/imm32/hash
     75/jump-if-not-equal  $convert-data:check-for-label/disp8
 $convert-data:comment:
-    # write-slice(out, word-slice)
+    # write-slice-buffered(out, word-slice)
     # . . push args
     51/push-ECX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           0xc/disp8       .                 # push *(EBP+12)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # break
@@ -1999,14 +1999,14 @@ emit-opcodes:  # line : (address stream byte), out : (address buffered-file) ->
     #   var op1 = next-word(line)
     #   if (slice-empty?(op1) || slice-starts-with?(op1, "#")) return
     #   op1 = next-token-from-slice(op1->start, op1->end, "/")
-    #   write-slice(out, op1)
+    #   write-slice-buffered(out, op1)
     #   if !slice-equal?(op1, "0f") && !slice-equal?(op1, "f2") && !slice-equal?(op1, "f3")
     #     return
     #
     #   var op2 = next-word(line)
     #   if (slice-empty?(op2) || slice-starts-with?(op2, "#")) return
     #   op2 = next-token-from-slice(op2->start, op2->end, "/")
-    #   write-slice(out, op2)
+    #   write-slice-buffered(out, op2)
     #   if slice-equal?(op1, "0f")
     #     return
     #   if !slice-equal?(op2, "0f")
@@ -2015,7 +2015,7 @@ emit-opcodes:  # line : (address stream byte), out : (address buffered-file) ->
     #   var op3 = next-word(line)
     #   if (slice-empty?(op3) || slice-starts-with?(op3, "#")) return
     #   op3 = next-token-from-slice(op3->start, op3->end, "/")
-    #   write-slice(out, op3)
+    #   write-slice-buffered(out, op3)
     #
     # . prolog
     55/push-EBP
@@ -2079,12 +2079,12 @@ $emit-opcodes:op1:
     e8/call  next-token-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
-    # write-slice(out, op1)
+    # write-slice-buffered(out, op1)
     # . . push args
     51/push-ECX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           0xc/disp8       .                 # push *(EBP+12)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # write-buffered(out, " ")
@@ -2172,12 +2172,12 @@ $emit-opcodes:op2:
     e8/call  next-token-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
-    # write-slice(out, op2)
+    # write-slice-buffered(out, op2)
     # . . push args
     52/push-EDX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           0xc/disp8       .                 # push *(EBP+12)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # write-buffered(out, " ")
@@ -2251,12 +2251,12 @@ $emit-opcodes:op3:
     e8/call  next-token-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
-    # write-slice(out, op3)
+    # write-slice-buffered(out, op3)
     # . . push args
     52/push-EDX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           0xc/disp8       .                 # push *(EBP+12)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # write-buffered(out, " ")
@@ -2388,12 +2388,12 @@ $emit-modrm:loop:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     51/push-ECX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -2699,12 +2699,12 @@ $emit-sib:loop:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     51/push-ECX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -2964,12 +2964,12 @@ $emit-disp:loop:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     51/push-ECX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -3185,12 +3185,12 @@ $emit-imm:loop:
 #?     e8/call  clear-stream/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-#?     # . write-slice(Stderr, word-slice)
+#?     # . write-slice-buffered(Stderr, word-slice)
 #?     # . . push args
 #?     51/push-ECX
 #?     68/push  Stderr/imm32
 #?     # . . call
-#?     e8/call  write-slice/disp32
+#?     e8/call  write-slice-buffered/disp32
 #?     # . . discard args
 #?     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 #?     # . flush(Stderr)
@@ -6373,7 +6373,7 @@ emit:  # out : (address buffered-file), word : (address slice), width : int -> <
     e8/call  next-token-from-slice/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
-    # if (is-valid-name?(datum)) write-slice(out, word) and return
+    # if (is-valid-name?(datum)) write-slice-buffered(out, word) and return
     # . EAX = is-valid-name?(name)
     # . . push args
     57/push-EDI
@@ -6385,12 +6385,12 @@ emit:  # out : (address buffered-file), word : (address slice), width : int -> <
     3d/compare-EAX-and  0/imm32
     74/jump-if-equal  $emit:hex-int/disp8
 $emit:name:
-    # . write-slice(out, word)
+    # . write-slice-buffered(out, word)
     # . . push args
     56/push-ESI
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # . write-buffered(out, " ")
@@ -7054,20 +7054,20 @@ $emit-hex:loop:
     # if (curr >= width) break
     39/compare                      3/mod/direct    1/rm32/ECX    .           .             .           2/r32/EDX   .               .                 # compare ECX with EDX
     7d/jump-if-greater-or-equal  $emit-hex:end/disp8
-    # print-byte(out, EBX)
+    # print-byte-buffered(out, EBX)
     # . . push args
     53/push-EBX
     57/push-EDI
     # . . call
-    e8/call  print-byte/disp32
+    e8/call  print-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # write-byte(out, ' ')
+    # write-byte-buffered(out, ' ')
     # . . push args
     68/push  0x20/imm32/space
     57/push-EDI
     # . . call
-    e8/call  write-byte/disp32
+    e8/call  write-byte-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
     # EBX = EBX >> 8
diff --git a/subx/apps/subx-common.subx b/subx/apps/subx-common.subx
index 0807b210..cba1e9cc 100644
--- a/subx/apps/subx-common.subx
+++ b/subx/apps/subx-common.subx
@@ -7,7 +7,7 @@
 
 # write an entire stream's contents to a buffered-file
 # ways to do this:
-#   - construct a 'maximal slice' and pass it to write-slice
+#   - construct a 'maximal slice' and pass it to write-slice-buffered
 #   - flush the buffered-file and pass the stream directly to its fd (disabling buffering)
 # we'll go with the first way for now
 write-stream-data:  # f : (address buffered-file), s : (address stream) -> <void>
@@ -30,12 +30,12 @@ write-stream-data:  # f : (address buffered-file), s : (address stream) -> <void
     50/push-EAX
     # . ECX = ESP
     89/copy                         3/mod/direct    1/rm32/ECX    .           .             .           4/r32/ESP   .               .                 # copy ESP to ECX
-    # write-slice(f, slice)
+    # write-slice-buffered(f, slice)
     # . . push args
     51/push-ECX
     ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP    .           .             .           .           8/disp8         .                 # push *(EBP+8)
     # . . call
-    e8/call  write-slice/disp32
+    e8/call  write-slice-buffered/disp32
     # . . discard args
     81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
 $write-stream-data:end: