about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/subx/050_write.subx.html53
-rw-r--r--html/subx/051test.subx.html93
-rw-r--r--html/subx/052kernel_string_equal.subx.html284
-rw-r--r--html/subx/053new_segment.subx.html84
-rw-r--r--html/subx/054string_equal.subx.html192
-rw-r--r--html/subx/055trace.subx.html460
-rw-r--r--html/subx/056write.subx.html281
-rw-r--r--html/subx/057stop.subx.html321
-rw-r--r--html/subx/058read.subx.html506
-rw-r--r--html/subx/059read-byte.subx.html307
-rw-r--r--html/subx/060write-stream.subx.html292
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html881
-rw-r--r--html/subx/apps/crenshaw2-1b.subx.html1149
-rw-r--r--html/subx/apps/factorial.subx.html148
-rw-r--r--html/subx/examples/ex1.subx.html30
-rw-r--r--html/subx/examples/ex10.subx.html98
-rw-r--r--html/subx/examples/ex11.subx.html388
-rw-r--r--html/subx/examples/ex12.subx.html67
-rw-r--r--html/subx/examples/ex2.subx.html24
-rw-r--r--html/subx/examples/ex3.subx.html48
-rw-r--r--html/subx/examples/ex4.subx.html40
-rw-r--r--html/subx/examples/ex5.subx.html56
-rw-r--r--html/subx/examples/ex6.subx.html48
-rw-r--r--html/subx/examples/ex7.subx.html92
-rw-r--r--html/subx/examples/ex8.subx.html90
-rw-r--r--html/subx/examples/ex9.subx.html90
-rw-r--r--subx/apps/crenshaw2-1.subx292
-rw-r--r--subx/subx.vim34
28 files changed, 3214 insertions, 3234 deletions
diff --git a/html/subx/050_write.subx.html b/html/subx/050_write.subx.html
index 6e8e6f7e..1d3ba052 100644
--- a/html/subx/050_write.subx.html
+++ b/html/subx/050_write.subx.html
@@ -15,10 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -53,51 +52,51 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="Comment"># _write: write to a file descriptor</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment"># _write: write to a file descriptor</span>
 <span id="L2" class="LineNr"> 2 </span>
 <span id="L3" class="LineNr"> 3 </span>== code
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L7" class="LineNr"> 7 </span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># main:</span>
-<span id="L9" class="LineNr"> 9 </span>  <span class="Comment"># syscall(exit, 0) -- can't test _write just yet</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># main:</span>
+<span id="L9" class="LineNr"> 9 </span>  <span class="subxComment"># syscall(exit, 0) -- can't test _write just yet</span>
 <span id="L10" class="LineNr">10 </span>  bb/copy-to-EBX  0/imm32
 <span id="L11" class="LineNr">11 </span>  b8/copy-to-EAX  1/imm32
 <span id="L12" class="LineNr">12 </span>  cd/syscall  0x80/imm8
 <span id="L13" class="LineNr">13 </span>
-<span id="L14" class="LineNr">14 </span>_write:  <span class="Comment"># fd : int, s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L15" class="LineNr">15 </span>  <span class="Comment"># prolog</span>
+<span id="L14" class="LineNr">14 </span>_write:  <span class="subxComment"># fd : int, s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L15" class="LineNr">15 </span>  <span class="subxComment"># prolog</span>
 <span id="L16" class="LineNr">16 </span>  55/push-EBP
-<span id="L17" class="LineNr">17 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L18" class="LineNr">18 </span>  <span class="Comment"># save registers</span>
+<span id="L17" class="LineNr">17 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L18" class="LineNr">18 </span>  <span class="subxComment"># save registers</span>
 <span id="L19" class="LineNr">19 </span>  50/push-EAX
 <span id="L20" class="LineNr">20 </span>  51/push-ECX
 <span id="L21" class="LineNr">21 </span>  52/push-EDX
 <span id="L22" class="LineNr">22 </span>  53/push-EBX
-<span id="L23" class="LineNr">23 </span>  <span class="Comment"># syscall(write, fd, (data) s+4, (size) *s)</span>
-<span id="L24" class="LineNr">24 </span>    <span class="Comment"># fd : EBX</span>
-<span id="L25" class="LineNr">25 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
-<span id="L26" class="LineNr">26 </span>    <span class="Comment"># data : ECX = s+4</span>
-<span id="L27" class="LineNr">27 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ECX</span>
-<span id="L28" class="LineNr">28 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ECX</span>
-<span id="L29" class="LineNr">29 </span>    <span class="Comment"># size : EDX = *s</span>
-<span id="L30" class="LineNr">30 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
-<span id="L31" class="LineNr">31 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L32" class="LineNr">32 </span>    <span class="Comment"># syscall</span>
+<span id="L23" class="LineNr">23 </span>  <span class="subxComment"># syscall(write, fd, (data) s+4, (size) *s)</span>
+<span id="L24" class="LineNr">24 </span>    <span class="subxComment"># fd : EBX</span>
+<span id="L25" class="LineNr">25 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L26" class="LineNr">26 </span>    <span class="subxComment"># data : ECX = s+4</span>
+<span id="L27" class="LineNr">27 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
+<span id="L28" class="LineNr">28 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
+<span id="L29" class="LineNr">29 </span>    <span class="subxComment"># size : EDX = *s</span>
+<span id="L30" class="LineNr">30 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L31" class="LineNr">31 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L32" class="LineNr">32 </span>    <span class="subxComment"># syscall</span>
 <span id="L33" class="LineNr">33 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># restore registers</span>
+<span id="L35" class="LineNr">35 </span>  <span class="subxComment"># restore registers</span>
 <span id="L36" class="LineNr">36 </span>  5b/pop-to-EBX
 <span id="L37" class="LineNr">37 </span>  5a/pop-to-EDX
 <span id="L38" class="LineNr">38 </span>  59/pop-to-ECX
 <span id="L39" class="LineNr">39 </span>  58/pop-to-EAX
-<span id="L40" class="LineNr">40 </span>  <span class="Comment"># epilog</span>
-<span id="L41" class="LineNr">41 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L40" class="LineNr">40 </span>  <span class="subxComment"># epilog</span>
+<span id="L41" class="LineNr">41 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L42" class="LineNr">42 </span>  5d/pop-to-EBP
 <span id="L43" class="LineNr">43 </span>  c3/return
 <span id="L44" class="LineNr">44 </span>
-<span id="L45" class="LineNr">45 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L45" class="LineNr">45 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/051test.subx.html b/html/subx/051test.subx.html
index 724ddbdd..65c34e54 100644
--- a/html/subx/051test.subx.html
+++ b/html/subx/051test.subx.html
@@ -15,12 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
@@ -55,91 +54,91 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="Comment"># Rudimentary test harness</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment"># Rudimentary test harness</span>
 <span id="L2" class="LineNr"> 2 </span>
 <span id="L3" class="LineNr"> 3 </span>== code
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L7" class="LineNr"> 7 </span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
-<span id="L9" class="LineNr"> 9 </span>  <span class="Comment"># check-ints-equal(34, 34)</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L9" class="LineNr"> 9 </span>  <span class="subxComment"># check-ints-equal(34, 34)</span>
 <span id="L10" class="LineNr">10 </span>  68/push  <span class="Constant">&quot;error in check-ints-equal&quot;</span>/imm32
 <span id="L11" class="LineNr">11 </span>  68/push  34/imm32
 <span id="L12" class="LineNr">12 </span>  68/push  34/imm32
 <span id="L13" class="LineNr">13 </span>  e8/call  check-ints-equal/disp32
-<span id="L14" class="LineNr">14 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L15" class="LineNr">15 </span>  <span class="Comment"># syscall(exit, 0)</span>
+<span id="L14" class="LineNr">14 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L15" class="LineNr">15 </span>  <span class="subxComment"># syscall(exit, 0)</span>
 <span id="L16" class="LineNr">16 </span>  bb/copy-to-EBX  0/imm32
 <span id="L17" class="LineNr">17 </span>  b8/copy-to-EAX  1/imm32
 <span id="L18" class="LineNr">18 </span>  cd/syscall  0x80/imm8
 <span id="L19" class="LineNr">19 </span>
-<span id="L20" class="LineNr">20 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L21" class="LineNr">21 </span>check-ints-equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
-<span id="L22" class="LineNr">22 </span>  <span class="Comment"># prolog</span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L21" class="LineNr">21 </span>check-ints-equal:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L22" class="LineNr">22 </span>  <span class="subxComment"># prolog</span>
 <span id="L23" class="LineNr">23 </span>  55/push-EBP
-<span id="L24" class="LineNr">24 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L25" class="LineNr">25 </span>  <span class="Comment"># save registers</span>
+<span id="L24" class="LineNr">24 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L25" class="LineNr">25 </span>  <span class="subxComment"># save registers</span>
 <span id="L26" class="LineNr">26 </span>  51/push-ECX
 <span id="L27" class="LineNr">27 </span>  53/push-EBX
-<span id="L28" class="LineNr">28 </span>  <span class="Comment"># load first 2 args into EAX and EBX</span>
-<span id="L29" class="LineNr">29 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L30" class="LineNr">30 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Comment"># if EAX == b/EBX</span>
-<span id="L32" class="LineNr">32 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L28" class="LineNr">28 </span>  <span class="subxComment"># load first 2 args into EAX and EBX</span>
+<span id="L29" class="LineNr">29 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L30" class="LineNr">30 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L31" class="LineNr">31 </span>  <span class="subxComment"># if EAX == b/EBX</span>
+<span id="L32" class="LineNr">32 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L33" class="LineNr">33 </span>  75/jump-if-unequal  $check-ints-equal:else/disp8
-<span id="L34" class="LineNr">34 </span>    <span class="Comment"># _write(2/stderr, '.')</span>
-<span id="L35" class="LineNr">35 </span>      <span class="Comment"># push args</span>
+<span id="L34" class="LineNr">34 </span>    <span class="subxComment"># _write(2/stderr, '.')</span>
+<span id="L35" class="LineNr">35 </span>      <span class="subxComment"># push args</span>
 <span id="L36" class="LineNr">36 </span>  68/push  <span class="Constant">&quot;.&quot;</span>/imm32
 <span id="L37" class="LineNr">37 </span>  68/push  2/imm32/stderr
-<span id="L38" class="LineNr">38 </span>      <span class="Comment"># call</span>
+<span id="L38" class="LineNr">38 </span>      <span class="subxComment"># call</span>
 <span id="L39" class="LineNr">39 </span>  e8/call  _write/disp32
-<span id="L40" class="LineNr">40 </span>      <span class="Comment"># discard args</span>
-<span id="L41" class="LineNr">41 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L42" class="LineNr">42 </span>    <span class="Comment"># return</span>
+<span id="L40" class="LineNr">40 </span>      <span class="subxComment"># discard args</span>
+<span id="L41" class="LineNr">41 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L42" class="LineNr">42 </span>    <span class="subxComment"># return</span>
 <span id="L43" class="LineNr">43 </span>  eb/jump  $check-ints-equal:end/disp8
-<span id="L44" class="LineNr">44 </span>  <span class="Comment"># else:</span>
+<span id="L44" class="LineNr">44 </span>  <span class="subxComment"># else:</span>
 <span id="L45" class="LineNr">45 </span>$check-ints-equal:else:
-<span id="L46" class="LineNr">46 </span>    <span class="Comment"># _write(2/stderr, msg)</span>
-<span id="L47" class="LineNr">47 </span>      <span class="Comment"># push args</span>
-<span id="L48" class="LineNr">48 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+16) to ECX</span>
+<span id="L46" class="LineNr">46 </span>    <span class="subxComment"># _write(2/stderr, msg)</span>
+<span id="L47" class="LineNr">47 </span>      <span class="subxComment"># push args</span>
+<span id="L48" class="LineNr">48 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to ECX</span>
 <span id="L49" class="LineNr">49 </span>  51/push-ECX
 <span id="L50" class="LineNr">50 </span>  68/push  2/imm32/stderr
-<span id="L51" class="LineNr">51 </span>      <span class="Comment"># call</span>
+<span id="L51" class="LineNr">51 </span>      <span class="subxComment"># call</span>
 <span id="L52" class="LineNr">52 </span>  e8/call  _write/disp32
-<span id="L53" class="LineNr">53 </span>      <span class="Comment"># discard args</span>
-<span id="L54" class="LineNr">54 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L55" class="LineNr">55 </span>    <span class="Comment"># _write(2/stderr, Newline)</span>
-<span id="L56" class="LineNr">56 </span>      <span class="Comment"># push args</span>
+<span id="L53" class="LineNr">53 </span>      <span class="subxComment"># discard args</span>
+<span id="L54" class="LineNr">54 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L55" class="LineNr">55 </span>    <span class="subxComment"># _write(2/stderr, Newline)</span>
+<span id="L56" class="LineNr">56 </span>      <span class="subxComment"># push args</span>
 <span id="L57" class="LineNr">57 </span>  68/push  <span class="Special">Newline</span>/imm32
 <span id="L58" class="LineNr">58 </span>  68/push  2/imm32/stderr
-<span id="L59" class="LineNr">59 </span>      <span class="Comment"># call</span>
+<span id="L59" class="LineNr">59 </span>      <span class="subxComment"># call</span>
 <span id="L60" class="LineNr">60 </span>  e8/call  _write/disp32
-<span id="L61" class="LineNr">61 </span>      <span class="Comment"># discard args</span>
-<span id="L62" class="LineNr">62 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L63" class="LineNr">63 </span>    <span class="Comment"># increment Num-test-failures</span>
-<span id="L64" class="LineNr">64 </span>  ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># increment *Num-test-failures</span>
+<span id="L61" class="LineNr">61 </span>      <span class="subxComment"># discard args</span>
+<span id="L62" class="LineNr">62 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L63" class="LineNr">63 </span>    <span class="subxComment"># increment Num-test-failures</span>
+<span id="L64" class="LineNr">64 </span>  ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># increment *Num-test-failures</span>
 <span id="L65" class="LineNr">65 </span>$check-ints-equal:end:
-<span id="L66" class="LineNr">66 </span>  <span class="Comment"># restore registers</span>
+<span id="L66" class="LineNr">66 </span>  <span class="subxComment"># restore registers</span>
 <span id="L67" class="LineNr">67 </span>  5b/pop-to-EBX
 <span id="L68" class="LineNr">68 </span>  59/pop-to-ECX
-<span id="L69" class="LineNr">69 </span>  <span class="Comment"># epilog</span>
-<span id="L70" class="LineNr">70 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L69" class="LineNr">69 </span>  <span class="subxComment"># epilog</span>
+<span id="L70" class="LineNr">70 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L71" class="LineNr">71 </span>  5d/pop-to-EBP
 <span id="L72" class="LineNr">72 </span>  c3/return
 <span id="L73" class="LineNr">73 </span>
 <span id="L74" class="LineNr">74 </span>== data
 <span id="L75" class="LineNr">75 </span>
 <span id="L76" class="LineNr">76 </span><span class="Special">Newline</span>:
-<span id="L77" class="LineNr">77 </span>  <span class="Comment"># size</span>
+<span id="L77" class="LineNr">77 </span>  <span class="subxComment"># size</span>
 <span id="L78" class="LineNr">78 </span>  01 00 00 00
-<span id="L79" class="LineNr">79 </span>  <span class="Comment"># data</span>
+<span id="L79" class="LineNr">79 </span>  <span class="subxComment"># data</span>
 <span id="L80" class="LineNr">80 </span>  0a/newline
 <span id="L81" class="LineNr">81 </span>
 <span id="L82" class="LineNr">82 </span><span class="Special">Num-test-failures</span>:
 <span id="L83" class="LineNr">83 </span>  00 00 00 00
 <span id="L84" class="LineNr">84 </span>
-<span id="L85" class="LineNr">85 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L85" class="LineNr">85 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/052kernel_string_equal.subx.html b/html/subx/052kernel_string_equal.subx.html
index 35dd393c..1c0c04f1 100644
--- a/html/subx/052kernel_string_equal.subx.html
+++ b/html/subx/052kernel_string_equal.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -56,257 +54,257 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## Checking null-terminated ascii strings.</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># By default we create strings with a 4-byte length prefix rather than a null suffix.</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># However we still need null-prefixed strings when interacting with the Linux</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># kernel in a few places. This layer implements a function for comparing</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># a null-terminated 'kernel string' with a length-prefixed 'SubX string'.</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">#</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#   $ subx translate 05[0-2]*.subx -o /tmp/tmp52</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   $ subx run /tmp/tmp52  # runs a series of tests</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   ......  # all tests pass</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># (We can't yet run the tests when given a &quot;test&quot; commandline argument,</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment"># because checking for it would require the function being tested! Breakage</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment"># would cause tests to not run, rather than to fail as we'd like.)</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment">## Checking null-terminated ascii strings.</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># By default we create strings with a 4-byte length prefix rather than a null suffix.</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># However we still need null-prefixed strings when interacting with the Linux</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># kernel in a few places. This layer implements a function for comparing</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># a null-terminated 'kernel string' with a length-prefixed 'SubX string'.</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#   $ subx translate 05[0-2]*.subx -o /tmp/tmp52</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#   $ subx run /tmp/tmp52  # runs a series of tests</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   ......  # all tests pass</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># (We can't yet run the tests when given a &quot;test&quot; commandline argument,</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># because checking for it would require the function being tested! Breakage</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># would cause tests to not run, rather than to fail as we'd like.)</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span>== code
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment"># main:</span>
-<span id="L23" class="LineNr"> 23 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># exit(Num-test-failures)</span>
-<span id="L25" class="LineNr"> 25 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
+<span id="L23" class="LineNr"> 23 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="subxComment"># exit(Num-test-failures)</span>
+<span id="L25" class="LineNr"> 25 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L26" class="LineNr"> 26 </span>  b8/copy-to-EAX  1/imm32
 <span id="L27" class="LineNr"> 27 </span>  cd/syscall  0x80/imm8
 <span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L31" class="LineNr"> 31 </span>kernel-string-equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Comment"># prolog</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
+<span id="L31" class="LineNr"> 31 </span>kernel-string-equal:  <span class="subxComment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="subxComment"># prolog</span>
 <span id="L33" class="LineNr"> 33 </span>  55/push-EBP
-<span id="L34" class="LineNr"> 34 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># save registers</span>
+<span id="L34" class="LineNr"> 34 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="subxComment"># save registers</span>
 <span id="L36" class="LineNr"> 36 </span>  51/push-ECX
 <span id="L37" class="LineNr"> 37 </span>  52/push-EDX
 <span id="L38" class="LineNr"> 38 </span>  53/push-EBX
 <span id="L39" class="LineNr"> 39 </span>  56/push-ESI
 <span id="L40" class="LineNr"> 40 </span>  57/push-EDI
 <span id="L41" class="LineNr"> 41 </span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Comment"># pseudocode:</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Comment">#   initialize n = b.length</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Comment">#   initialize s1 = s</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Comment">#   initialize s2 = b.data</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Comment">#   i = 0</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Comment">#   for (i = 0; i &lt; n; ++n)</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Comment">#     c1 = *s1</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Comment">#     c2 = *s2</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Comment">#     if c1 == 0</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Comment">#       return false</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Comment">#     if c1 != c2</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Comment">#       return false</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Comment">#   return *s1 == 0</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Comment">#</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># initialize s into EDI</span>
-<span id="L57" class="LineNr"> 57 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDI</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># initialize benchmark length n into EDX</span>
-<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
-<span id="L60" class="LineNr"> 60 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Comment"># initialize benchmark data into ESI</span>
-<span id="L62" class="LineNr"> 62 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L63" class="LineNr"> 63 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESI</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="subxComment"># pseudocode:</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="subxComment">#   initialize n = b.length</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="subxComment">#   initialize s1 = s</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="subxComment">#   initialize s2 = b.data</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="subxComment">#   i = 0</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="subxComment">#   for (i = 0; i &lt; n; ++n)</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="subxComment">#     c1 = *s1</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="subxComment">#     c2 = *s2</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="subxComment">#     if c1 == 0</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="subxComment">#       return false</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="subxComment">#     if c1 != c2</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="subxComment">#       return false</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="subxComment">#   return *s1 == 0</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="subxComment">#</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="subxComment"># initialize s into EDI</span>
+<span id="L57" class="LineNr"> 57 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="subxComment"># initialize benchmark length n into EDX</span>
+<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L60" class="LineNr"> 60 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="subxComment"># initialize benchmark data into ESI</span>
+<span id="L62" class="LineNr"> 62 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L63" class="LineNr"> 63 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="subxComment"># initialize loop counter i into ECX</span>
 <span id="L65" class="LineNr"> 65 </span>  b9/copy-to-ECX  0/imm32/exit
-<span id="L66" class="LineNr"> 66 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="subxComment"># while (i/ECX &lt; n/EDX)</span>
 <span id="L67" class="LineNr"> 67 </span>$kernel-string-equal:loop:
-<span id="L68" class="LineNr"> 68 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
+<span id="L68" class="LineNr"> 68 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
 <span id="L69" class="LineNr"> 69 </span>  74/jump-if-equal  $kernel-string-equal:break/disp8
-<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxComment"># c1/EAX, c2/EBX = *s, *benchmark</span>
 <span id="L71" class="LineNr"> 71 </span>  b8/copy-to-EAX  0/imm32
-<span id="L72" class="LineNr"> 72 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L72" class="LineNr"> 72 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
 <span id="L73" class="LineNr"> 73 </span>  bb/copy-to-EBX  0/imm32
-<span id="L74" class="LineNr"> 74 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
-<span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># if (c1 == 0) return false</span>
+<span id="L74" class="LineNr"> 74 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to lower byte of EBX</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="subxComment"># if (c1 == 0) return false</span>
 <span id="L76" class="LineNr"> 76 </span>  3d/compare-EAX  0/imm32
 <span id="L77" class="LineNr"> 77 </span>  74/jump-if-equal  $kernel-string-equal:false/disp8
-<span id="L78" class="LineNr"> 78 </span>    <span class="Comment"># if (c1 != c2) return false</span>
-<span id="L79" class="LineNr"> 79 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
+<span id="L79" class="LineNr"> 79 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <span id="L80" class="LineNr"> 80 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
-<span id="L81" class="LineNr"> 81 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="subxComment"># ++s1, ++s2, ++i</span>
 <span id="L82" class="LineNr"> 82 </span>  41/inc-ECX
 <span id="L83" class="LineNr"> 83 </span>  46/inc-ESI
 <span id="L84" class="LineNr"> 84 </span>  47/inc-EDI
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># end while</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="subxComment"># end while</span>
 <span id="L86" class="LineNr"> 86 </span>  eb/jump  $kernel-string-equal:loop/disp8
 <span id="L87" class="LineNr"> 87 </span>$kernel-string-equal:break:
-<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="subxComment"># if (*s/EDI == 0) return true</span>
 <span id="L89" class="LineNr"> 89 </span>  b8/copy-to-EAX  0/imm32
-<span id="L90" class="LineNr"> 90 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L90" class="LineNr"> 90 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
 <span id="L91" class="LineNr"> 91 </span>  3d/compare-EAX  0/imm32
 <span id="L92" class="LineNr"> 92 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L93" class="LineNr"> 93 </span>$kernel-string-equal:true:
 <span id="L94" class="LineNr"> 94 </span>  b8/copy-to-EAX  1/imm32
 <span id="L95" class="LineNr"> 95 </span>  eb/jump  $kernel-string-equal:end/disp8
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># return false</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="subxComment"># return false</span>
 <span id="L97" class="LineNr"> 97 </span>$kernel-string-equal:false:
 <span id="L98" class="LineNr"> 98 </span>  b8/copy-to-EAX  0/imm32
 <span id="L99" class="LineNr"> 99 </span>
 <span id="L100" class="LineNr">100 </span>$kernel-string-equal:end:
-<span id="L101" class="LineNr">101 </span>  <span class="Comment"># restore registers</span>
+<span id="L101" class="LineNr">101 </span>  <span class="subxComment"># restore registers</span>
 <span id="L102" class="LineNr">102 </span>  5f/pop-to-EDI
 <span id="L103" class="LineNr">103 </span>  5e/pop-to-ESI
 <span id="L104" class="LineNr">104 </span>  5b/pop-to-EBX
 <span id="L105" class="LineNr">105 </span>  5a/pop-to-EDX
 <span id="L106" class="LineNr">106 </span>  59/pop-to-ECX
-<span id="L107" class="LineNr">107 </span>  <span class="Comment"># epilog</span>
-<span id="L108" class="LineNr">108 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L107" class="LineNr">107 </span>  <span class="subxComment"># epilog</span>
+<span id="L108" class="LineNr">108 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L109" class="LineNr">109 </span>  5d/pop-to-EBP
 <span id="L110" class="LineNr">110 </span>  c3/return
 <span id="L111" class="LineNr">111 </span>
-<span id="L112" class="LineNr">112 </span><span class="SalientComment">## tests</span>
+<span id="L112" class="LineNr">112 </span><span class="subxComment">## tests</span>
 <span id="L113" class="LineNr">113 </span>
 <span id="L114" class="LineNr">114 </span>test-compare-null-kernel-string-with-empty-array:
-<span id="L115" class="LineNr">115 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Comment"># push args</span>
+<span id="L115" class="LineNr">115 </span>  <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># push args</span>
 <span id="L117" class="LineNr">117 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L118" class="LineNr">118 </span>  68/push  <span class="Special">Null-kernel-string</span>/imm32
-<span id="L119" class="LineNr">119 </span>    <span class="Comment"># call</span>
+<span id="L119" class="LineNr">119 </span>    <span class="subxComment"># call</span>
 <span id="L120" class="LineNr">120 </span>  e8/call  kernel-string-equal/disp32
-<span id="L121" class="LineNr">121 </span>    <span class="Comment"># discard args</span>
-<span id="L122" class="LineNr">122 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
-<span id="L124" class="LineNr">124 </span>    <span class="Comment"># push args</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxComment"># discard args</span>
+<span id="L122" class="LineNr">122 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L123" class="LineNr">123 </span>  <span class="subxComment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L124" class="LineNr">124 </span>    <span class="subxComment"># push args</span>
 <span id="L125" class="LineNr">125 </span>  68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-empty-array&quot;</span>/imm32
 <span id="L126" class="LineNr">126 </span>  68/push  1/imm32/true
 <span id="L127" class="LineNr">127 </span>  50/push-EAX
-<span id="L128" class="LineNr">128 </span>    <span class="Comment"># call</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxComment"># call</span>
 <span id="L129" class="LineNr">129 </span>  e8/call  check-ints-equal/disp32
-<span id="L130" class="LineNr">130 </span>    <span class="Comment"># discard args</span>
-<span id="L131" class="LineNr">131 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L130" class="LineNr">130 </span>    <span class="subxComment"># discard args</span>
+<span id="L131" class="LineNr">131 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L132" class="LineNr">132 </span>  c3/return
 <span id="L133" class="LineNr">133 </span>
 <span id="L134" class="LineNr">134 </span>test-compare-null-kernel-string-with-non-empty-array:
-<span id="L135" class="LineNr">135 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
-<span id="L136" class="LineNr">136 </span>    <span class="Comment"># push args</span>
+<span id="L135" class="LineNr">135 </span>  <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
+<span id="L136" class="LineNr">136 </span>    <span class="subxComment"># push args</span>
 <span id="L137" class="LineNr">137 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L138" class="LineNr">138 </span>  68/push  <span class="Special">Null-kernel-string</span>/imm32
-<span id="L139" class="LineNr">139 </span>    <span class="Comment"># call</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxComment"># call</span>
 <span id="L140" class="LineNr">140 </span>  e8/call  kernel-string-equal/disp32
-<span id="L141" class="LineNr">141 </span>    <span class="Comment"># discard args</span>
-<span id="L142" class="LineNr">142 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
-<span id="L144" class="LineNr">144 </span>    <span class="Comment"># push args</span>
+<span id="L141" class="LineNr">141 </span>    <span class="subxComment"># discard args</span>
+<span id="L142" class="LineNr">142 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L143" class="LineNr">143 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L144" class="LineNr">144 </span>    <span class="subxComment"># push args</span>
 <span id="L145" class="LineNr">145 </span>  68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;</span>/imm32
 <span id="L146" class="LineNr">146 </span>  68/push  0/imm32/false
 <span id="L147" class="LineNr">147 </span>  50/push-EAX
-<span id="L148" class="LineNr">148 </span>    <span class="Comment"># call</span>
+<span id="L148" class="LineNr">148 </span>    <span class="subxComment"># call</span>
 <span id="L149" class="LineNr">149 </span>  e8/call  check-ints-equal/disp32
-<span id="L150" class="LineNr">150 </span>    <span class="Comment"># discard args</span>
-<span id="L151" class="LineNr">151 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L150" class="LineNr">150 </span>    <span class="subxComment"># discard args</span>
+<span id="L151" class="LineNr">151 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L152" class="LineNr">152 </span>  c3/return
 <span id="L153" class="LineNr">153 </span>
 <span id="L154" class="LineNr">154 </span>test-compare-kernel-string-with-equal-array:
-<span id="L155" class="LineNr">155 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
-<span id="L156" class="LineNr">156 </span>    <span class="Comment"># push args</span>
+<span id="L155" class="LineNr">155 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
+<span id="L156" class="LineNr">156 </span>    <span class="subxComment"># push args</span>
 <span id="L157" class="LineNr">157 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L158" class="LineNr">158 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L159" class="LineNr">159 </span>    <span class="Comment"># call</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># call</span>
 <span id="L160" class="LineNr">160 </span>  e8/call  kernel-string-equal/disp32
-<span id="L161" class="LineNr">161 </span>    <span class="Comment"># discard args</span>
-<span id="L162" class="LineNr">162 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
-<span id="L164" class="LineNr">164 </span>    <span class="Comment"># push args</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxComment"># discard args</span>
+<span id="L162" class="LineNr">162 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>  <span class="subxComment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L164" class="LineNr">164 </span>    <span class="subxComment"># push args</span>
 <span id="L165" class="LineNr">165 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
 <span id="L166" class="LineNr">166 </span>  68/push  1/imm32/true
 <span id="L167" class="LineNr">167 </span>  50/push-EAX
-<span id="L168" class="LineNr">168 </span>    <span class="Comment"># call</span>
+<span id="L168" class="LineNr">168 </span>    <span class="subxComment"># call</span>
 <span id="L169" class="LineNr">169 </span>  e8/call  check-ints-equal/disp32
-<span id="L170" class="LineNr">170 </span>    <span class="Comment"># discard args</span>
-<span id="L171" class="LineNr">171 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxComment"># discard args</span>
+<span id="L171" class="LineNr">171 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L172" class="LineNr">172 </span>  c3/return
 <span id="L173" class="LineNr">173 </span>
 <span id="L174" class="LineNr">174 </span>test-compare-kernel-string-with-inequal-array:
-<span id="L175" class="LineNr">175 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
-<span id="L176" class="LineNr">176 </span>    <span class="Comment"># push args</span>
+<span id="L175" class="LineNr">175 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
+<span id="L176" class="LineNr">176 </span>    <span class="subxComment"># push args</span>
 <span id="L177" class="LineNr">177 </span>  68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
 <span id="L178" class="LineNr">178 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L179" class="LineNr">179 </span>    <span class="Comment"># call</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxComment"># call</span>
 <span id="L180" class="LineNr">180 </span>  e8/call  kernel-string-equal/disp32
-<span id="L181" class="LineNr">181 </span>    <span class="Comment"># discard args</span>
-<span id="L182" class="LineNr">182 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
-<span id="L184" class="LineNr">184 </span>    <span class="Comment"># push args</span>
+<span id="L181" class="LineNr">181 </span>    <span class="subxComment"># discard args</span>
+<span id="L182" class="LineNr">182 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L183" class="LineNr">183 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L184" class="LineNr">184 </span>    <span class="subxComment"># push args</span>
 <span id="L185" class="LineNr">185 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
 <span id="L186" class="LineNr">186 </span>  68/push  0/imm32/false
 <span id="L187" class="LineNr">187 </span>  50/push-EAX
-<span id="L188" class="LineNr">188 </span>    <span class="Comment"># call</span>
+<span id="L188" class="LineNr">188 </span>    <span class="subxComment"># call</span>
 <span id="L189" class="LineNr">189 </span>  e8/call  check-ints-equal/disp32
-<span id="L190" class="LineNr">190 </span>    <span class="Comment"># discard args</span>
-<span id="L191" class="LineNr">191 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    <span class="subxComment"># discard args</span>
+<span id="L191" class="LineNr">191 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L192" class="LineNr">192 </span>  c3/return
 <span id="L193" class="LineNr">193 </span>
 <span id="L194" class="LineNr">194 </span>test-compare-kernel-string-with-empty-array:
-<span id="L195" class="LineNr">195 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
-<span id="L196" class="LineNr">196 </span>    <span class="Comment"># push args</span>
+<span id="L195" class="LineNr">195 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
+<span id="L196" class="LineNr">196 </span>    <span class="subxComment"># push args</span>
 <span id="L197" class="LineNr">197 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L198" class="LineNr">198 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L199" class="LineNr">199 </span>    <span class="Comment"># call</span>
+<span id="L199" class="LineNr">199 </span>    <span class="subxComment"># call</span>
 <span id="L200" class="LineNr">200 </span>  e8/call  kernel-string-equal/disp32
-<span id="L201" class="LineNr">201 </span>    <span class="Comment"># discard args</span>
-<span id="L202" class="LineNr">202 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
-<span id="L204" class="LineNr">204 </span>    <span class="Comment"># push args</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxComment"># discard args</span>
+<span id="L202" class="LineNr">202 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L203" class="LineNr">203 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0)</span>
+<span id="L204" class="LineNr">204 </span>    <span class="subxComment"># push args</span>
 <span id="L205" class="LineNr">205 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
 <span id="L206" class="LineNr">206 </span>  68/push  0/imm32/false
 <span id="L207" class="LineNr">207 </span>  50/push-EAX
-<span id="L208" class="LineNr">208 </span>    <span class="Comment"># call</span>
+<span id="L208" class="LineNr">208 </span>    <span class="subxComment"># call</span>
 <span id="L209" class="LineNr">209 </span>  e8/call  check-ints-equal/disp32
-<span id="L210" class="LineNr">210 </span>    <span class="Comment"># discard args</span>
-<span id="L211" class="LineNr">211 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L210" class="LineNr">210 </span>    <span class="subxComment"># discard args</span>
+<span id="L211" class="LineNr">211 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L212" class="LineNr">212 </span>  c3/return
 <span id="L213" class="LineNr">213 </span>
 <span id="L214" class="LineNr">214 </span>test-compare-kernel-string-with-shorter-array:
-<span id="L215" class="LineNr">215 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
-<span id="L216" class="LineNr">216 </span>    <span class="Comment"># push args</span>
+<span id="L215" class="LineNr">215 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
+<span id="L216" class="LineNr">216 </span>    <span class="subxComment"># push args</span>
 <span id="L217" class="LineNr">217 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L218" class="LineNr">218 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxComment"># call</span>
 <span id="L220" class="LineNr">220 </span>  e8/call  kernel-string-equal/disp32
-<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
-<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
-<span id="L224" class="LineNr">224 </span>    <span class="Comment"># push args</span>
+<span id="L221" class="LineNr">221 </span>    <span class="subxComment"># discard args</span>
+<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0)</span>
+<span id="L224" class="LineNr">224 </span>    <span class="subxComment"># push args</span>
 <span id="L225" class="LineNr">225 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-shorter-array&quot;</span>/imm32
 <span id="L226" class="LineNr">226 </span>  68/push  0/imm32/false
 <span id="L227" class="LineNr">227 </span>  50/push-EAX
-<span id="L228" class="LineNr">228 </span>    <span class="Comment"># call</span>
+<span id="L228" class="LineNr">228 </span>    <span class="subxComment"># call</span>
 <span id="L229" class="LineNr">229 </span>  e8/call  check-ints-equal/disp32
-<span id="L230" class="LineNr">230 </span>    <span class="Comment"># discard args</span>
-<span id="L231" class="LineNr">231 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L230" class="LineNr">230 </span>    <span class="subxComment"># discard args</span>
+<span id="L231" class="LineNr">231 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L232" class="LineNr">232 </span>  c3/return
 <span id="L233" class="LineNr">233 </span>
 <span id="L234" class="LineNr">234 </span>test-compare-kernel-string-with-longer-array:
-<span id="L235" class="LineNr">235 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
-<span id="L236" class="LineNr">236 </span>    <span class="Comment"># push args</span>
+<span id="L235" class="LineNr">235 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
+<span id="L236" class="LineNr">236 </span>    <span class="subxComment"># push args</span>
 <span id="L237" class="LineNr">237 </span>  68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
 <span id="L238" class="LineNr">238 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L239" class="LineNr">239 </span>    <span class="Comment"># call</span>
+<span id="L239" class="LineNr">239 </span>    <span class="subxComment"># call</span>
 <span id="L240" class="LineNr">240 </span>  e8/call  kernel-string-equal/disp32
-<span id="L241" class="LineNr">241 </span>    <span class="Comment"># discard args</span>
-<span id="L242" class="LineNr">242 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L243" class="LineNr">243 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
-<span id="L244" class="LineNr">244 </span>    <span class="Comment"># push args</span>
+<span id="L241" class="LineNr">241 </span>    <span class="subxComment"># discard args</span>
+<span id="L242" class="LineNr">242 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L243" class="LineNr">243 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0)</span>
+<span id="L244" class="LineNr">244 </span>    <span class="subxComment"># push args</span>
 <span id="L245" class="LineNr">245 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-longer-array&quot;</span>/imm32
 <span id="L246" class="LineNr">246 </span>  68/push  0/imm32/false
 <span id="L247" class="LineNr">247 </span>  50/push-EAX
-<span id="L248" class="LineNr">248 </span>    <span class="Comment"># call</span>
+<span id="L248" class="LineNr">248 </span>    <span class="subxComment"># call</span>
 <span id="L249" class="LineNr">249 </span>  e8/call  check-ints-equal/disp32
-<span id="L250" class="LineNr">250 </span>    <span class="Comment"># discard args</span>
-<span id="L251" class="LineNr">251 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L250" class="LineNr">250 </span>    <span class="subxComment"># discard args</span>
+<span id="L251" class="LineNr">251 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L252" class="LineNr">252 </span>  c3/return
 <span id="L253" class="LineNr">253 </span>
 <span id="L254" class="LineNr">254 </span>== data
@@ -316,7 +314,7 @@ if ('onhashchange' in window) {
 <span id="L258" class="LineNr">258 </span><span class="Special">Abc-kernel-string</span>:
 <span id="L259" class="LineNr">259 </span>  41/<span class="Special">A</span> 62/b 63/c 00/null
 <span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L261" class="LineNr">261 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/053new_segment.subx.html b/html/subx/053new_segment.subx.html
index a36b1738..c0c5827d 100644
--- a/html/subx/053new_segment.subx.html
+++ b/html/subx/053new_segment.subx.html
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.CommentedCode { color: #6c6c6c; }
+.subxH2Comment { color: #00afff; }
 -->
 </style>
 
@@ -53,68 +53,68 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="Comment"># Create a new segment (for data) using mmap().</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment"># Create a new segment (for data) using mmap().</span>
 <span id="L2" class="LineNr"> 2 </span>
 <span id="L3" class="LineNr"> 3 </span>== code
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L7" class="LineNr"> 7 </span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
-<span id="L9" class="LineNr"> 9 </span>  <span class="Comment"># EAX = new-segment(0x1000)</span>
-<span id="L10" class="LineNr">10 </span>    <span class="Comment"># push args</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L9" class="LineNr"> 9 </span>  <span class="subxComment"># EAX = new-segment(0x1000)</span>
+<span id="L10" class="LineNr">10 </span>    <span class="subxComment"># push args</span>
 <span id="L11" class="LineNr">11 </span>  68/push  0x1000/imm32
-<span id="L12" class="LineNr">12 </span>    <span class="Comment"># call</span>
+<span id="L12" class="LineNr">12 </span>    <span class="subxComment"># call</span>
 <span id="L13" class="LineNr">13 </span>  e8/call  new-segment/disp32
-<span id="L14" class="LineNr">14 </span>    <span class="Comment"># discard args</span>
-<span id="L15" class="LineNr">15 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32                 <span class="Comment"># add to ESP</span>
+<span id="L14" class="LineNr">14 </span>    <span class="subxComment"># discard args</span>
+<span id="L15" class="LineNr">15 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32                 <span class="subxComment"># add to ESP</span>
 <span id="L16" class="LineNr">16 </span>
-<span id="L17" class="LineNr">17 </span>  <span class="Comment"># store to *EAX</span>
-<span id="L18" class="LineNr">18 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x34/imm32              <span class="Comment"># copy to *EAX</span>
+<span id="L17" class="LineNr">17 </span>  <span class="subxComment"># store to *EAX</span>
+<span id="L18" class="LineNr">18 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x34/imm32              <span class="subxComment"># copy to *EAX</span>
 <span id="L19" class="LineNr">19 </span>
-<span id="L20" class="LineNr">20 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L21" class="LineNr">21 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
+<span id="L20" class="LineNr">20 </span>  <span class="subxComment"># exit(EAX)</span>
+<span id="L21" class="LineNr">21 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EAX to EBX</span>
 <span id="L22" class="LineNr">22 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L23" class="LineNr">23 </span>  cd/syscall  0x80/imm8
 <span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span>new-segment:  <span class="Comment"># len : int -&gt; address</span>
-<span id="L26" class="LineNr">26 </span>  <span class="Comment"># prolog</span>
+<span id="L25" class="LineNr">25 </span>new-segment:  <span class="subxComment"># len : int -&gt; address</span>
+<span id="L26" class="LineNr">26 </span>  <span class="subxComment"># prolog</span>
 <span id="L27" class="LineNr">27 </span>  55/push-EBP
-<span id="L28" class="LineNr">28 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy ESP to EBP</span>
+<span id="L28" class="LineNr">28 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy ESP to EBP</span>
 <span id="L29" class="LineNr">29 </span>  53/push-EBX
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># copy len to mmap-new-segment.len</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Comment"># TODO: compute mmap-new-segment+4 before runtime</span>
-<span id="L32" class="LineNr">32 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L30" class="LineNr">30 </span>  <span class="subxComment"># copy len to mmap-new-segment.len</span>
+<span id="L31" class="LineNr">31 </span>  <span class="subxComment"># TODO: compute mmap-new-segment+4 before runtime</span>
+<span id="L32" class="LineNr">32 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L33" class="LineNr">33 </span>  bb/copy-to-EBX  mmap-new-segment/imm32
-<span id="L34" class="LineNr">34 </span>  89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *(EBX+4)</span>
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># mmap(mmap-new-segment)</span>
+<span id="L34" class="LineNr">34 </span>  89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EAX to *(EBX+4)</span>
+<span id="L35" class="LineNr">35 </span>  <span class="subxComment"># mmap(mmap-new-segment)</span>
 <span id="L36" class="LineNr">36 </span>  bb/copy-to-EBX  mmap-new-segment/imm32
 <span id="L37" class="LineNr">37 </span>  b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L38" class="LineNr">38 </span>  cd/syscall  0x80/imm8
-<span id="L39" class="LineNr">39 </span>  <span class="Comment"># epilog</span>
+<span id="L39" class="LineNr">39 </span>  <span class="subxComment"># epilog</span>
 <span id="L40" class="LineNr">40 </span>  5b/pop-to-EBX
-<span id="L41" class="LineNr">41 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EBP to ESP</span>
+<span id="L41" class="LineNr">41 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EBP to ESP</span>
 <span id="L42" class="LineNr">42 </span>  5d/pop-to-EBP
 <span id="L43" class="LineNr">43 </span>  c3/return
 <span id="L44" class="LineNr">44 </span>
 <span id="L45" class="LineNr">45 </span>== data
 <span id="L46" class="LineNr">46 </span>
-<span id="L47" class="LineNr">47 </span><span class="Comment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L48" class="LineNr">48 </span>mmap-new-segment:  <span class="Comment"># type mmap_arg_struct</span>
-<span id="L49" class="LineNr">49 </span>  <span class="Comment"># addr</span>
-<span id="L50" class="LineNr">50 </span>  00 00 00 00  <span class="Comment"># null</span>
-<span id="L51" class="LineNr">51 </span>  <span class="Comment"># len</span>
-<span id="L52" class="LineNr">52 </span>  00 00 00 00  <span class="Comment"># 0x1000</span>
-<span id="L53" class="LineNr">53 </span>  <span class="Comment"># protection flags</span>
-<span id="L54" class="LineNr">54 </span>  03 00 00 00  <span class="Comment"># PROT_READ | PROT_WRITE</span>
-<span id="L55" class="LineNr">55 </span>  <span class="Comment"># sharing flags</span>
-<span id="L56" class="LineNr">56 </span>  22 00 00 00  <span class="Comment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
-<span id="L57" class="LineNr">57 </span>  <span class="Comment"># fd</span>
-<span id="L58" class="LineNr">58 </span>  ff ff ff ff  <span class="Comment"># -1 since MAP_ANONYMOUS is specified</span>
-<span id="L59" class="LineNr">59 </span>  <span class="Comment"># offset</span>
-<span id="L60" class="LineNr">60 </span>  00 00 00 00  <span class="Comment"># 0 since MAP_ANONYMOUS is specified</span>
+<span id="L47" class="LineNr">47 </span><span class="subxComment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
+<span id="L48" class="LineNr">48 </span>mmap-new-segment:  <span class="subxComment"># type mmap_arg_struct</span>
+<span id="L49" class="LineNr">49 </span>  <span class="subxComment"># addr</span>
+<span id="L50" class="LineNr">50 </span>  00 00 00 00  <span class="subxComment"># null</span>
+<span id="L51" class="LineNr">51 </span>  <span class="subxComment"># len</span>
+<span id="L52" class="LineNr">52 </span>  00 00 00 00  <span class="subxComment"># 0x1000</span>
+<span id="L53" class="LineNr">53 </span>  <span class="subxComment"># protection flags</span>
+<span id="L54" class="LineNr">54 </span>  03 00 00 00  <span class="subxComment"># PROT_READ | PROT_WRITE</span>
+<span id="L55" class="LineNr">55 </span>  <span class="subxComment"># sharing flags</span>
+<span id="L56" class="LineNr">56 </span>  22 00 00 00  <span class="subxComment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
+<span id="L57" class="LineNr">57 </span>  <span class="subxComment"># fd</span>
+<span id="L58" class="LineNr">58 </span>  ff ff ff ff  <span class="subxH2Comment"># -1 since MAP_ANONYMOUS is specified</span>
+<span id="L59" class="LineNr">59 </span>  <span class="subxComment"># offset</span>
+<span id="L60" class="LineNr">60 </span>  00 00 00 00  <span class="subxComment"># 0 since MAP_ANONYMOUS is specified</span>
 <span id="L61" class="LineNr">61 </span>
-<span id="L62" class="LineNr">62 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L62" class="LineNr">62 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/054string_equal.subx.html b/html/subx/054string_equal.subx.html
index b0e53c9b..499baf29 100644
--- a/html/subx/054string_equal.subx.html
+++ b/html/subx/054string_equal.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -56,175 +54,175 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># Comparing 'regular' length-prefixed strings.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># Comparing 'regular' length-prefixed strings.</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span>== code
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L7" class="LineNr">  7 </span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># main:</span>
-<span id="L9" class="LineNr">  9 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L10" class="LineNr"> 10 </span>  <span class="Comment"># exit(Num-test-failures)</span>
-<span id="L11" class="LineNr"> 11 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># main:</span>
+<span id="L9" class="LineNr">  9 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L10" class="LineNr"> 10 </span>  <span class="subxComment"># exit(Num-test-failures)</span>
+<span id="L11" class="LineNr"> 11 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L12" class="LineNr"> 12 </span>  b8/copy-to-EAX  1/imm32
 <span id="L13" class="LineNr"> 13 </span>  cd/syscall  0x80/imm8
 <span id="L14" class="LineNr"> 14 </span>
-<span id="L15" class="LineNr"> 15 </span>string-equal:  <span class="Comment"># s : string, benchmark : string -&gt; EAX : boolean</span>
-<span id="L16" class="LineNr"> 16 </span>  <span class="Comment"># prolog</span>
+<span id="L15" class="LineNr"> 15 </span>string-equal:  <span class="subxComment"># s : string, benchmark : string -&gt; EAX : boolean</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="subxComment"># prolog</span>
 <span id="L17" class="LineNr"> 17 </span>  55/push-EBP
-<span id="L18" class="LineNr"> 18 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Comment"># save registers</span>
+<span id="L18" class="LineNr"> 18 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L19" class="LineNr"> 19 </span>  <span class="subxComment"># save registers</span>
 <span id="L20" class="LineNr"> 20 </span>  51/push-ECX
 <span id="L21" class="LineNr"> 21 </span>  52/push-EDX
 <span id="L22" class="LineNr"> 22 </span>  53/push-EBX
 <span id="L23" class="LineNr"> 23 </span>  56/push-ESI
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># pseudocode:</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment">#   if s.length != b.length return false</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Comment">#   for i = 0;  i &lt; s.length;  ++i</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Comment">#     if s[i] != b[i] return false</span>
-<span id="L28" class="LineNr"> 28 </span>  <span class="Comment">#   return true</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Comment"># registers:</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Comment">#   i: ECX</span>
-<span id="L31" class="LineNr"> 31 </span>  <span class="Comment">#   s.length: EDX</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Comment">#   b.length: EBX</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Comment">#   b[i]: EBX</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Comment">#   s[i]: EAX</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Comment">#</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Comment"># var s/EAX : (address array byte)</span>
-<span id="L37" class="LineNr"> 37 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L38" class="LineNr"> 38 </span>  <span class="Comment"># var benchmark/EBX : (address array byte)</span>
-<span id="L39" class="LineNr"> 39 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
-<span id="L40" class="LineNr"> 40 </span>  <span class="Comment"># if s.length != b.length return false</span>
-<span id="L41" class="LineNr"> 41 </span>    <span class="Comment"># EDX = s.length</span>
-<span id="L42" class="LineNr"> 42 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to EDX</span>
-<span id="L43" class="LineNr"> 43 </span>    <span class="Comment"># compare s.length and b.length</span>
-<span id="L44" class="LineNr"> 44 </span>  39/compare                      0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare *EBX with EDX</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="subxComment"># pseudocode:</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="subxComment">#   if s.length != b.length return false</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="subxComment">#   for i = 0;  i &lt; s.length;  ++i</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="subxComment">#     if s[i] != b[i] return false</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="subxComment">#   return true</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="subxComment"># registers:</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="subxComment">#   i: ECX</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="subxComment">#   s.length: EDX</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="subxComment">#   b.length: EBX</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="subxComment">#   b[i]: EBX</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="subxComment">#   s[i]: EAX</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="subxComment">#</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="subxComment"># var s/EAX : (address array byte)</span>
+<span id="L37" class="LineNr"> 37 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="subxComment"># var benchmark/EBX : (address array byte)</span>
+<span id="L39" class="LineNr"> 39 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L40" class="LineNr"> 40 </span>  <span class="subxComment"># if s.length != b.length return false</span>
+<span id="L41" class="LineNr"> 41 </span>    <span class="subxComment"># EDX = s.length</span>
+<span id="L42" class="LineNr"> 42 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to EDX</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="subxComment"># compare s.length and b.length</span>
+<span id="L44" class="LineNr"> 44 </span>  39/compare                      0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare *EBX with EDX</span>
 <span id="L45" class="LineNr"> 45 </span>  75/jump-if-not-equal  $string-equal:false/disp8
 <span id="L46" class="LineNr"> 46 </span>$string-equal:lengths:
-<span id="L47" class="LineNr"> 47 </span>  <span class="Comment"># var i/ECX : int = 0</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="subxComment"># var i/ECX : int = 0</span>
 <span id="L48" class="LineNr"> 48 </span>  b9/copy-to-ECX  0/imm32
-<span id="L49" class="LineNr"> 49 </span>  <span class="Comment"># EBX = &amp;b[i]</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="subxComment"># EBX = &amp;b[i]</span>
 <span id="L50" class="LineNr"> 50 </span>  43/inc-EBX
-<span id="L51" class="LineNr"> 51 </span>  <span class="Comment"># EAX = &amp;s[i]</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="subxComment"># EAX = &amp;s[i]</span>
 <span id="L52" class="LineNr"> 52 </span>  40/inc-EAX
 <span id="L53" class="LineNr"> 53 </span>$string-equal:loop:
-<span id="L54" class="LineNr"> 54 </span>  <span class="Comment"># if i &gt;= s.length return true</span>
-<span id="L55" class="LineNr"> 55 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="subxComment"># if i &gt;= s.length return true</span>
+<span id="L55" class="LineNr"> 55 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
 <span id="L56" class="LineNr"> 56 </span>  7d/jump-if-greater-or-equal  $string-equal:true/disp8
-<span id="L57" class="LineNr"> 57 </span>  <span class="Comment"># if b[i] != s[i] return false</span>
-<span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># ESI = s[i]</span>
-<span id="L59" class="LineNr"> 59 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to ESI</span>
-<span id="L60" class="LineNr"> 60 </span>    <span class="Comment"># compare b[i] with ESI</span>
-<span id="L61" class="LineNr"> 61 </span>  39/compare                      0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          6/r32/ESI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare *EBX with ESI</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="subxComment"># if b[i] != s[i] return false</span>
+<span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># ESI = s[i]</span>
+<span id="L59" class="LineNr"> 59 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          6/r32/ESI  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ESI</span>
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># compare b[i] with ESI</span>
+<span id="L61" class="LineNr"> 61 </span>  39/compare                      0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          6/r32/ESI  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare *EBX with ESI</span>
 <span id="L62" class="LineNr"> 62 </span>  75/jump-if-not-equal  $string-equal:false/disp8
-<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># ++i</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="subxComment"># ++i</span>
 <span id="L64" class="LineNr"> 64 </span>  41/inc-ECX
 <span id="L65" class="LineNr"> 65 </span>  40/inc-EAX
 <span id="L66" class="LineNr"> 66 </span>  43/inc-EBX
-<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># loop</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="subxComment"># loop</span>
 <span id="L68" class="LineNr"> 68 </span>  eb/jump  $string-equal:loop/disp8
 <span id="L69" class="LineNr"> 69 </span>$string-equal:true:
-<span id="L70" class="LineNr"> 70 </span>  <span class="Comment"># return true</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="subxComment"># return true</span>
 <span id="L71" class="LineNr"> 71 </span>  b8/copy-to-EAX  1/imm32
 <span id="L72" class="LineNr"> 72 </span>  eb/jump  $string-equal:end/disp8
 <span id="L73" class="LineNr"> 73 </span>$string-equal:false:
-<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># return false</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="subxComment"># return false</span>
 <span id="L75" class="LineNr"> 75 </span>  b8/copy-to-EAX  0/imm32
 <span id="L76" class="LineNr"> 76 </span>$string-equal:end:
-<span id="L77" class="LineNr"> 77 </span>  <span class="Comment"># restore registers</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="subxComment"># restore registers</span>
 <span id="L78" class="LineNr"> 78 </span>  5e/pop-to-ESI
 <span id="L79" class="LineNr"> 79 </span>  5b/pop-to-EBX
 <span id="L80" class="LineNr"> 80 </span>  5a/pop-to-EDX
 <span id="L81" class="LineNr"> 81 </span>  59/pop-to-ECX
-<span id="L82" class="LineNr"> 82 </span>  <span class="Comment"># epilog</span>
-<span id="L83" class="LineNr"> 83 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="subxComment"># epilog</span>
+<span id="L83" class="LineNr"> 83 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L84" class="LineNr"> 84 </span>  5d/pop-to-EBP
 <span id="L85" class="LineNr"> 85 </span>  c3/return
 <span id="L86" class="LineNr"> 86 </span>
-<span id="L87" class="LineNr"> 87 </span><span class="SalientComment">## tests</span>
+<span id="L87" class="LineNr"> 87 </span><span class="subxComment">## tests</span>
 <span id="L88" class="LineNr"> 88 </span>
 <span id="L89" class="LineNr"> 89 </span>test-compare-empty-with-empty-string:
-<span id="L90" class="LineNr"> 90 </span>  <span class="Comment"># EAX = string-equal(&quot;&quot;, &quot;&quot;)</span>
-<span id="L91" class="LineNr"> 91 </span>    <span class="Comment"># push args</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="subxComment"># EAX = string-equal(&quot;&quot;, &quot;&quot;)</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># push args</span>
 <span id="L92" class="LineNr"> 92 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L93" class="LineNr"> 93 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># call</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxComment"># call</span>
 <span id="L95" class="LineNr"> 95 </span>  e8/call  string-equal/disp32
-<span id="L96" class="LineNr"> 96 </span>    <span class="Comment"># discard args</span>
-<span id="L97" class="LineNr"> 97 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Comment"># push args</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># discard args</span>
+<span id="L97" class="LineNr"> 97 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="subxComment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="subxComment"># push args</span>
 <span id="L100" class="LineNr">100 </span>  68/push  <span class="Constant">&quot;F - test-compare-empty-with-empty-string&quot;</span>/imm32
 <span id="L101" class="LineNr">101 </span>  68/push  1/imm32/true
 <span id="L102" class="LineNr">102 </span>  50/push-EAX
-<span id="L103" class="LineNr">103 </span>    <span class="Comment"># call</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxComment"># call</span>
 <span id="L104" class="LineNr">104 </span>  e8/call  check-ints-equal/disp32
-<span id="L105" class="LineNr">105 </span>    <span class="Comment"># discard args</span>
-<span id="L106" class="LineNr">106 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L105" class="LineNr">105 </span>    <span class="subxComment"># discard args</span>
+<span id="L106" class="LineNr">106 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L107" class="LineNr">107 </span>  c3/return
 <span id="L108" class="LineNr">108 </span>
-<span id="L109" class="LineNr">109 </span>test-compare-empty-with-non-empty-string:  <span class="Comment"># also checks length-mismatch code path</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Comment"># EAX = string-equal(&quot;&quot;, &quot;Abc&quot;)</span>
-<span id="L111" class="LineNr">111 </span>    <span class="Comment"># push args</span>
+<span id="L109" class="LineNr">109 </span>test-compare-empty-with-non-empty-string:  <span class="subxComment"># also checks length-mismatch code path</span>
+<span id="L110" class="LineNr">110 </span>  <span class="subxComment"># EAX = string-equal(&quot;&quot;, &quot;Abc&quot;)</span>
+<span id="L111" class="LineNr">111 </span>    <span class="subxComment"># push args</span>
 <span id="L112" class="LineNr">112 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L113" class="LineNr">113 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L114" class="LineNr">114 </span>    <span class="Comment"># call</span>
+<span id="L114" class="LineNr">114 </span>    <span class="subxComment"># call</span>
 <span id="L115" class="LineNr">115 </span>  e8/call  string-equal/disp32
-<span id="L116" class="LineNr">116 </span>    <span class="Comment"># discard args</span>
-<span id="L117" class="LineNr">117 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
-<span id="L119" class="LineNr">119 </span>    <span class="Comment"># push args</span>
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># discard args</span>
+<span id="L117" class="LineNr">117 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L118" class="LineNr">118 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L119" class="LineNr">119 </span>    <span class="subxComment"># push args</span>
 <span id="L120" class="LineNr">120 </span>  68/push  <span class="Constant">&quot;F - test-compare-empty-with-non-empty-string&quot;</span>/imm32
 <span id="L121" class="LineNr">121 </span>  68/push  0/imm32/false
 <span id="L122" class="LineNr">122 </span>  50/push-EAX
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># call</span>
+<span id="L123" class="LineNr">123 </span>    <span class="subxComment"># call</span>
 <span id="L124" class="LineNr">124 </span>  e8/call  check-ints-equal/disp32
-<span id="L125" class="LineNr">125 </span>    <span class="Comment"># discard args</span>
-<span id="L126" class="LineNr">126 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L125" class="LineNr">125 </span>    <span class="subxComment"># discard args</span>
+<span id="L126" class="LineNr">126 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L127" class="LineNr">127 </span>  c3/return
 <span id="L128" class="LineNr">128 </span>
 <span id="L129" class="LineNr">129 </span>test-compare-equal-strings:
-<span id="L130" class="LineNr">130 </span>  <span class="Comment"># EAX = string-equal(&quot;Abc&quot;, &quot;Abc&quot;)</span>
-<span id="L131" class="LineNr">131 </span>    <span class="Comment"># push args</span>
+<span id="L130" class="LineNr">130 </span>  <span class="subxComment"># EAX = string-equal(&quot;Abc&quot;, &quot;Abc&quot;)</span>
+<span id="L131" class="LineNr">131 </span>    <span class="subxComment"># push args</span>
 <span id="L132" class="LineNr">132 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L133" class="LineNr">133 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L134" class="LineNr">134 </span>    <span class="Comment"># call</span>
+<span id="L134" class="LineNr">134 </span>    <span class="subxComment"># call</span>
 <span id="L135" class="LineNr">135 </span>  e8/call  string-equal/disp32
-<span id="L136" class="LineNr">136 </span>    <span class="Comment"># discard args</span>
-<span id="L137" class="LineNr">137 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
-<span id="L139" class="LineNr">139 </span>    <span class="Comment"># push args</span>
+<span id="L136" class="LineNr">136 </span>    <span class="subxComment"># discard args</span>
+<span id="L137" class="LineNr">137 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L138" class="LineNr">138 </span>  <span class="subxComment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxComment"># push args</span>
 <span id="L140" class="LineNr">140 </span>  68/push  <span class="Constant">&quot;F - test-compare-equal-strings&quot;</span>/imm32
 <span id="L141" class="LineNr">141 </span>  68/push  1/imm32/true
 <span id="L142" class="LineNr">142 </span>  50/push-EAX
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># call</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxComment"># call</span>
 <span id="L144" class="LineNr">144 </span>  e8/call  check-ints-equal/disp32
-<span id="L145" class="LineNr">145 </span>    <span class="Comment"># discard args</span>
-<span id="L146" class="LineNr">146 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxComment"># discard args</span>
+<span id="L146" class="LineNr">146 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L147" class="LineNr">147 </span>  c3/return
 <span id="L148" class="LineNr">148 </span>
 <span id="L149" class="LineNr">149 </span>test-compare-inequal-strings-equal-lengths:
-<span id="L150" class="LineNr">150 </span>  <span class="Comment"># EAX = string-equal(&quot;Abc&quot;, &quot;Adc&quot;)</span>
-<span id="L151" class="LineNr">151 </span>    <span class="Comment"># push args</span>
+<span id="L150" class="LineNr">150 </span>  <span class="subxComment"># EAX = string-equal(&quot;Abc&quot;, &quot;Adc&quot;)</span>
+<span id="L151" class="LineNr">151 </span>    <span class="subxComment"># push args</span>
 <span id="L152" class="LineNr">152 </span>  68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
 <span id="L153" class="LineNr">153 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L154" class="LineNr">154 </span>    <span class="Comment"># call</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxComment"># call</span>
 <span id="L155" class="LineNr">155 </span>  e8/call  string-equal/disp32
-<span id="L156" class="LineNr">156 </span>    <span class="Comment"># discard args</span>
-<span id="L157" class="LineNr">157 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
-<span id="L159" class="LineNr">159 </span>    <span class="Comment"># push args</span>
+<span id="L156" class="LineNr">156 </span>    <span class="subxComment"># discard args</span>
+<span id="L157" class="LineNr">157 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L158" class="LineNr">158 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># push args</span>
 <span id="L160" class="LineNr">160 </span>  68/push  <span class="Constant">&quot;F - test-compare-inequal-strings-equal-lengths&quot;</span>/imm32
 <span id="L161" class="LineNr">161 </span>  68/push  0/imm32/false
 <span id="L162" class="LineNr">162 </span>  50/push-EAX
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># call</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxComment"># call</span>
 <span id="L164" class="LineNr">164 </span>  e8/call  check-ints-equal/disp32
-<span id="L165" class="LineNr">165 </span>    <span class="Comment"># discard args</span>
-<span id="L166" class="LineNr">166 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L165" class="LineNr">165 </span>    <span class="subxComment"># discard args</span>
+<span id="L166" class="LineNr">166 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L167" class="LineNr">167 </span>  c3/return
 <span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L169" class="LineNr">169 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/055trace.subx.html b/html/subx/055trace.subx.html
index e6ff58a3..37285ec6 100644
--- a/html/subx/055trace.subx.html
+++ b/html/subx/055trace.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -56,365 +54,365 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># primitives for emitting traces to a trace stream, and for tests to check the trace stream</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># A trace stream looks like this:</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment">#   read : int  # index that we've read until</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">#   write : int  # index at which writes go</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">#   data : (array byte)  # prefixed by length as usual</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># In a real trace the data will be in a special segment set aside for the purpose.</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">#</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># primitives for operating on traces:</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   - initialize-trace-stream (update global variable)</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   - trace: stream, string</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#   - die: stream (exit(1) if using real trace)</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">#   - check-trace-contains: stream, string/line, string/message (scans only from stream's read pointer, prints message to stderr on failure, updates stream's read pointer)</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   - rewind-reads: stream (resets read pointer)</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   - scan-to-next-line: stream (advance read pointer past next newline)</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">#</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment"># Traces are very fundamental, so many of the helpers we create here won't be</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># used elsewhere; we'll switch to more bounds-checked variants. But here we get</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment"># bounds-checking for free; we allocate a completely disjoint segment for trace</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment"># data, and overflowing it will generate a page fault.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># primitives for emitting traces to a trace stream, and for tests to check the trace stream</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># A trace stream looks like this:</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment">#   read : int  # index that we've read until</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment">#   write : int  # index at which writes go</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#   data : (array byte)  # prefixed by length as usual</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># In a real trace the data will be in a special segment set aside for the purpose.</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment"># primitives for operating on traces:</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#   - initialize-trace-stream (update global variable)</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   - trace: stream, string</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#   - die: stream (exit(1) if using real trace)</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment">#   - check-trace-contains: stream, string/line, string/message (scans only from stream's read pointer, prints message to stderr on failure, updates stream's read pointer)</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment">#   - rewind-reads: stream (resets read pointer)</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment">#   - scan-to-next-line: stream (advance read pointer past next newline)</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment">#</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxComment"># Traces are very fundamental, so many of the helpers we create here won't be</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment"># used elsewhere; we'll switch to more bounds-checked variants. But here we get</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment"># bounds-checking for free; we allocate a completely disjoint segment for trace</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># data, and overflowing it will generate a page fault.</span>
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span>== data
 <span id="L23" class="LineNr"> 23 </span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment"># We'll save the address of the trace segment here.</span>
+<span id="L24" class="LineNr"> 24 </span><span class="subxComment"># We'll save the address of the trace segment here.</span>
 <span id="L25" class="LineNr"> 25 </span><span class="Special">Trace-stream</span>:
 <span id="L26" class="LineNr"> 26 </span>  00 00 00 00
 <span id="L27" class="LineNr"> 27 </span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment"># Fake trace-stream for tests.</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># Also illustrates the layout of the real trace-stream (segment).</span>
+<span id="L28" class="LineNr"> 28 </span><span class="subxComment"># Fake trace-stream for tests.</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># Also illustrates the layout of the real trace-stream (segment).</span>
 <span id="L30" class="LineNr"> 30 </span>_test-trace-stream:
-<span id="L31" class="LineNr"> 31 </span>  <span class="Comment"># current write index</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="subxComment"># current write index</span>
 <span id="L32" class="LineNr"> 32 </span>  00 00 00 00
-<span id="L33" class="LineNr"> 33 </span>  <span class="Comment"># current read index</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="subxComment"># current read index</span>
 <span id="L34" class="LineNr"> 34 </span>  00 00 00 00
-<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L36" class="LineNr"> 36 </span>  08 00 00 00
-<span id="L37" class="LineNr"> 37 </span>  <span class="Comment"># data</span>
-<span id="L38" class="LineNr"> 38 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="subxComment"># data</span>
+<span id="L38" class="LineNr"> 38 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L39" class="LineNr"> 39 </span>
 <span id="L40" class="LineNr"> 40 </span>== code
-<span id="L41" class="LineNr"> 41 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L41" class="LineNr"> 41 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L42" class="LineNr"> 42 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L43" class="LineNr"> 43 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L44" class="LineNr"> 44 </span>
-<span id="L45" class="LineNr"> 45 </span><span class="Comment"># main:</span>
-<span id="L46" class="LineNr"> 46 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
-<span id="L48" class="LineNr"> 48 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L45" class="LineNr"> 45 </span><span class="subxComment"># main:</span>
+<span id="L46" class="LineNr"> 46 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L48" class="LineNr"> 48 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L49" class="LineNr"> 49 </span>  b8/copy-to-EAX  1/imm32
 <span id="L50" class="LineNr"> 50 </span>  cd/syscall  0x80/imm8
 <span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span><span class="Comment"># Allocate a new segment for the trace stream, initialize its length, and save its address to Trace-stream.</span>
-<span id="L53" class="LineNr"> 53 </span><span class="Comment"># The Trace-stream segment will consist of variable-length lines separated by newlines (0x0a)</span>
+<span id="L52" class="LineNr"> 52 </span><span class="subxComment"># Allocate a new segment for the trace stream, initialize its length, and save its address to Trace-stream.</span>
+<span id="L53" class="LineNr"> 53 </span><span class="subxComment"># The Trace-stream segment will consist of variable-length lines separated by newlines (0x0a)</span>
 <span id="L54" class="LineNr"> 54 </span>initialize-trace-stream:
-<span id="L55" class="LineNr"> 55 </span>  <span class="Comment"># EAX = new-segment(0x1000)</span>
-<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># push args</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="subxComment"># EAX = new-segment(0x1000)</span>
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># push args</span>
 <span id="L57" class="LineNr"> 57 </span>  68/push  0x1000/imm32/<span class="Special">N</span>
-<span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># call</span>
+<span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># call</span>
 <span id="L59" class="LineNr"> 59 </span>  e8/call  new-segment/disp32
-<span id="L60" class="LineNr"> 60 </span>    <span class="Comment"># discard args</span>
-<span id="L61" class="LineNr"> 61 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># copy EAX to *Trace-stream</span>
-<span id="L63" class="LineNr"> 63 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   <span class="Special">Trace-stream</span>/disp32               <span class="Comment"># copy EAX to *Trace-stream</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># Trace-stream.length = 0x1000/N - 12</span>
-<span id="L65" class="LineNr"> 65 </span>  c7          0/copy              1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         0xff4/imm32       <span class="Comment"># copy 0xff4 to *(EAX+8)</span>
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># discard args</span>
+<span id="L61" class="LineNr"> 61 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="subxComment"># copy EAX to *Trace-stream</span>
+<span id="L63" class="LineNr"> 63 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="Special">Trace-stream</span>/disp32               <span class="subxComment"># copy EAX to *Trace-stream</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="subxComment"># Trace-stream.length = 0x1000/N - 12</span>
+<span id="L65" class="LineNr"> 65 </span>  c7          0/copy              1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0xff4/imm32       <span class="subxComment"># copy 0xff4 to *(EAX+8)</span>
 <span id="L66" class="LineNr"> 66 </span>  c3/return
 <span id="L67" class="LineNr"> 67 </span>
-<span id="L68" class="LineNr"> 68 </span><span class="Comment"># Append a string to the given trace stream.</span>
-<span id="L69" class="LineNr"> 69 </span><span class="Comment"># Silently give up if it's already full. Or truncate the string if there isn't enough room.</span>
-<span id="L70" class="LineNr"> 70 </span>trace:  <span class="Comment"># t : (address trace-stream), line : string</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># prolog</span>
+<span id="L68" class="LineNr"> 68 </span><span class="subxComment"># Append a string to the given trace stream.</span>
+<span id="L69" class="LineNr"> 69 </span><span class="subxComment"># Silently give up if it's already full. Or truncate the string if there isn't enough room.</span>
+<span id="L70" class="LineNr"> 70 </span>trace:  <span class="subxComment"># t : (address trace-stream), line : string</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="subxComment"># prolog</span>
 <span id="L72" class="LineNr"> 72 </span>  55/push-EBP
-<span id="L73" class="LineNr"> 73 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># save registers</span>
+<span id="L73" class="LineNr"> 73 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="subxComment"># save registers</span>
 <span id="L75" class="LineNr"> 75 </span>  50/push-EAX
 <span id="L76" class="LineNr"> 76 </span>  51/push-ECX
 <span id="L77" class="LineNr"> 77 </span>  52/push-EDX
 <span id="L78" class="LineNr"> 78 </span>  53/push-EBX
 <span id="L79" class="LineNr"> 79 </span>  56/push-ESI
 <span id="L80" class="LineNr"> 80 </span>  57/push-EDI
-<span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># EDI = t</span>
-<span id="L82" class="LineNr"> 82 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDI</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment"># ESI = line</span>
-<span id="L84" class="LineNr"> 84 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># ECX = t-&gt;write</span>
-<span id="L86" class="LineNr"> 86 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDI to ECX</span>
-<span id="L87" class="LineNr"> 87 </span>  <span class="Comment"># EDX = t-&gt;length</span>
-<span id="L88" class="LineNr"> 88 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EDI+8) to EDX</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># EAX = _append-3(&amp;t-&gt;data[t-&gt;write], &amp;t-&gt;data[t-&gt;length], line)</span>
-<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># push line</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="subxComment"># EDI = t</span>
+<span id="L82" class="LineNr"> 82 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="subxComment"># ESI = line</span>
+<span id="L84" class="LineNr"> 84 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="subxComment"># ECX = t-&gt;write</span>
+<span id="L86" class="LineNr"> 86 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="subxComment"># EDX = t-&gt;length</span>
+<span id="L88" class="LineNr"> 88 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="subxComment"># EAX = _append-3(&amp;t-&gt;data[t-&gt;write], &amp;t-&gt;data[t-&gt;length], line)</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># push line</span>
 <span id="L91" class="LineNr"> 91 </span>  56/push-ESI
-<span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># push &amp;t-&gt;data[t-&gt;length]</span>
-<span id="L93" class="LineNr"> 93 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+EDX+12 to EBX</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="subxComment"># push &amp;t-&gt;data[t-&gt;length]</span>
+<span id="L93" class="LineNr"> 93 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EDX+12 to EBX</span>
 <span id="L94" class="LineNr"> 94 </span>  53/push-EBX
-<span id="L95" class="LineNr"> 95 </span>    <span class="Comment"># push &amp;t-&gt;data[t-&gt;write]</span>
-<span id="L96" class="LineNr"> 96 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+ECX+12 to EBX</span>
+<span id="L95" class="LineNr"> 95 </span>    <span class="subxComment"># push &amp;t-&gt;data[t-&gt;write]</span>
+<span id="L96" class="LineNr"> 96 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
 <span id="L97" class="LineNr"> 97 </span>  53/push-EBX
-<span id="L98" class="LineNr"> 98 </span>    <span class="Comment"># call</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxComment"># call</span>
 <span id="L99" class="LineNr"> 99 </span>  e8/call  _append-3/disp32
-<span id="L100" class="LineNr">100 </span>    <span class="Comment"># discard args</span>
-<span id="L101" class="LineNr">101 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Comment"># if EAX == 0 return</span>
-<span id="L103" class="LineNr">103 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EDX</span>
+<span id="L100" class="LineNr">100 </span>    <span class="subxComment"># discard args</span>
+<span id="L101" class="LineNr">101 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L102" class="LineNr">102 </span>  <span class="subxComment"># if EAX == 0 return</span>
+<span id="L103" class="LineNr">103 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EDX</span>
 <span id="L104" class="LineNr">104 </span>  74/jump-if-equal  $trace:end/disp8
-<span id="L105" class="LineNr">105 </span>  <span class="Comment"># t-&gt;write += EAX</span>
-<span id="L106" class="LineNr">106 </span>  01/add                          0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *EDI</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Comment"># refresh ECX = t-&gt;write</span>
-<span id="L108" class="LineNr">108 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDI to ECX</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Comment"># EAX = _append-3(&amp;t-&gt;data[t-&gt;write], &amp;t-&gt;data[t-&gt;length], line)</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Comment"># push line</span>
+<span id="L105" class="LineNr">105 </span>  <span class="subxComment"># t-&gt;write += EAX</span>
+<span id="L106" class="LineNr">106 </span>  01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
+<span id="L107" class="LineNr">107 </span>  <span class="subxComment"># refresh ECX = t-&gt;write</span>
+<span id="L108" class="LineNr">108 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L109" class="LineNr">109 </span>  <span class="subxComment"># EAX = _append-3(&amp;t-&gt;data[t-&gt;write], &amp;t-&gt;data[t-&gt;length], line)</span>
+<span id="L110" class="LineNr">110 </span>    <span class="subxComment"># push line</span>
 <span id="L111" class="LineNr">111 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L112" class="LineNr">112 </span>    <span class="Comment"># push &amp;t-&gt;data[t-&gt;length]</span>
-<span id="L113" class="LineNr">113 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+EDX+12 to EBX</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxComment"># push &amp;t-&gt;data[t-&gt;length]</span>
+<span id="L113" class="LineNr">113 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EDX+12 to EBX</span>
 <span id="L114" class="LineNr">114 </span>  53/push-EBX
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># push &amp;t-&gt;data[t-&gt;write]</span>
-<span id="L116" class="LineNr">116 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+ECX+12 to EBX</span>
+<span id="L115" class="LineNr">115 </span>    <span class="subxComment"># push &amp;t-&gt;data[t-&gt;write]</span>
+<span id="L116" class="LineNr">116 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
 <span id="L117" class="LineNr">117 </span>  53/push-EBX
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># call</span>
+<span id="L118" class="LineNr">118 </span>    <span class="subxComment"># call</span>
 <span id="L119" class="LineNr">119 </span>  e8/call  _append-3/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="Comment"># discard args</span>
-<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># t-&gt;write += EAX</span>
-<span id="L123" class="LineNr">123 </span>  01/add                          0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *EDI</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># discard args</span>
+<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L122" class="LineNr">122 </span>  <span class="subxComment"># t-&gt;write += EAX</span>
+<span id="L123" class="LineNr">123 </span>  01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
 <span id="L124" class="LineNr">124 </span>$trace:end:
-<span id="L125" class="LineNr">125 </span>  <span class="Comment"># restore registers</span>
+<span id="L125" class="LineNr">125 </span>  <span class="subxComment"># restore registers</span>
 <span id="L126" class="LineNr">126 </span>  5f/pop-to-EDI
 <span id="L127" class="LineNr">127 </span>  5e/pop-to-ESI
 <span id="L128" class="LineNr">128 </span>  5b/pop-to-EBX
 <span id="L129" class="LineNr">129 </span>  5a/pop-to-EDX
 <span id="L130" class="LineNr">130 </span>  59/pop-to-ECX
 <span id="L131" class="LineNr">131 </span>  58/pop-to-EAX
-<span id="L132" class="LineNr">132 </span>  <span class="Comment"># epilog</span>
-<span id="L133" class="LineNr">133 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L132" class="LineNr">132 </span>  <span class="subxComment"># epilog</span>
+<span id="L133" class="LineNr">133 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L134" class="LineNr">134 </span>  5d/pop-to-EBP
 <span id="L135" class="LineNr">135 </span>  c3/return
 <span id="L136" class="LineNr">136 </span>
-<span id="L137" class="LineNr">137 </span>clear-trace-stream:  <span class="Comment"># t : (address trace-stream)</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Comment"># prolog</span>
+<span id="L137" class="LineNr">137 </span>clear-trace-stream:  <span class="subxComment"># t : (address trace-stream)</span>
+<span id="L138" class="LineNr">138 </span>  <span class="subxComment"># prolog</span>
 <span id="L139" class="LineNr">139 </span>  55/push-EBP
-<span id="L140" class="LineNr">140 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Comment"># save registers</span>
+<span id="L140" class="LineNr">140 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L141" class="LineNr">141 </span>  <span class="subxComment"># save registers</span>
 <span id="L142" class="LineNr">142 </span>  50/push-EAX
 <span id="L143" class="LineNr">143 </span>  51/push-ECX
-<span id="L144" class="LineNr">144 </span>  <span class="Comment"># EAX = t</span>
-<span id="L145" class="LineNr">145 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Comment"># ECX = t-&gt;length</span>
-<span id="L147" class="LineNr">147 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EAX+8) to ECX</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Comment"># ECX = &amp;t-&gt;data[t-&gt;length]</span>
-<span id="L149" class="LineNr">149 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+12 to ECX</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Comment"># t-&gt;write = 0</span>
-<span id="L151" class="LineNr">151 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Comment"># t-&gt;read = 0</span>
-<span id="L153" class="LineNr">153 </span>  c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         0/imm32           <span class="Comment"># copy to *(EAX+4)</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Comment"># EAX = t-&gt;data</span>
-<span id="L155" class="LineNr">155 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to EAX</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Comment"># while (true)</span>
+<span id="L144" class="LineNr">144 </span>  <span class="subxComment"># EAX = t</span>
+<span id="L145" class="LineNr">145 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L146" class="LineNr">146 </span>  <span class="subxComment"># ECX = t-&gt;length</span>
+<span id="L147" class="LineNr">147 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EAX+8) to ECX</span>
+<span id="L148" class="LineNr">148 </span>  <span class="subxComment"># ECX = &amp;t-&gt;data[t-&gt;length]</span>
+<span id="L149" class="LineNr">149 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+ECX+12 to ECX</span>
+<span id="L150" class="LineNr">150 </span>  <span class="subxComment"># t-&gt;write = 0</span>
+<span id="L151" class="LineNr">151 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L152" class="LineNr">152 </span>  <span class="subxComment"># t-&gt;read = 0</span>
+<span id="L153" class="LineNr">153 </span>  c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EAX+4)</span>
+<span id="L154" class="LineNr">154 </span>  <span class="subxComment"># EAX = t-&gt;data</span>
+<span id="L155" class="LineNr">155 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to EAX</span>
+<span id="L156" class="LineNr">156 </span>  <span class="subxComment"># while (true)</span>
 <span id="L157" class="LineNr">157 </span>$clear-trace-stream:loop:
-<span id="L158" class="LineNr">158 </span>  <span class="Comment"># if EAX &gt;= ECX break</span>
-<span id="L159" class="LineNr">159 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L158" class="LineNr">158 </span>  <span class="subxComment"># if EAX &gt;= ECX break</span>
+<span id="L159" class="LineNr">159 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
 <span id="L160" class="LineNr">160 </span>  7d/jump-if-greater-or-equal  $clear-trace-stream:end/disp8
-<span id="L161" class="LineNr">161 </span>  <span class="Comment"># *EAX = 0</span>
-<span id="L162" class="LineNr">162 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Comment"># EAX += 4</span>
-<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to EAX</span>
+<span id="L161" class="LineNr">161 </span>  <span class="subxComment"># *EAX = 0</span>
+<span id="L162" class="LineNr">162 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L163" class="LineNr">163 </span>  <span class="subxComment"># EAX += 4</span>
+<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
 <span id="L165" class="LineNr">165 </span>  eb/jump  $clear-trace-stream:loop/disp8
 <span id="L166" class="LineNr">166 </span>$clear-trace-stream:end:
-<span id="L167" class="LineNr">167 </span>  <span class="Comment"># restore registers</span>
+<span id="L167" class="LineNr">167 </span>  <span class="subxComment"># restore registers</span>
 <span id="L168" class="LineNr">168 </span>  59/pop-to-ECX
 <span id="L169" class="LineNr">169 </span>  58/pop-to-EAX
-<span id="L170" class="LineNr">170 </span>  <span class="Comment"># epilog</span>
-<span id="L171" class="LineNr">171 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L170" class="LineNr">170 </span>  <span class="subxComment"># epilog</span>
+<span id="L171" class="LineNr">171 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L172" class="LineNr">172 </span>  5d/pop-to-EBP
 <span id="L173" class="LineNr">173 </span>  c3/return
 <span id="L174" class="LineNr">174 </span>
-<span id="L175" class="LineNr">175 </span><span class="SalientComment">## tests</span>
+<span id="L175" class="LineNr">175 </span><span class="subxComment">## tests</span>
 <span id="L176" class="LineNr">176 </span>
 <span id="L177" class="LineNr">177 </span>test-trace-single:
-<span id="L178" class="LineNr">178 </span>  <span class="Comment"># clear-trace-stream(_test-trace-stream)</span>
-<span id="L179" class="LineNr">179 </span>    <span class="Comment"># push args</span>
+<span id="L178" class="LineNr">178 </span>  <span class="subxComment"># clear-trace-stream(_test-trace-stream)</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxComment"># push args</span>
 <span id="L180" class="LineNr">180 </span>  68/push  _test-trace-stream/imm32
-<span id="L181" class="LineNr">181 </span>    <span class="Comment"># call</span>
+<span id="L181" class="LineNr">181 </span>    <span class="subxComment"># call</span>
 <span id="L182" class="LineNr">182 </span>  e8/call  clear-trace-stream/disp32
-<span id="L183" class="LineNr">183 </span>    <span class="Comment"># discard args</span>
-<span id="L184" class="LineNr">184 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L185" class="LineNr">185 </span>  <span class="Comment"># trace(_test-trace-stream, &quot;Ab&quot;)</span>
-<span id="L186" class="LineNr">186 </span>    <span class="Comment"># push args</span>
+<span id="L183" class="LineNr">183 </span>    <span class="subxComment"># discard args</span>
+<span id="L184" class="LineNr">184 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L185" class="LineNr">185 </span>  <span class="subxComment"># trace(_test-trace-stream, &quot;Ab&quot;)</span>
+<span id="L186" class="LineNr">186 </span>    <span class="subxComment"># push args</span>
 <span id="L187" class="LineNr">187 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L188" class="LineNr">188 </span>  68/push  _test-trace-stream/imm32
-<span id="L189" class="LineNr">189 </span>    <span class="Comment"># call</span>
+<span id="L189" class="LineNr">189 </span>    <span class="subxComment"># call</span>
 <span id="L190" class="LineNr">190 </span>  e8/call  trace/disp32
-<span id="L191" class="LineNr">191 </span>    <span class="Comment"># discard args</span>
-<span id="L192" class="LineNr">192 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Comment"># check-ints-equal(*_test-trace-stream.data, 41/A 62/b 0a/newline 00, msg)</span>
-<span id="L194" class="LineNr">194 </span>    <span class="Comment"># push args</span>
+<span id="L191" class="LineNr">191 </span>    <span class="subxComment"># discard args</span>
+<span id="L192" class="LineNr">192 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L193" class="LineNr">193 </span>  <span class="subxComment"># check-ints-equal(*_test-trace-stream.data, 41/A 62/b 0a/newline 00, msg)</span>
+<span id="L194" class="LineNr">194 </span>    <span class="subxComment"># push args</span>
 <span id="L195" class="LineNr">195 </span>  68/push  <span class="Constant">&quot;F - test-trace-single&quot;</span>/imm32
 <span id="L196" class="LineNr">196 </span>  68/push  0x0a6241/imm32/<span class="Special">Ab-newline</span>
-<span id="L197" class="LineNr">197 </span>    <span class="Comment"># push *_test-trace-stream.data</span>
+<span id="L197" class="LineNr">197 </span>    <span class="subxComment"># push *_test-trace-stream.data</span>
 <span id="L198" class="LineNr">198 </span>  b8/copy-to-EAX  _test-trace-stream/imm32
-<span id="L199" class="LineNr">199 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L200" class="LineNr">200 </span>    <span class="Comment"># call</span>
+<span id="L199" class="LineNr">199 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L200" class="LineNr">200 </span>    <span class="subxComment"># call</span>
 <span id="L201" class="LineNr">201 </span>  e8/call  check-ints-equal/disp32
-<span id="L202" class="LineNr">202 </span>    <span class="Comment"># discard args</span>
-<span id="L203" class="LineNr">203 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment"># end</span>
+<span id="L202" class="LineNr">202 </span>    <span class="subxComment"># discard args</span>
+<span id="L203" class="LineNr">203 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L204" class="LineNr">204 </span>  <span class="subxComment"># end</span>
 <span id="L205" class="LineNr">205 </span>  c3/return
 <span id="L206" class="LineNr">206 </span>
 <span id="L207" class="LineNr">207 </span>test-trace-appends:
-<span id="L208" class="LineNr">208 </span>  <span class="Comment"># clear-trace-stream(_test-trace-stream)</span>
-<span id="L209" class="LineNr">209 </span>    <span class="Comment"># push args</span>
+<span id="L208" class="LineNr">208 </span>  <span class="subxComment"># clear-trace-stream(_test-trace-stream)</span>
+<span id="L209" class="LineNr">209 </span>    <span class="subxComment"># push args</span>
 <span id="L210" class="LineNr">210 </span>  68/push  _test-trace-stream/imm32
-<span id="L211" class="LineNr">211 </span>    <span class="Comment"># call</span>
+<span id="L211" class="LineNr">211 </span>    <span class="subxComment"># call</span>
 <span id="L212" class="LineNr">212 </span>  e8/call  clear-trace-stream/disp32
-<span id="L213" class="LineNr">213 </span>    <span class="Comment"># discard args</span>
-<span id="L214" class="LineNr">214 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Comment"># trace(_test-trace-stream, &quot;C&quot;)</span>
-<span id="L216" class="LineNr">216 </span>    <span class="Comment"># push args</span>
+<span id="L213" class="LineNr">213 </span>    <span class="subxComment"># discard args</span>
+<span id="L214" class="LineNr">214 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L215" class="LineNr">215 </span>  <span class="subxComment"># trace(_test-trace-stream, &quot;C&quot;)</span>
+<span id="L216" class="LineNr">216 </span>    <span class="subxComment"># push args</span>
 <span id="L217" class="LineNr">217 </span>  68/push  <span class="Constant">&quot;C&quot;</span>/imm32
 <span id="L218" class="LineNr">218 </span>  68/push  _test-trace-stream/imm32
-<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxComment"># call</span>
 <span id="L220" class="LineNr">220 </span>  e8/call  trace/disp32
-<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
-<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment"># trace(_test-trace-stream, &quot;D&quot;)</span>
-<span id="L224" class="LineNr">224 </span>    <span class="Comment"># push args</span>
+<span id="L221" class="LineNr">221 </span>    <span class="subxComment"># discard args</span>
+<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>  <span class="subxComment"># trace(_test-trace-stream, &quot;D&quot;)</span>
+<span id="L224" class="LineNr">224 </span>    <span class="subxComment"># push args</span>
 <span id="L225" class="LineNr">225 </span>  68/push  <span class="Constant">&quot;D&quot;</span>/imm32
 <span id="L226" class="LineNr">226 </span>  68/push  _test-trace-stream/imm32
-<span id="L227" class="LineNr">227 </span>    <span class="Comment"># call</span>
+<span id="L227" class="LineNr">227 </span>    <span class="subxComment"># call</span>
 <span id="L228" class="LineNr">228 </span>  e8/call  trace/disp32
-<span id="L229" class="LineNr">229 </span>    <span class="Comment"># discard args</span>
-<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Comment"># check-ints-equal(*_test-trace-stream.data, 43/C 0a/newline 44/D 0a/newline, msg)</span>
-<span id="L232" class="LineNr">232 </span>    <span class="Comment"># push args</span>
+<span id="L229" class="LineNr">229 </span>    <span class="subxComment"># discard args</span>
+<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L231" class="LineNr">231 </span>  <span class="subxComment"># check-ints-equal(*_test-trace-stream.data, 43/C 0a/newline 44/D 0a/newline, msg)</span>
+<span id="L232" class="LineNr">232 </span>    <span class="subxComment"># push args</span>
 <span id="L233" class="LineNr">233 </span>  68/push  <span class="Constant">&quot;F - test-trace-appends&quot;</span>/imm32
 <span id="L234" class="LineNr">234 </span>  68/push  0x0a440a43/imm32/C-newline-D-newline
-<span id="L235" class="LineNr">235 </span>    <span class="Comment"># push *_test-trace-stream.data</span>
+<span id="L235" class="LineNr">235 </span>    <span class="subxComment"># push *_test-trace-stream.data</span>
 <span id="L236" class="LineNr">236 </span>  b8/copy-to-EAX  _test-trace-stream/imm32
-<span id="L237" class="LineNr">237 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L238" class="LineNr">238 </span>    <span class="Comment"># call</span>
+<span id="L237" class="LineNr">237 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L238" class="LineNr">238 </span>    <span class="subxComment"># call</span>
 <span id="L239" class="LineNr">239 </span>  e8/call  check-ints-equal/disp32
-<span id="L240" class="LineNr">240 </span>    <span class="Comment"># discard args</span>
-<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Comment"># end</span>
+<span id="L240" class="LineNr">240 </span>    <span class="subxComment"># discard args</span>
+<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L242" class="LineNr">242 </span>  <span class="subxComment"># end</span>
 <span id="L243" class="LineNr">243 </span>  c3/return
 <span id="L244" class="LineNr">244 </span>
 <span id="L245" class="LineNr">245 </span>test-trace-empty-line:
-<span id="L246" class="LineNr">246 </span>  <span class="Comment"># clear-trace-stream(_test-trace-stream)</span>
-<span id="L247" class="LineNr">247 </span>    <span class="Comment"># push args</span>
+<span id="L246" class="LineNr">246 </span>  <span class="subxComment"># clear-trace-stream(_test-trace-stream)</span>
+<span id="L247" class="LineNr">247 </span>    <span class="subxComment"># push args</span>
 <span id="L248" class="LineNr">248 </span>  68/push  _test-trace-stream/imm32
-<span id="L249" class="LineNr">249 </span>    <span class="Comment"># call</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxComment"># call</span>
 <span id="L250" class="LineNr">250 </span>  e8/call  clear-trace-stream/disp32
-<span id="L251" class="LineNr">251 </span>    <span class="Comment"># discard args</span>
-<span id="L252" class="LineNr">252 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L253" class="LineNr">253 </span>  <span class="Comment"># trace(_test-trace-stream, &quot;&quot;)</span>
-<span id="L254" class="LineNr">254 </span>    <span class="Comment"># push args</span>
+<span id="L251" class="LineNr">251 </span>    <span class="subxComment"># discard args</span>
+<span id="L252" class="LineNr">252 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L253" class="LineNr">253 </span>  <span class="subxComment"># trace(_test-trace-stream, &quot;&quot;)</span>
+<span id="L254" class="LineNr">254 </span>    <span class="subxComment"># push args</span>
 <span id="L255" class="LineNr">255 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L256" class="LineNr">256 </span>  68/push  _test-trace-stream/imm32
-<span id="L257" class="LineNr">257 </span>    <span class="Comment"># call</span>
+<span id="L257" class="LineNr">257 </span>    <span class="subxComment"># call</span>
 <span id="L258" class="LineNr">258 </span>  e8/call  trace/disp32
-<span id="L259" class="LineNr">259 </span>    <span class="Comment"># discard args</span>
-<span id="L260" class="LineNr">260 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Comment"># check-ints-equal(*_test-trace-stream.data, 0, msg)</span>
-<span id="L262" class="LineNr">262 </span>    <span class="Comment"># push args</span>
+<span id="L259" class="LineNr">259 </span>    <span class="subxComment"># discard args</span>
+<span id="L260" class="LineNr">260 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L261" class="LineNr">261 </span>  <span class="subxComment"># check-ints-equal(*_test-trace-stream.data, 0, msg)</span>
+<span id="L262" class="LineNr">262 </span>    <span class="subxComment"># push args</span>
 <span id="L263" class="LineNr">263 </span>  68/push  <span class="Constant">&quot;F - test-trace-empty-line&quot;</span>/imm32
 <span id="L264" class="LineNr">264 </span>  68/push  0/imm32
-<span id="L265" class="LineNr">265 </span>    <span class="Comment"># push *_test-trace-stream.data</span>
+<span id="L265" class="LineNr">265 </span>    <span class="subxComment"># push *_test-trace-stream.data</span>
 <span id="L266" class="LineNr">266 </span>  b8/copy-to-EAX  _test-trace-stream/imm32
-<span id="L267" class="LineNr">267 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L268" class="LineNr">268 </span>    <span class="Comment"># call</span>
+<span id="L267" class="LineNr">267 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L268" class="LineNr">268 </span>    <span class="subxComment"># call</span>
 <span id="L269" class="LineNr">269 </span>  e8/call  check-ints-equal/disp32
-<span id="L270" class="LineNr">270 </span>    <span class="Comment"># discard args</span>
-<span id="L271" class="LineNr">271 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L272" class="LineNr">272 </span>  <span class="Comment"># end</span>
+<span id="L270" class="LineNr">270 </span>    <span class="subxComment"># discard args</span>
+<span id="L271" class="LineNr">271 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L272" class="LineNr">272 </span>  <span class="subxComment"># end</span>
 <span id="L273" class="LineNr">273 </span>  c3/return
 <span id="L274" class="LineNr">274 </span>
-<span id="L275" class="LineNr">275 </span><span class="SalientComment">## helpers</span>
+<span id="L275" class="LineNr">275 </span><span class="subxComment">## helpers</span>
 <span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Comment"># 3-argument variant of _append</span>
-<span id="L278" class="LineNr">278 </span>_append-3:  <span class="Comment"># out : address, outend : address, s : (array byte) -&gt; num_bytes_appended/EAX</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Comment"># prolog</span>
+<span id="L277" class="LineNr">277 </span><span class="subxComment"># 3-argument variant of _append</span>
+<span id="L278" class="LineNr">278 </span>_append-3:  <span class="subxComment"># out : address, outend : address, s : (array byte) -&gt; num_bytes_appended/EAX</span>
+<span id="L279" class="LineNr">279 </span>  <span class="subxComment"># prolog</span>
 <span id="L280" class="LineNr">280 </span>  55/push-EBP
-<span id="L281" class="LineNr">281 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Comment"># save registers</span>
+<span id="L281" class="LineNr">281 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L282" class="LineNr">282 </span>  <span class="subxComment"># save registers</span>
 <span id="L283" class="LineNr">283 </span>  51/push-ECX
-<span id="L284" class="LineNr">284 </span>  <span class="Comment"># _append-4(out, outend, &amp;s.data[0], &amp;s.data[s.length]) -&gt; num_bytes_appended/EAX</span>
-<span id="L285" class="LineNr">285 </span>    <span class="Comment"># push &amp;s.data[s.length]</span>
-<span id="L286" class="LineNr">286 </span>      <span class="Comment"># EAX = s</span>
-<span id="L287" class="LineNr">287 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+16) to EAX</span>
-<span id="L288" class="LineNr">288 </span>      <span class="Comment"># ECX = s.length</span>
-<span id="L289" class="LineNr">289 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to ECX</span>
-<span id="L290" class="LineNr">290 </span>      <span class="Comment"># ECX = &amp;s.data[s.length]</span>
-<span id="L291" class="LineNr">291 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+4 to ECX</span>
+<span id="L284" class="LineNr">284 </span>  <span class="subxComment"># _append-4(out, outend, &amp;s.data[0], &amp;s.data[s.length]) -&gt; num_bytes_appended/EAX</span>
+<span id="L285" class="LineNr">285 </span>    <span class="subxComment"># push &amp;s.data[s.length]</span>
+<span id="L286" class="LineNr">286 </span>      <span class="subxComment"># EAX = s</span>
+<span id="L287" class="LineNr">287 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to EAX</span>
+<span id="L288" class="LineNr">288 </span>      <span class="subxComment"># ECX = s.length</span>
+<span id="L289" class="LineNr">289 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L290" class="LineNr">290 </span>      <span class="subxComment"># ECX = &amp;s.data[s.length]</span>
+<span id="L291" class="LineNr">291 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
 <span id="L292" class="LineNr">292 </span>  51/push-ECX
-<span id="L293" class="LineNr">293 </span>    <span class="Comment"># push &amp;s.data[0]</span>
-<span id="L294" class="LineNr">294 </span>  8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+4 to ECX</span>
+<span id="L293" class="LineNr">293 </span>    <span class="subxComment"># push &amp;s.data[0]</span>
+<span id="L294" class="LineNr">294 </span>  8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+4 to ECX</span>
 <span id="L295" class="LineNr">295 </span>  51/push-ECX
-<span id="L296" class="LineNr">296 </span>    <span class="Comment"># push outend</span>
-<span id="L297" class="LineNr">297 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L298" class="LineNr">298 </span>    <span class="Comment"># push out</span>
-<span id="L299" class="LineNr">299 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Comment"># call</span>
+<span id="L296" class="LineNr">296 </span>    <span class="subxComment"># push outend</span>
+<span id="L297" class="LineNr">297 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L298" class="LineNr">298 </span>    <span class="subxComment"># push out</span>
+<span id="L299" class="LineNr">299 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L300" class="LineNr">300 </span>    <span class="subxComment"># call</span>
 <span id="L301" class="LineNr">301 </span>  e8/call  _append-4/disp32
-<span id="L302" class="LineNr">302 </span>    <span class="Comment"># discard args</span>
-<span id="L303" class="LineNr">303 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Comment"># restore registers</span>
+<span id="L302" class="LineNr">302 </span>    <span class="subxComment"># discard args</span>
+<span id="L303" class="LineNr">303 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L304" class="LineNr">304 </span>  <span class="subxComment"># restore registers</span>
 <span id="L305" class="LineNr">305 </span>  59/pop-to-ECX
-<span id="L306" class="LineNr">306 </span>  <span class="Comment"># epilog</span>
-<span id="L307" class="LineNr">307 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L306" class="LineNr">306 </span>  <span class="subxComment"># epilog</span>
+<span id="L307" class="LineNr">307 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L308" class="LineNr">308 </span>  5d/pop-to-EBP
 <span id="L309" class="LineNr">309 </span>  c3/return
 <span id="L310" class="LineNr">310 </span>
-<span id="L311" class="LineNr">311 </span><span class="Comment"># 4-argument variant of _append</span>
-<span id="L312" class="LineNr">312 </span>_append-4:  <span class="Comment"># out : address, outend : address, in : address, inend : address -&gt; num_bytes_appended/EAX</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Comment"># prolog</span>
+<span id="L311" class="LineNr">311 </span><span class="subxComment"># 4-argument variant of _append</span>
+<span id="L312" class="LineNr">312 </span>_append-4:  <span class="subxComment"># out : address, outend : address, in : address, inend : address -&gt; num_bytes_appended/EAX</span>
+<span id="L313" class="LineNr">313 </span>  <span class="subxComment"># prolog</span>
 <span id="L314" class="LineNr">314 </span>  55/push-EBP
-<span id="L315" class="LineNr">315 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Comment"># save registers</span>
+<span id="L315" class="LineNr">315 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L316" class="LineNr">316 </span>  <span class="subxComment"># save registers</span>
 <span id="L317" class="LineNr">317 </span>  51/push-ECX
 <span id="L318" class="LineNr">318 </span>  52/push-EDX
 <span id="L319" class="LineNr">319 </span>  53/push-EBX
 <span id="L320" class="LineNr">320 </span>  56/push-ESI
 <span id="L321" class="LineNr">321 </span>  57/push-EDI
-<span id="L322" class="LineNr">322 </span>  <span class="Comment"># EAX/num_bytes_appended = 0</span>
+<span id="L322" class="LineNr">322 </span>  <span class="subxComment"># EAX/num_bytes_appended = 0</span>
 <span id="L323" class="LineNr">323 </span>  b8/copy-to-EAX  0/imm32
-<span id="L324" class="LineNr">324 </span>  <span class="Comment"># EDI = out</span>
-<span id="L325" class="LineNr">325 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDI</span>
-<span id="L326" class="LineNr">326 </span>  <span class="Comment"># EDX = outend</span>
-<span id="L327" class="LineNr">327 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Comment"># ESI = in</span>
-<span id="L329" class="LineNr">329 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+16) to ESI</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Comment"># ECX = inend</span>
-<span id="L331" class="LineNr">331 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+20) to ECX</span>
+<span id="L324" class="LineNr">324 </span>  <span class="subxComment"># EDI = out</span>
+<span id="L325" class="LineNr">325 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L326" class="LineNr">326 </span>  <span class="subxComment"># EDX = outend</span>
+<span id="L327" class="LineNr">327 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L328" class="LineNr">328 </span>  <span class="subxComment"># ESI = in</span>
+<span id="L329" class="LineNr">329 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to ESI</span>
+<span id="L330" class="LineNr">330 </span>  <span class="subxComment"># ECX = inend</span>
+<span id="L331" class="LineNr">331 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+20) to ECX</span>
 <span id="L332" class="LineNr">332 </span>$_append-4:loop:
-<span id="L333" class="LineNr">333 </span>  <span class="Comment"># if ESI/src &gt;= ECX/srcend break</span>
-<span id="L334" class="LineNr">334 </span>  39/compare                      3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ESI with ECX</span>
+<span id="L333" class="LineNr">333 </span>  <span class="subxComment"># if ESI/src &gt;= ECX/srcend break</span>
+<span id="L334" class="LineNr">334 </span>  39/compare                      3/mod/direct    6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ESI with ECX</span>
 <span id="L335" class="LineNr">335 </span>  7d/jump-if-greater-or-equal  $_append-4:end/disp8
-<span id="L336" class="LineNr">336 </span>  <span class="Comment"># if EDI/out &gt;= EDX/outend break  (for now silently ignore filled up buffer)</span>
-<span id="L337" class="LineNr">337 </span>  39/compare                      3/mod/direct    7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EDI with EDX</span>
+<span id="L336" class="LineNr">336 </span>  <span class="subxComment"># if EDI/out &gt;= EDX/outend break  (for now silently ignore filled up buffer)</span>
+<span id="L337" class="LineNr">337 </span>  39/compare                      3/mod/direct    7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EDI with EDX</span>
 <span id="L338" class="LineNr">338 </span>  7d/jump-if-greater-or-equal  $_append-4:end/disp8
-<span id="L339" class="LineNr">339 </span>  <span class="Comment"># copy one byte from ESI/src to EDI/out</span>
-<span id="L340" class="LineNr">340 </span>  8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/BL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to BL</span>
-<span id="L341" class="LineNr">341 </span>  88/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/BL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at BL to *EDI</span>
-<span id="L342" class="LineNr">342 </span>  <span class="Comment"># updates</span>
+<span id="L339" class="LineNr">339 </span>  <span class="subxComment"># copy one byte from ESI/src to EDI/out</span>
+<span id="L340" class="LineNr">340 </span>  8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/BL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to BL</span>
+<span id="L341" class="LineNr">341 </span>  88/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/BL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at BL to *EDI</span>
+<span id="L342" class="LineNr">342 </span>  <span class="subxComment"># updates</span>
 <span id="L343" class="LineNr">343 </span>  40/increment-EAX
 <span id="L344" class="LineNr">344 </span>  46/increment-ESI
 <span id="L345" class="LineNr">345 </span>  47/increment-EDI
 <span id="L346" class="LineNr">346 </span>  eb/jump  $_append-4:loop/disp8
 <span id="L347" class="LineNr">347 </span>$_append-4:end:
-<span id="L348" class="LineNr">348 </span>  <span class="Comment"># restore registers</span>
+<span id="L348" class="LineNr">348 </span>  <span class="subxComment"># restore registers</span>
 <span id="L349" class="LineNr">349 </span>  5f/pop-to-EDI
 <span id="L350" class="LineNr">350 </span>  5e/pop-to-ESI
 <span id="L351" class="LineNr">351 </span>  5b/pop-to-EBX
 <span id="L352" class="LineNr">352 </span>  5a/pop-to-EDX
 <span id="L353" class="LineNr">353 </span>  59/pop-to-ECX
-<span id="L354" class="LineNr">354 </span>  <span class="Comment"># epilog</span>
-<span id="L355" class="LineNr">355 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L354" class="LineNr">354 </span>  <span class="subxComment"># epilog</span>
+<span id="L355" class="LineNr">355 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L356" class="LineNr">356 </span>  5d/pop-to-EBP
 <span id="L357" class="LineNr">357 </span>  c3/return
 <span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L359" class="LineNr">359 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/056write.subx.html b/html/subx/056write.subx.html
index ab468415..c796115f 100644
--- a/html/subx/056write.subx.html
+++ b/html/subx/056write.subx.html
@@ -15,12 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
@@ -55,218 +54,218 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># write: like _write, but also support in-memory streams in addition to file</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment"># descriptors.</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># Our first dependency-injected and testable primitive. We can pass it either</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># a file descriptor or an address to a stream. If a file descriptor is passed</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># in, we _write to it using the right syscall. If a 'fake file descriptor' or</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># stream is passed in, we append to the stream. This lets us redirect output</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># in tests and check it later.</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># We assume our data segment will never begin at an address shorter than</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment"># 0x08000000, so any smaller arguments are assumed to be real file descriptors.</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># A stream looks like this:</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   read: int  # index at which to read next</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   write: int  # index at which writes go</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">#   data: (array byte)  # prefixed by length as usual</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># write: like _write, but also support in-memory streams in addition to file</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment"># descriptors.</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># Our first dependency-injected and testable primitive. We can pass it either</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># a file descriptor or an address to a stream. If a file descriptor is passed</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># in, we _write to it using the right syscall. If a 'fake file descriptor' or</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># stream is passed in, we append to the stream. This lets us redirect output</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># in tests and check it later.</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment"># We assume our data segment will never begin at an address shorter than</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment"># 0x08000000, so any smaller arguments are assumed to be real file descriptors.</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># A stream looks like this:</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment">#   read: int  # index at which to read next</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment">#   write: int  # index at which writes go</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment">#   data: (array byte)  # prefixed by length as usual</span>
 <span id="L17" class="LineNr"> 17 </span>
 <span id="L18" class="LineNr"> 18 </span>== code
-<span id="L19" class="LineNr"> 19 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L21" class="LineNr"> 21 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L22" class="LineNr"> 22 </span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment"># main:</span>
-<span id="L24" class="LineNr"> 24 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
-<span id="L26" class="LineNr"> 26 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L23" class="LineNr"> 23 </span><span class="subxComment"># main:</span>
+<span id="L24" class="LineNr"> 24 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L26" class="LineNr"> 26 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L27" class="LineNr"> 27 </span>  b8/copy-to-EAX  1/imm32
 <span id="L28" class="LineNr"> 28 </span>  cd/syscall  0x80/imm8
 <span id="L29" class="LineNr"> 29 </span>
-<span id="L30" class="LineNr"> 30 </span>write:  <span class="Comment"># f : fd or (address stream), s : (address array byte) -&gt; bytes_written/EAX</span>
-<span id="L31" class="LineNr"> 31 </span>    <span class="Comment"># (If we ever leave the Linux kernel behind, it may be better to return</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="Comment"># the number of bytes *not* written. Success would then be signaled by</span>
-<span id="L33" class="LineNr"> 33 </span>    <span class="Comment"># returning 0.)</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># prolog</span>
+<span id="L30" class="LineNr"> 30 </span>write:  <span class="subxComment"># f : fd or (address stream), s : (address array byte) -&gt; bytes_written/EAX</span>
+<span id="L31" class="LineNr"> 31 </span>    <span class="subxComment"># (If we ever leave the Linux kernel behind, it may be better to return</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># the number of bytes *not* written. Success would then be signaled by</span>
+<span id="L33" class="LineNr"> 33 </span>    <span class="subxComment"># returning 0.)</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="subxComment"># prolog</span>
 <span id="L35" class="LineNr"> 35 </span>  55/push-EBP
-<span id="L36" class="LineNr"> 36 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Comment"># if (f &lt; 0x08000000) _write(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
-<span id="L38" class="LineNr"> 38 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         0x08000000/imm32  <span class="Comment"># compare *(EBP+8)</span>
+<span id="L36" class="LineNr"> 36 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="subxComment"># if (f &lt; 0x08000000) _write(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
+<span id="L38" class="LineNr"> 38 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L39" class="LineNr"> 39 </span>  7d/jump-if-greater-or-equal  $write:fake/disp8
-<span id="L40" class="LineNr"> 40 </span>    <span class="Comment"># push args</span>
-<span id="L41" class="LineNr"> 41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L42" class="LineNr"> 42 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L43" class="LineNr"> 43 </span>    <span class="Comment"># call</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="subxComment"># push args</span>
+<span id="L41" class="LineNr"> 41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L42" class="LineNr"> 42 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="subxComment"># call</span>
 <span id="L44" class="LineNr"> 44 </span>  e8/call  _write/disp32
-<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># discard args</span>
-<span id="L46" class="LineNr"> 46 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># discard args</span>
+<span id="L46" class="LineNr"> 46 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L47" class="LineNr"> 47 </span>  eb/jump  $write:end/disp8
 <span id="L48" class="LineNr"> 48 </span>$write:fake:
-<span id="L49" class="LineNr"> 49 </span>  <span class="Comment"># otherwise, treat 'f' as a stream to append to</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Comment"># save registers</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="subxComment"># otherwise, treat 'f' as a stream to append to</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="subxComment"># save registers</span>
 <span id="L51" class="LineNr"> 51 </span>  51/push-ECX
 <span id="L52" class="LineNr"> 52 </span>  52/push-EDX
 <span id="L53" class="LineNr"> 53 </span>  53/push-EBX
-<span id="L54" class="LineNr"> 54 </span>  <span class="Comment"># ECX = f</span>
-<span id="L55" class="LineNr"> 55 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># EDX = f-&gt;write</span>
-<span id="L57" class="LineNr"> 57 </span>  8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ECX to EDX</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># EBX = f-&gt;length</span>
-<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ECX+8) to EBX</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># EAX = _append-3(&amp;f-&gt;data[f-&gt;write], &amp;f-&gt;data[f-&gt;length], s)</span>
-<span id="L61" class="LineNr"> 61 </span>    <span class="Comment"># push s</span>
-<span id="L62" class="LineNr"> 62 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># push &amp;f-&gt;data[f-&gt;length]</span>
-<span id="L64" class="LineNr"> 64 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  3/index/EBX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ECX+EBX+12 to EBX</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="subxComment"># ECX = f</span>
+<span id="L55" class="LineNr"> 55 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="subxComment"># EDX = f-&gt;write</span>
+<span id="L57" class="LineNr"> 57 </span>  8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ECX to EDX</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="subxComment"># EBX = f-&gt;length</span>
+<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ECX+8) to EBX</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="subxComment"># EAX = _append-3(&amp;f-&gt;data[f-&gt;write], &amp;f-&gt;data[f-&gt;length], s)</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># push s</span>
+<span id="L62" class="LineNr"> 62 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># push &amp;f-&gt;data[f-&gt;length]</span>
+<span id="L64" class="LineNr"> 64 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  3/index/EBX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX+EBX+12 to EBX</span>
 <span id="L65" class="LineNr"> 65 </span>  53/push-EBX
-<span id="L66" class="LineNr"> 66 </span>    <span class="Comment"># push &amp;f-&gt;data[f-&gt;write]</span>
-<span id="L67" class="LineNr"> 67 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  2/index/EDX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ECX+EDX+12 to EBX</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="subxComment"># push &amp;f-&gt;data[f-&gt;write]</span>
+<span id="L67" class="LineNr"> 67 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  2/index/EDX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX+EDX+12 to EBX</span>
 <span id="L68" class="LineNr"> 68 </span>  53/push-EBX
-<span id="L69" class="LineNr"> 69 </span>    <span class="Comment"># call</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># call</span>
 <span id="L70" class="LineNr"> 70 </span>  e8/call  _append-3/disp32
-<span id="L71" class="LineNr"> 71 </span>    <span class="Comment"># discard args</span>
-<span id="L72" class="LineNr"> 72 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Comment"># f-&gt;write += EAX</span>
-<span id="L74" class="LineNr"> 74 </span>  01/add                          0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *ECX</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Comment"># restore registers</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="subxComment"># discard args</span>
+<span id="L72" class="LineNr"> 72 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="subxComment"># f-&gt;write += EAX</span>
+<span id="L74" class="LineNr"> 74 </span>  01/add                          0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *ECX</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="subxComment"># restore registers</span>
 <span id="L76" class="LineNr"> 76 </span>  5b/pop-to-EBX
 <span id="L77" class="LineNr"> 77 </span>  5a/pop-to-EDX
 <span id="L78" class="LineNr"> 78 </span>  59/pop-to-ECX
 <span id="L79" class="LineNr"> 79 </span>$write:end:
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># epilog</span>
-<span id="L81" class="LineNr"> 81 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="subxComment"># epilog</span>
+<span id="L81" class="LineNr"> 81 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L82" class="LineNr"> 82 </span>  5d/pop-to-EBP
 <span id="L83" class="LineNr"> 83 </span>  c3/return
 <span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span>clear-stream:  <span class="Comment"># f : (address stream) -&gt; &lt;void&gt;</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># prolog</span>
+<span id="L85" class="LineNr"> 85 </span>clear-stream:  <span class="subxComment"># f : (address stream) -&gt; &lt;void&gt;</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="subxComment"># prolog</span>
 <span id="L87" class="LineNr"> 87 </span>  55/push-EBP
-<span id="L88" class="LineNr"> 88 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># save registers</span>
+<span id="L88" class="LineNr"> 88 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="subxComment"># save registers</span>
 <span id="L90" class="LineNr"> 90 </span>  50/push-EAX
 <span id="L91" class="LineNr"> 91 </span>  51/push-ECX
-<span id="L92" class="LineNr"> 92 </span>  <span class="Comment"># EAX = f</span>
-<span id="L93" class="LineNr"> 93 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Comment"># ECX = f-&gt;length</span>
-<span id="L95" class="LineNr"> 95 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EAX+8) to ECX</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># ECX = &amp;f-&gt;data[f-&gt;length]</span>
-<span id="L97" class="LineNr"> 97 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX+ECX+12 to ECX</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment"># f-&gt;write = 0</span>
-<span id="L99" class="LineNr"> 99 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># f-&gt;read = 0</span>
-<span id="L101" class="LineNr">101 </span>  c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         0/imm32           <span class="Comment"># copy to *(EAX+4)</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Comment"># EAX = f-&gt;data</span>
-<span id="L103" class="LineNr">103 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to EAX</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Comment"># while (true)</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="subxComment"># EAX = f</span>
+<span id="L93" class="LineNr"> 93 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="subxComment"># ECX = f-&gt;length</span>
+<span id="L95" class="LineNr"> 95 </span>  8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EAX+8) to ECX</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="subxComment"># ECX = &amp;f-&gt;data[f-&gt;length]</span>
+<span id="L97" class="LineNr"> 97 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+ECX+12 to ECX</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="subxComment"># f-&gt;write = 0</span>
+<span id="L99" class="LineNr"> 99 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L100" class="LineNr">100 </span>  <span class="subxComment"># f-&gt;read = 0</span>
+<span id="L101" class="LineNr">101 </span>  c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EAX+4)</span>
+<span id="L102" class="LineNr">102 </span>  <span class="subxComment"># EAX = f-&gt;data</span>
+<span id="L103" class="LineNr">103 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to EAX</span>
+<span id="L104" class="LineNr">104 </span>  <span class="subxComment"># while (true)</span>
 <span id="L105" class="LineNr">105 </span>$clear-stream:loop:
-<span id="L106" class="LineNr">106 </span>  <span class="Comment"># if EAX &gt;= ECX break</span>
-<span id="L107" class="LineNr">107 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with ECX</span>
+<span id="L106" class="LineNr">106 </span>  <span class="subxComment"># if EAX &gt;= ECX break</span>
+<span id="L107" class="LineNr">107 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
 <span id="L108" class="LineNr">108 </span>  7d/jump-if-greater-or-equal  $clear-stream:end/disp8
-<span id="L109" class="LineNr">109 </span>  <span class="Comment"># *EAX = 0</span>
-<span id="L110" class="LineNr">110 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
-<span id="L111" class="LineNr">111 </span>  <span class="Comment"># EAX += 4</span>
-<span id="L112" class="LineNr">112 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to EAX</span>
+<span id="L109" class="LineNr">109 </span>  <span class="subxComment"># *EAX = 0</span>
+<span id="L110" class="LineNr">110 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L111" class="LineNr">111 </span>  <span class="subxComment"># EAX += 4</span>
+<span id="L112" class="LineNr">112 </span>  81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
 <span id="L113" class="LineNr">113 </span>  eb/jump  $clear-stream:loop/disp8
 <span id="L114" class="LineNr">114 </span>$clear-stream:end:
-<span id="L115" class="LineNr">115 </span>  <span class="Comment"># restore registers</span>
+<span id="L115" class="LineNr">115 </span>  <span class="subxComment"># restore registers</span>
 <span id="L116" class="LineNr">116 </span>  59/pop-to-ECX
 <span id="L117" class="LineNr">117 </span>  58/pop-to-EAX
-<span id="L118" class="LineNr">118 </span>  <span class="Comment"># epilog</span>
-<span id="L119" class="LineNr">119 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L118" class="LineNr">118 </span>  <span class="subxComment"># epilog</span>
+<span id="L119" class="LineNr">119 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L120" class="LineNr">120 </span>  5d/pop-to-EBP
 <span id="L121" class="LineNr">121 </span>  c3/return
 <span id="L122" class="LineNr">122 </span>
 <span id="L123" class="LineNr">123 </span>test-write-single:
-<span id="L124" class="LineNr">124 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L125" class="LineNr">125 </span>    <span class="Comment"># push args</span>
+<span id="L124" class="LineNr">124 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L125" class="LineNr">125 </span>    <span class="subxComment"># push args</span>
 <span id="L126" class="LineNr">126 </span>  68/push  _test-stream/imm32
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># call</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxComment"># call</span>
 <span id="L128" class="LineNr">128 </span>  e8/call  clear-stream/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="Comment"># discard args</span>
-<span id="L130" class="LineNr">130 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L131" class="LineNr">131 </span>  <span class="Comment"># write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Comment"># push args</span>
+<span id="L129" class="LineNr">129 </span>    <span class="subxComment"># discard args</span>
+<span id="L130" class="LineNr">130 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L131" class="LineNr">131 </span>  <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L132" class="LineNr">132 </span>    <span class="subxComment"># push args</span>
 <span id="L133" class="LineNr">133 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L134" class="LineNr">134 </span>  68/push  _test-stream/imm32
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># call</span>
+<span id="L135" class="LineNr">135 </span>    <span class="subxComment"># call</span>
 <span id="L136" class="LineNr">136 </span>  e8/call  write/disp32
-<span id="L137" class="LineNr">137 </span>    <span class="Comment"># discard args</span>
-<span id="L138" class="LineNr">138 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Comment"># check-ints-equal(EAX, 2)</span>
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># push args</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxComment"># discard args</span>
+<span id="L138" class="LineNr">138 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L139" class="LineNr">139 </span>  <span class="subxComment"># check-ints-equal(EAX, 2)</span>
+<span id="L140" class="LineNr">140 </span>    <span class="subxComment"># push args</span>
 <span id="L141" class="LineNr">141 </span>  68/push  <span class="Constant">&quot;F - test-read-single: return EAX&quot;</span>/imm32
 <span id="L142" class="LineNr">142 </span>  68/push  2/imm32
 <span id="L143" class="LineNr">143 </span>  50/push-EAX
-<span id="L144" class="LineNr">144 </span>    <span class="Comment"># call</span>
+<span id="L144" class="LineNr">144 </span>    <span class="subxComment"># call</span>
 <span id="L145" class="LineNr">145 </span>  e8/call  check-ints-equal/disp32
-<span id="L146" class="LineNr">146 </span>    <span class="Comment"># discard args</span>
-<span id="L147" class="LineNr">147 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Comment"># check-ints-equal(*_test-stream-&gt;data, 41/A 62/b 00 00, msg)</span>
-<span id="L149" class="LineNr">149 </span>    <span class="Comment"># push args</span>
+<span id="L146" class="LineNr">146 </span>    <span class="subxComment"># discard args</span>
+<span id="L147" class="LineNr">147 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L148" class="LineNr">148 </span>  <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 41/A 62/b 00 00, msg)</span>
+<span id="L149" class="LineNr">149 </span>    <span class="subxComment"># push args</span>
 <span id="L150" class="LineNr">150 </span>  68/push  <span class="Constant">&quot;F - test-write-single&quot;</span>/imm32
 <span id="L151" class="LineNr">151 </span>  68/push  0x006241/imm32/<span class="Special">Ab</span>
-<span id="L152" class="LineNr">152 </span>    <span class="Comment"># push *_test-stream-&gt;data</span>
+<span id="L152" class="LineNr">152 </span>    <span class="subxComment"># push *_test-stream-&gt;data</span>
 <span id="L153" class="LineNr">153 </span>  b8/copy-to-EAX  _test-stream/imm32
-<span id="L154" class="LineNr">154 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># call</span>
+<span id="L154" class="LineNr">154 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L155" class="LineNr">155 </span>    <span class="subxComment"># call</span>
 <span id="L156" class="LineNr">156 </span>  e8/call  check-ints-equal/disp32
-<span id="L157" class="LineNr">157 </span>    <span class="Comment"># discard args</span>
-<span id="L158" class="LineNr">158 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Comment"># end</span>
+<span id="L157" class="LineNr">157 </span>    <span class="subxComment"># discard args</span>
+<span id="L158" class="LineNr">158 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L159" class="LineNr">159 </span>  <span class="subxComment"># end</span>
 <span id="L160" class="LineNr">160 </span>  c3/return
 <span id="L161" class="LineNr">161 </span>
 <span id="L162" class="LineNr">162 </span>test-write-appends:
-<span id="L163" class="LineNr">163 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L164" class="LineNr">164 </span>    <span class="Comment"># push args</span>
+<span id="L163" class="LineNr">163 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L164" class="LineNr">164 </span>    <span class="subxComment"># push args</span>
 <span id="L165" class="LineNr">165 </span>  68/push  _test-stream/imm32
-<span id="L166" class="LineNr">166 </span>    <span class="Comment"># call</span>
+<span id="L166" class="LineNr">166 </span>    <span class="subxComment"># call</span>
 <span id="L167" class="LineNr">167 </span>  e8/call  clear-stream/disp32
-<span id="L168" class="LineNr">168 </span>    <span class="Comment"># discard args</span>
-<span id="L169" class="LineNr">169 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Comment"># write(_test-stream, &quot;C&quot;)</span>
-<span id="L171" class="LineNr">171 </span>    <span class="Comment"># push args</span>
+<span id="L168" class="LineNr">168 </span>    <span class="subxComment"># discard args</span>
+<span id="L169" class="LineNr">169 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L170" class="LineNr">170 </span>  <span class="subxComment"># write(_test-stream, &quot;C&quot;)</span>
+<span id="L171" class="LineNr">171 </span>    <span class="subxComment"># push args</span>
 <span id="L172" class="LineNr">172 </span>  68/push  <span class="Constant">&quot;C&quot;</span>/imm32
 <span id="L173" class="LineNr">173 </span>  68/push  _test-stream/imm32
-<span id="L174" class="LineNr">174 </span>    <span class="Comment"># call</span>
+<span id="L174" class="LineNr">174 </span>    <span class="subxComment"># call</span>
 <span id="L175" class="LineNr">175 </span>  e8/call  write/disp32
-<span id="L176" class="LineNr">176 </span>    <span class="Comment"># discard args</span>
-<span id="L177" class="LineNr">177 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Comment"># write(_test-stream, &quot;D&quot;)</span>
-<span id="L179" class="LineNr">179 </span>    <span class="Comment"># push args</span>
+<span id="L176" class="LineNr">176 </span>    <span class="subxComment"># discard args</span>
+<span id="L177" class="LineNr">177 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L178" class="LineNr">178 </span>  <span class="subxComment"># write(_test-stream, &quot;D&quot;)</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxComment"># push args</span>
 <span id="L180" class="LineNr">180 </span>  68/push  <span class="Constant">&quot;D&quot;</span>/imm32
 <span id="L181" class="LineNr">181 </span>  68/push  _test-stream/imm32
-<span id="L182" class="LineNr">182 </span>    <span class="Comment"># call</span>
+<span id="L182" class="LineNr">182 </span>    <span class="subxComment"># call</span>
 <span id="L183" class="LineNr">183 </span>  e8/call  write/disp32
-<span id="L184" class="LineNr">184 </span>    <span class="Comment"># discard args</span>
-<span id="L185" class="LineNr">185 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Comment"># check-ints-equal(*_test-stream-&gt;data, 43/C 44/D 00 00, msg)</span>
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># push args</span>
+<span id="L184" class="LineNr">184 </span>    <span class="subxComment"># discard args</span>
+<span id="L185" class="LineNr">185 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L186" class="LineNr">186 </span>  <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 43/C 44/D 00 00, msg)</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxComment"># push args</span>
 <span id="L188" class="LineNr">188 </span>  68/push  <span class="Constant">&quot;F - test-write-appends&quot;</span>/imm32
 <span id="L189" class="LineNr">189 </span>  68/push  0x00004443/imm32/C-D
-<span id="L190" class="LineNr">190 </span>    <span class="Comment"># push *_test-stream-&gt;data</span>
+<span id="L190" class="LineNr">190 </span>    <span class="subxComment"># push *_test-stream-&gt;data</span>
 <span id="L191" class="LineNr">191 </span>  b8/copy-to-EAX  _test-stream/imm32
-<span id="L192" class="LineNr">192 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L193" class="LineNr">193 </span>    <span class="Comment"># call</span>
+<span id="L192" class="LineNr">192 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L193" class="LineNr">193 </span>    <span class="subxComment"># call</span>
 <span id="L194" class="LineNr">194 </span>  e8/call  check-ints-equal/disp32
-<span id="L195" class="LineNr">195 </span>    <span class="Comment"># discard args</span>
-<span id="L196" class="LineNr">196 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment"># end</span>
+<span id="L195" class="LineNr">195 </span>    <span class="subxComment"># discard args</span>
+<span id="L196" class="LineNr">196 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L197" class="LineNr">197 </span>  <span class="subxComment"># end</span>
 <span id="L198" class="LineNr">198 </span>  c3/return
 <span id="L199" class="LineNr">199 </span>
 <span id="L200" class="LineNr">200 </span>== data
 <span id="L201" class="LineNr">201 </span>
 <span id="L202" class="LineNr">202 </span>_test-stream:
-<span id="L203" class="LineNr">203 </span>  <span class="Comment"># current write index</span>
+<span id="L203" class="LineNr">203 </span>  <span class="subxComment"># current write index</span>
 <span id="L204" class="LineNr">204 </span>  00 00 00 00
-<span id="L205" class="LineNr">205 </span>  <span class="Comment"># current read index</span>
+<span id="L205" class="LineNr">205 </span>  <span class="subxComment"># current read index</span>
 <span id="L206" class="LineNr">206 </span>  00 00 00 00
-<span id="L207" class="LineNr">207 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L207" class="LineNr">207 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L208" class="LineNr">208 </span>  08 00 00 00
-<span id="L209" class="LineNr">209 </span>  <span class="Comment"># data</span>
-<span id="L210" class="LineNr">210 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L209" class="LineNr">209 </span>  <span class="subxComment"># data</span>
+<span id="L210" class="LineNr">210 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L211" class="LineNr">211 </span>
-<span id="L212" class="LineNr">212 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L212" class="LineNr">212 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/057stop.subx.html b/html/subx/057stop.subx.html
index dfdc65db..13fdd2d6 100644
--- a/html/subx/057stop.subx.html
+++ b/html/subx/057stop.subx.html
@@ -15,14 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -57,215 +54,215 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># stop: dependency-injected wrapper around the exit() syscall</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># We'd like to be able to write tests for functions that call exit(), and to</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># make assertions about whether they exit() or not in a given situation. To</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># achieve this we'll call exit() via a smarter wrapper called 'stop'.</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">#</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># In the context of a test, calling a function X that calls 'stop' (directly</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># or through further intervening calls) will unwind the stack until X returns,</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># so that we can say check any further assertions after the execution of X. To</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># achieve this end, we'll pass the return address of X as a 'target' argument</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment"># into X, plumbing it through to 'stop'. When 'stop' gets a non-null target it</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment"># unwinds the stack until the target. If it gets a null target it calls</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># exit().</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">#</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment"># We'd also like to get the exit status out of 'stop', so we'll combine the</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment"># input target with an output status parameter into a type called 'exit-descriptor'.</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">#</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># So the exit-descriptor looks like this:</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">#   target : address  # return address for 'stop' to unwind to</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">#   value : int  # exit status stop was called with</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment">#</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment"># 'stop' thus takes two parameters: an exit-descriptor and the exit status.</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">#</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment"># 'stop' won't bother cleaning up any other processor state besides the stack,</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment"># such as registers. Only ESP will have a well-defined value after 'stop'</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment"># returns. (This is a poor man's setjmp/longjmp, if you know what that is.)</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment">#</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment"># Before you can call any function that may call 'stop', you need to pass in an</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># exit-descriptor to it. To create an exit-descriptor use 'tailor-exit-descriptor'</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># below. It's not the most pleasant abstraction in the world.</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment">#</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment"># An exit-descriptor's target is its input, computed during 'tailor-exit-descriptor'.</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment"># Its value is its output, computed during stop and available to the test.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># stop: dependency-injected wrapper around the exit() syscall</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># We'd like to be able to write tests for functions that call exit(), and to</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># make assertions about whether they exit() or not in a given situation. To</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># achieve this we'll call exit() via a smarter wrapper called 'stop'.</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># In the context of a test, calling a function X that calls 'stop' (directly</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># or through further intervening calls) will unwind the stack until X returns,</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment"># so that we can say check any further assertions after the execution of X. To</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment"># achieve this end, we'll pass the return address of X as a 'target' argument</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment"># into X, plumbing it through to 'stop'. When 'stop' gets a non-null target it</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment"># unwinds the stack until the target. If it gets a null target it calls</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># exit().</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment">#</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># We'd also like to get the exit status out of 'stop', so we'll combine the</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment"># input target with an output status parameter into a type called 'exit-descriptor'.</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxComment">#</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment"># So the exit-descriptor looks like this:</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment">#   target : address  # return address for 'stop' to unwind to</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment">#   value : int  # exit status stop was called with</span>
+<span id="L21" class="LineNr"> 21 </span><span class="subxComment">#</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment"># 'stop' thus takes two parameters: an exit-descriptor and the exit status.</span>
+<span id="L23" class="LineNr"> 23 </span><span class="subxComment">#</span>
+<span id="L24" class="LineNr"> 24 </span><span class="subxComment"># 'stop' won't bother cleaning up any other processor state besides the stack,</span>
+<span id="L25" class="LineNr"> 25 </span><span class="subxComment"># such as registers. Only ESP will have a well-defined value after 'stop'</span>
+<span id="L26" class="LineNr"> 26 </span><span class="subxComment"># returns. (This is a poor man's setjmp/longjmp, if you know what that is.)</span>
+<span id="L27" class="LineNr"> 27 </span><span class="subxComment">#</span>
+<span id="L28" class="LineNr"> 28 </span><span class="subxComment"># Before you can call any function that may call 'stop', you need to pass in an</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># exit-descriptor to it. To create an exit-descriptor use 'tailor-exit-descriptor'</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># below. It's not the most pleasant abstraction in the world.</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxComment">#</span>
+<span id="L32" class="LineNr"> 32 </span><span class="subxComment"># An exit-descriptor's target is its input, computed during 'tailor-exit-descriptor'.</span>
+<span id="L33" class="LineNr"> 33 </span><span class="subxComment"># Its value is its output, computed during stop and available to the test.</span>
 <span id="L34" class="LineNr"> 34 </span>
 <span id="L35" class="LineNr"> 35 </span>== code
-<span id="L36" class="LineNr"> 36 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L36" class="LineNr"> 36 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L37" class="LineNr"> 37 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L38" class="LineNr"> 38 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L39" class="LineNr"> 39 </span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment"># main:</span>
-<span id="L41" class="LineNr"> 41 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L40" class="LineNr"> 40 </span><span class="subxComment"># main:</span>
+<span id="L41" class="LineNr"> 41 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L42" class="LineNr"> 42 </span><span class="CommentedCode">#?   e8/call  test-stop-skips-returns-on-exit/disp32</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
-<span id="L44" class="LineNr"> 44 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L44" class="LineNr"> 44 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L45" class="LineNr"> 45 </span>  b8/copy-to-EAX  1/imm32
 <span id="L46" class="LineNr"> 46 </span>  cd/syscall  0x80/imm8
 <span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment"># Configure an exit-descriptor for a call pushing 'nbytes' bytes of args to</span>
-<span id="L49" class="LineNr"> 49 </span><span class="Comment"># the stack.</span>
-<span id="L50" class="LineNr"> 50 </span><span class="Comment"># Ugly that we need to know the size of args, but so it goes.</span>
-<span id="L51" class="LineNr"> 51 </span>tailor-exit-descriptor:  <span class="Comment"># ed : (address exit-descriptor), nbytes : int -&gt; &lt;void&gt;</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># prolog</span>
+<span id="L48" class="LineNr"> 48 </span><span class="subxComment"># Configure an exit-descriptor for a call pushing 'nbytes' bytes of args to</span>
+<span id="L49" class="LineNr"> 49 </span><span class="subxComment"># the stack.</span>
+<span id="L50" class="LineNr"> 50 </span><span class="subxComment"># Ugly that we need to know the size of args, but so it goes.</span>
+<span id="L51" class="LineNr"> 51 </span>tailor-exit-descriptor:  <span class="subxComment"># ed : (address exit-descriptor), nbytes : int -&gt; &lt;void&gt;</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="subxComment"># prolog</span>
 <span id="L53" class="LineNr"> 53 </span>  55/push-EBP
-<span id="L54" class="LineNr"> 54 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Comment"># save registers</span>
+<span id="L54" class="LineNr"> 54 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="subxComment"># save registers</span>
 <span id="L56" class="LineNr"> 56 </span>  50/push-EAX
 <span id="L57" class="LineNr"> 57 </span>  51/push-ECX
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># EAX = nbytes</span>
-<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EAX</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># Let X be the value of ESP in the caller, before the call to tailor-exit-descriptor.</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Comment"># The return address for a call in the caller's body will be at:</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment">#   X-8 if the caller takes 4 bytes of args for the exit-descriptor (add 4 bytes for the return address)</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Comment">#   X-12 if the caller takes 8 bytes of args</span>
-<span id="L64" class="LineNr"> 64 </span>  <span class="Comment">#   ..and so on</span>
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># That's the value we need to return: X-nbytes-4</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Comment">#</span>
-<span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># However, we also need to account for the perturbance to ESP caused by the</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Comment"># call to tailor-exit-descriptor. It pushes 8 bytes of args followed by 4</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Comment"># bytes for the return address and 4 bytes to push EBP above.</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Comment"># So EBP at this point is X-16.</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Comment">#</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># So the return address for the next call in the caller is:</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Comment">#   EBP+8 if the caller takes 4 bytes of args</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Comment">#   EBP+4 if the caller takes 8 bytes of args</span>
-<span id="L75" class="LineNr"> 75 </span>  <span class="Comment">#   EBP if the caller takes 12 bytes of args</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Comment">#   EBP-4 if the caller takes 16 bytes of args</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Comment">#   ..and so on</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># That's EBP+12-nbytes.</span>
-<span id="L79" class="LineNr"> 79 </span>    <span class="Comment"># option 1: 6 + 3 bytes</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="subxComment"># EAX = nbytes</span>
+<span id="L59" class="LineNr"> 59 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="subxComment"># Let X be the value of ESP in the caller, before the call to tailor-exit-descriptor.</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="subxComment"># The return address for a call in the caller's body will be at:</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="subxComment">#   X-8 if the caller takes 4 bytes of args for the exit-descriptor (add 4 bytes for the return address)</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="subxComment">#   X-12 if the caller takes 8 bytes of args</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="subxComment">#   ..and so on</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="subxComment"># That's the value we need to return: X-nbytes-4</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="subxComment">#</span>
+<span id="L67" class="LineNr"> 67 </span>  <span class="subxComment"># However, we also need to account for the perturbance to ESP caused by the</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="subxComment"># call to tailor-exit-descriptor. It pushes 8 bytes of args followed by 4</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="subxComment"># bytes for the return address and 4 bytes to push EBP above.</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="subxComment"># So EBP at this point is X-16.</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="subxComment">#</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="subxComment"># So the return address for the next call in the caller is:</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="subxComment">#   EBP+8 if the caller takes 4 bytes of args</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="subxComment">#   EBP+4 if the caller takes 8 bytes of args</span>
+<span id="L75" class="LineNr"> 75 </span>  <span class="subxComment">#   EBP if the caller takes 12 bytes of args</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="subxComment">#   EBP-4 if the caller takes 16 bytes of args</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="subxComment">#   ..and so on</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="subxComment"># That's EBP+12-nbytes.</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="subxComment"># option 1: 6 + 3 bytes</span>
 <span id="L80" class="LineNr"> 80 </span><span class="CommentedCode">#?   2d/subtract                     3/mod/direct    0/rm32/EAX    .           .             .           .           .               8/imm32           # subtract from EAX</span>
 <span id="L81" class="LineNr"> 81 </span><span class="CommentedCode">#?   8d/copy-address                 0/mod/indirect  4/rm32/sib    5/base/EBP  0/index/EAX   .           0/r32/EAX   .               .                 # copy EBP+EAX to EAX</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Comment"># option 2: 2 + 4 bytes</span>
-<span id="L83" class="LineNr"> 83 </span>  f7          3/subop/negate      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># negate EAX</span>
-<span id="L84" class="LineNr"> 84 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    5/base/EBP  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8        <span class="Delimiter"> . </span>              <span class="Comment"># copy EBP+EAX+12 to EAX</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># copy EAX to ed-&gt;target</span>
-<span id="L86" class="LineNr"> 86 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
-<span id="L87" class="LineNr"> 87 </span>  89/copy                         0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to *ECX</span>
-<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># initialize ed-&gt;value</span>
-<span id="L89" class="LineNr"> 89 </span>  c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         0/imm32           <span class="Comment"># copy to *(ECX+4)</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Comment"># restore registers</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># option 2: 2 + 4 bytes</span>
+<span id="L83" class="LineNr"> 83 </span>  f7          3/subop/negate      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># negate EAX</span>
+<span id="L84" class="LineNr"> 84 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    5/base/EBP  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8        <span class="CommentedCode"> . </span>              <span class="subxComment"># copy EBP+EAX+12 to EAX</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="subxComment"># copy EAX to ed-&gt;target</span>
+<span id="L86" class="LineNr"> 86 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L87" class="LineNr"> 87 </span>  89/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *ECX</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="subxComment"># initialize ed-&gt;value</span>
+<span id="L89" class="LineNr"> 89 </span>  c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(ECX+4)</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="subxComment"># restore registers</span>
 <span id="L91" class="LineNr"> 91 </span>  59/pop-to-ECX
 <span id="L92" class="LineNr"> 92 </span>  58/pop-to-EAX
-<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># epilog</span>
-<span id="L94" class="LineNr"> 94 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="subxComment"># epilog</span>
+<span id="L94" class="LineNr"> 94 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L95" class="LineNr"> 95 </span>  5d/pop-to-EBP
 <span id="L96" class="LineNr"> 96 </span>  c3/return
 <span id="L97" class="LineNr"> 97 </span>
-<span id="L98" class="LineNr"> 98 </span>stop:  <span class="Comment"># ed : (address exit-descriptor), value : int</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment"># no prolog; one way or another, we're going to clobber registers</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># EAX = ed</span>
-<span id="L101" class="LineNr">101 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EAX</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Comment"># exit(value) if ed-&gt;target == 0</span>
-<span id="L103" class="LineNr">103 </span>  81          7/subop/compare     0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare *EAX</span>
+<span id="L98" class="LineNr"> 98 </span>stop:  <span class="subxComment"># ed : (address exit-descriptor), value : int</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="subxComment"># no prolog; one way or another, we're going to clobber registers</span>
+<span id="L100" class="LineNr">100 </span>  <span class="subxComment"># EAX = ed</span>
+<span id="L101" class="LineNr">101 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
+<span id="L102" class="LineNr">102 </span>  <span class="subxComment"># exit(value) if ed-&gt;target == 0</span>
+<span id="L103" class="LineNr">103 </span>  81          7/subop/compare     0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare *EAX</span>
 <span id="L104" class="LineNr">104 </span>  75/jump-if-not-equal  $stop:fake/disp8
-<span id="L105" class="LineNr">105 </span>  <span class="Comment"># syscall(exit, value)</span>
-<span id="L106" class="LineNr">106 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EBX</span>
+<span id="L105" class="LineNr">105 </span>  <span class="subxComment"># syscall(exit, value)</span>
+<span id="L106" class="LineNr">106 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to EBX</span>
 <span id="L107" class="LineNr">107 </span>  b8/copy-to-EAX  1/imm32
 <span id="L108" class="LineNr">108 </span>  cd/syscall  0x80/imm8
 <span id="L109" class="LineNr">109 </span>$stop:fake:
-<span id="L110" class="LineNr">110 </span>  <span class="Comment"># ed-&gt;value = value+1</span>
-<span id="L111" class="LineNr">111 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to ECX</span>
+<span id="L110" class="LineNr">110 </span>  <span class="subxComment"># ed-&gt;value = value+1</span>
+<span id="L111" class="LineNr">111 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to ECX</span>
 <span id="L112" class="LineNr">112 </span>  41/inc-ECX
-<span id="L113" class="LineNr">113 </span>  89/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ECX to *(EAX+4)</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Comment"># non-local jump to ed-&gt;target</span>
-<span id="L115" class="LineNr">115 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to ESP</span>
-<span id="L116" class="LineNr">116 </span>  c3/return  <span class="Comment"># doesn't return to caller</span>
+<span id="L113" class="LineNr">113 </span>  89/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX to *(EAX+4)</span>
+<span id="L114" class="LineNr">114 </span>  <span class="subxComment"># non-local jump to ed-&gt;target</span>
+<span id="L115" class="LineNr">115 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ESP</span>
+<span id="L116" class="LineNr">116 </span>  c3/return  <span class="subxComment"># doesn't return to caller</span>
 <span id="L117" class="LineNr">117 </span>
 <span id="L118" class="LineNr">118 </span>test-stop-skips-returns-on-exit:
-<span id="L119" class="LineNr">119 </span>  <span class="Comment"># This looks like the standard prolog, but is here for different reasons.</span>
-<span id="L120" class="LineNr">120 </span>  <span class="Comment"># A function calling 'stop' can't rely on EBP persisting past the call.</span>
-<span id="L121" class="LineNr">121 </span>  <span class="Comment">#</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># Use EBP here as a stable base to refer to locals and arguments from in the</span>
-<span id="L123" class="LineNr">123 </span>  <span class="Comment"># presence of push/pop/call instructions.</span>
-<span id="L124" class="LineNr">124 </span>  <span class="Comment"># *Don't* use EBP as a way to restore ESP.</span>
+<span id="L119" class="LineNr">119 </span>  <span class="subxComment"># This looks like the standard prolog, but is here for different reasons.</span>
+<span id="L120" class="LineNr">120 </span>  <span class="subxComment"># A function calling 'stop' can't rely on EBP persisting past the call.</span>
+<span id="L121" class="LineNr">121 </span>  <span class="subxComment">#</span>
+<span id="L122" class="LineNr">122 </span>  <span class="subxComment"># Use EBP here as a stable base to refer to locals and arguments from in the</span>
+<span id="L123" class="LineNr">123 </span>  <span class="subxComment"># presence of push/pop/call instructions.</span>
+<span id="L124" class="LineNr">124 </span>  <span class="subxComment"># *Don't* use EBP as a way to restore ESP.</span>
 <span id="L125" class="LineNr">125 </span>  55/push-EBP
-<span id="L126" class="LineNr">126 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L127" class="LineNr">127 </span>  <span class="Comment"># Make room for an exit descriptor on the stack. That's almost always the</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Comment"># right place for it, available only as long as it's legal to use. Once this</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Comment"># containing function returns we'll need a new exit descriptor.</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L131" class="LineNr">131 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L132" class="LineNr">132 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Comment"># Size the exit-descriptor precisely for the next call below, to _test-stop-1.</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 4)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># push args</span>
+<span id="L126" class="LineNr">126 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L127" class="LineNr">127 </span>  <span class="subxComment"># Make room for an exit descriptor on the stack. That's almost always the</span>
+<span id="L128" class="LineNr">128 </span>  <span class="subxComment"># right place for it, available only as long as it's legal to use. Once this</span>
+<span id="L129" class="LineNr">129 </span>  <span class="subxComment"># containing function returns we'll need a new exit descriptor.</span>
+<span id="L130" class="LineNr">130 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L131" class="LineNr">131 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L132" class="LineNr">132 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L133" class="LineNr">133 </span>  <span class="subxComment"># Size the exit-descriptor precisely for the next call below, to _test-stop-1.</span>
+<span id="L134" class="LineNr">134 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 4)</span>
+<span id="L135" class="LineNr">135 </span>    <span class="subxComment"># push args</span>
 <span id="L136" class="LineNr">136 </span>  68/push  4/imm32/nbytes-of-args-for-_test-stop-1
 <span id="L137" class="LineNr">137 </span>  50/push-EAX
-<span id="L138" class="LineNr">138 </span>    <span class="Comment"># call</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxComment"># call</span>
 <span id="L139" class="LineNr">139 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># discard args</span>
-<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment"># call _test-stop-1(ed)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># push args</span>
+<span id="L140" class="LineNr">140 </span>    <span class="subxComment"># discard args</span>
+<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L142" class="LineNr">142 </span>  <span class="subxComment"># call _test-stop-1(ed)</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxComment"># push args</span>
 <span id="L144" class="LineNr">144 </span>  50/push-EAX
-<span id="L145" class="LineNr">145 </span>    <span class="Comment"># call</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxComment"># call</span>
 <span id="L146" class="LineNr">146 </span>  e8/call  _test-stop-1/disp32
-<span id="L147" class="LineNr">147 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L148" class="LineNr">148 </span>    <span class="Comment"># restore args</span>
+<span id="L147" class="LineNr">147 </span>  <span class="subxComment">## registers except ESP may be clobbered at this point</span>
+<span id="L148" class="LineNr">148 </span>    <span class="subxComment"># restore args</span>
 <span id="L149" class="LineNr">149 </span>  58/pop-to-EAX
-<span id="L150" class="LineNr">150 </span>  <span class="Comment"># check that _test-stop-1 tried to call exit(1)</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Comment"># check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
-<span id="L152" class="LineNr">152 </span>    <span class="Comment"># push args</span>
+<span id="L150" class="LineNr">150 </span>  <span class="subxComment"># check that _test-stop-1 tried to call exit(1)</span>
+<span id="L151" class="LineNr">151 </span>  <span class="subxComment"># check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
+<span id="L152" class="LineNr">152 </span>    <span class="subxComment"># push args</span>
 <span id="L153" class="LineNr">153 </span>  68/push  <span class="Constant">&quot;F - test-stop-skips-returns-on-exit&quot;</span>/imm32
 <span id="L154" class="LineNr">154 </span>  68/push  2/imm32
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># push ed-&gt;value</span>
-<span id="L156" class="LineNr">156 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+4)</span>
-<span id="L157" class="LineNr">157 </span>    <span class="Comment"># call</span>
+<span id="L155" class="LineNr">155 </span>    <span class="subxComment"># push ed-&gt;value</span>
+<span id="L156" class="LineNr">156 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L157" class="LineNr">157 </span>    <span class="subxComment"># call</span>
 <span id="L158" class="LineNr">158 </span>  e8/call  check-ints-equal/disp32
-<span id="L159" class="LineNr">159 </span>    <span class="Comment"># discard args</span>
-<span id="L160" class="LineNr">160 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Comment"># epilog</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># discard args</span>
+<span id="L160" class="LineNr">160 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>  <span class="subxComment"># epilog</span>
 <span id="L162" class="LineNr">162 </span>  5d/pop-to-EBP
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
+<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L165" class="LineNr">165 </span>  c3/return
 <span id="L166" class="LineNr">166 </span>
-<span id="L167" class="LineNr">167 </span>_test-stop-1:  <span class="Comment"># ed : (address exit-descriptor)</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Comment"># prolog</span>
+<span id="L167" class="LineNr">167 </span>_test-stop-1:  <span class="subxComment"># ed : (address exit-descriptor)</span>
+<span id="L168" class="LineNr">168 </span>  <span class="subxComment"># prolog</span>
 <span id="L169" class="LineNr">169 </span>  55/push-EBP
-<span id="L170" class="LineNr">170 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Comment"># _test-stop-2(ed)</span>
-<span id="L172" class="LineNr">172 </span>    <span class="Comment"># push args</span>
-<span id="L173" class="LineNr">173 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L174" class="LineNr">174 </span>    <span class="Comment"># call</span>
+<span id="L170" class="LineNr">170 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L171" class="LineNr">171 </span>  <span class="subxComment"># _test-stop-2(ed)</span>
+<span id="L172" class="LineNr">172 </span>    <span class="subxComment"># push args</span>
+<span id="L173" class="LineNr">173 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L174" class="LineNr">174 </span>    <span class="subxComment"># call</span>
 <span id="L175" class="LineNr">175 </span>  e8/call  _test-stop-2/disp32
-<span id="L176" class="LineNr">176 </span>  <span class="SalientComment">## should never get past this point</span>
-<span id="L177" class="LineNr">177 </span>    <span class="Comment"># discard args</span>
-<span id="L178" class="LineNr">178 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L179" class="LineNr">179 </span>  <span class="Comment"># signal test failed: check-ints-equal(1, 0, msg)</span>
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># push args</span>
+<span id="L176" class="LineNr">176 </span>  <span class="subxComment">## should never get past this point</span>
+<span id="L177" class="LineNr">177 </span>    <span class="subxComment"># discard args</span>
+<span id="L178" class="LineNr">178 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L179" class="LineNr">179 </span>  <span class="subxComment"># signal test failed: check-ints-equal(1, 0, msg)</span>
+<span id="L180" class="LineNr">180 </span>    <span class="subxComment"># push args</span>
 <span id="L181" class="LineNr">181 </span>  68/push  <span class="Constant">&quot;F - test-stop-skips-returns-on-exit&quot;</span>/imm32
 <span id="L182" class="LineNr">182 </span>  68/push  0/imm32
 <span id="L183" class="LineNr">183 </span>  68/push  1/imm32
-<span id="L184" class="LineNr">184 </span>    <span class="Comment"># call</span>
+<span id="L184" class="LineNr">184 </span>    <span class="subxComment"># call</span>
 <span id="L185" class="LineNr">185 </span>  e8/call  check-ints-equal/disp32
-<span id="L186" class="LineNr">186 </span>    <span class="Comment"># discard args</span>
-<span id="L187" class="LineNr">187 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Comment"># epilog</span>
-<span id="L189" class="LineNr">189 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L186" class="LineNr">186 </span>    <span class="subxComment"># discard args</span>
+<span id="L187" class="LineNr">187 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L188" class="LineNr">188 </span>  <span class="subxComment"># epilog</span>
+<span id="L189" class="LineNr">189 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L190" class="LineNr">190 </span>  5d/pop-to-EBP
 <span id="L191" class="LineNr">191 </span>  c3/return
 <span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span>_test-stop-2:  <span class="Comment"># ed : (address exit-descriptor)</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Comment"># prolog</span>
+<span id="L193" class="LineNr">193 </span>_test-stop-2:  <span class="subxComment"># ed : (address exit-descriptor)</span>
+<span id="L194" class="LineNr">194 </span>  <span class="subxComment"># prolog</span>
 <span id="L195" class="LineNr">195 </span>  55/push-EBP
-<span id="L196" class="LineNr">196 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment"># call stop(ed, 1)</span>
-<span id="L198" class="LineNr">198 </span>    <span class="Comment"># push args</span>
+<span id="L196" class="LineNr">196 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L197" class="LineNr">197 </span>  <span class="subxComment"># call stop(ed, 1)</span>
+<span id="L198" class="LineNr">198 </span>    <span class="subxComment"># push args</span>
 <span id="L199" class="LineNr">199 </span>  68/push  1/imm32
-<span id="L200" class="LineNr">200 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L201" class="LineNr">201 </span>    <span class="Comment"># call</span>
+<span id="L200" class="LineNr">200 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxComment"># call</span>
 <span id="L202" class="LineNr">202 </span>  e8/call  stop/disp32
-<span id="L203" class="LineNr">203 </span>  <span class="SalientComment">## should never get past this point</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment"># epilog</span>
-<span id="L205" class="LineNr">205 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L203" class="LineNr">203 </span>  <span class="subxComment">## should never get past this point</span>
+<span id="L204" class="LineNr">204 </span>  <span class="subxComment"># epilog</span>
+<span id="L205" class="LineNr">205 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L206" class="LineNr">206 </span>  5d/pop-to-EBP
 <span id="L207" class="LineNr">207 </span>  c3/return
 <span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L209" class="LineNr">209 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/058read.subx.html b/html/subx/058read.subx.html
index 3bc489c9..6b8f02d4 100644
--- a/html/subx/058read.subx.html
+++ b/html/subx/058read.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -56,369 +54,369 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># read: analogously to write, support reading from in-memory streams in</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment"># addition to file descriptors.</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># We can pass it either a file descriptor or an address to a stream. If a</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># file descriptor is passed in, we _read from it using the right syscall. If a</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># stream is passed in (a fake file descriptor), we read from it instead. This</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># lets us initialize input for tests.</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">#</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># A little counter-intuitively, the output of 'read' ends up in.. a stream. So</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># tests end up doing a redundant copy. Why? Well, consider the alternatives:</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#   a) Reading into a string, and returning a pointer to the end of the read</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">#   region, or a count of bytes written. Now this count or end pointer must be</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   managed separately by the caller, which can be error-prone.</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">#</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">#   b) Having 'read' return a buffer that it allocates. But there's no way to</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">#   know in advance how large to make the buffer. If you read less than the</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">#   size of the buffer you again end up needing to manage initialized vs</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">#   uninitialized memory.</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">#</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment">#   c) Creating more helpful variants like 'read-byte' or 'read-until' which</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment">#   also can take a file descriptor or stream, just like 'write'. But such</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">#   primitives don't exist in the Linux kernel, so we'd be implementing them</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">#   somehow, either with more internal buffering or by making multiple</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment">#   syscalls.</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment">#</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment"># Reading into a stream avoids these problems. The buffer is externally</span>
-<span id="L28" class="LineNr"> 28 </span><span class="Comment"># provided and the caller has control over where it's allocated, its lifetime,</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># and so on. The buffer's read and write pointers are internal to it so it's</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># easier to keep in a consistent state. And it can now be passed directly to</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment"># helpers like 'read-byte' or 'read-until' that only need to support streams,</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment"># never file descriptors.</span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment">#</span>
-<span id="L34" class="LineNr"> 34 </span><span class="Comment"># Like with 'write', we assume our data segment will never begin at an address</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Comment"># shorter than 0x08000000, so any smaller arguments are assumed to be real</span>
-<span id="L36" class="LineNr"> 36 </span><span class="Comment"># file descriptors.</span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">#</span>
-<span id="L38" class="LineNr"> 38 </span><span class="Comment"># As a reminder, a stream looks like this:</span>
-<span id="L39" class="LineNr"> 39 </span><span class="Comment">#   write: int  # index at which to write to next</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Comment">#   read: int  # index at which to read next</span>
-<span id="L41" class="LineNr"> 41 </span><span class="Comment">#   data: (array byte)  # prefixed by length as usual</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># read: analogously to write, support reading from in-memory streams in</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment"># addition to file descriptors.</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># We can pass it either a file descriptor or an address to a stream. If a</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># file descriptor is passed in, we _read from it using the right syscall. If a</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># stream is passed in (a fake file descriptor), we read from it instead. This</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># lets us initialize input for tests.</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment"># A little counter-intuitively, the output of 'read' ends up in.. a stream. So</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment"># tests end up doing a redundant copy. Why? Well, consider the alternatives:</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#   a) Reading into a string, and returning a pointer to the end of the read</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment">#   region, or a count of bytes written. Now this count or end pointer must be</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment">#   managed separately by the caller, which can be error-prone.</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment">#</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment">#   b) Having 'read' return a buffer that it allocates. But there's no way to</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxComment">#   know in advance how large to make the buffer. If you read less than the</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment">#   size of the buffer you again end up needing to manage initialized vs</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment">#   uninitialized memory.</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment">#</span>
+<span id="L21" class="LineNr"> 21 </span><span class="subxComment">#   c) Creating more helpful variants like 'read-byte' or 'read-until' which</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment">#   also can take a file descriptor or stream, just like 'write'. But such</span>
+<span id="L23" class="LineNr"> 23 </span><span class="subxComment">#   primitives don't exist in the Linux kernel, so we'd be implementing them</span>
+<span id="L24" class="LineNr"> 24 </span><span class="subxComment">#   somehow, either with more internal buffering or by making multiple</span>
+<span id="L25" class="LineNr"> 25 </span><span class="subxComment">#   syscalls.</span>
+<span id="L26" class="LineNr"> 26 </span><span class="subxComment">#</span>
+<span id="L27" class="LineNr"> 27 </span><span class="subxComment"># Reading into a stream avoids these problems. The buffer is externally</span>
+<span id="L28" class="LineNr"> 28 </span><span class="subxComment"># provided and the caller has control over where it's allocated, its lifetime,</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># and so on. The buffer's read and write pointers are internal to it so it's</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># easier to keep in a consistent state. And it can now be passed directly to</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxComment"># helpers like 'read-byte' or 'read-until' that only need to support streams,</span>
+<span id="L32" class="LineNr"> 32 </span><span class="subxComment"># never file descriptors.</span>
+<span id="L33" class="LineNr"> 33 </span><span class="subxComment">#</span>
+<span id="L34" class="LineNr"> 34 </span><span class="subxComment"># Like with 'write', we assume our data segment will never begin at an address</span>
+<span id="L35" class="LineNr"> 35 </span><span class="subxComment"># shorter than 0x08000000, so any smaller arguments are assumed to be real</span>
+<span id="L36" class="LineNr"> 36 </span><span class="subxComment"># file descriptors.</span>
+<span id="L37" class="LineNr"> 37 </span><span class="subxComment">#</span>
+<span id="L38" class="LineNr"> 38 </span><span class="subxComment"># As a reminder, a stream looks like this:</span>
+<span id="L39" class="LineNr"> 39 </span><span class="subxComment">#   write: int  # index at which to write to next</span>
+<span id="L40" class="LineNr"> 40 </span><span class="subxComment">#   read: int  # index at which to read next</span>
+<span id="L41" class="LineNr"> 41 </span><span class="subxComment">#   data: (array byte)  # prefixed by length as usual</span>
 <span id="L42" class="LineNr"> 42 </span>
 <span id="L43" class="LineNr"> 43 </span>== code
-<span id="L44" class="LineNr"> 44 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L45" class="LineNr"> 45 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L46" class="LineNr"> 46 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L44" class="LineNr"> 44 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L45" class="LineNr"> 45 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L46" class="LineNr"> 46 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L47" class="LineNr"> 47 </span>
-<span id="L48" class="LineNr"> 48 </span><span class="Comment"># main:</span>
-<span id="L49" class="LineNr"> 49 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
-<span id="L51" class="LineNr"> 51 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L48" class="LineNr"> 48 </span><span class="subxComment"># main:</span>
+<span id="L49" class="LineNr"> 49 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L51" class="LineNr"> 51 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L52" class="LineNr"> 52 </span>  b8/copy-to-EAX  1/imm32
 <span id="L53" class="LineNr"> 53 </span>  cd/syscall  0x80/imm8
 <span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span>read:  <span class="Comment"># f : fd or (address stream), s : (address stream) -&gt; num-bytes-read/EAX</span>
-<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># prolog</span>
+<span id="L55" class="LineNr"> 55 </span>read:  <span class="subxComment"># f : fd or (address stream), s : (address stream) -&gt; num-bytes-read/EAX</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="subxComment"># prolog</span>
 <span id="L57" class="LineNr"> 57 </span>  55/push-EBP
-<span id="L58" class="LineNr"> 58 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="SalientComment">## if (f &lt; 0x08000000) return _read(f, s)  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
-<span id="L60" class="LineNr"> 60 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         0x08000000/imm32  <span class="Comment"># compare *(EBP+8)</span>
+<span id="L58" class="LineNr"> 58 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="subxComment">## if (f &lt; 0x08000000) return _read(f, s)  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
+<span id="L60" class="LineNr"> 60 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L61" class="LineNr"> 61 </span>  7d/jump-if-greater-or-equal  $read:fake/disp8
-<span id="L62" class="LineNr"> 62 </span>    <span class="Comment"># push args</span>
-<span id="L63" class="LineNr"> 63 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L64" class="LineNr"> 64 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L65" class="LineNr"> 65 </span>    <span class="Comment"># call</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="subxComment"># push args</span>
+<span id="L63" class="LineNr"> 63 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L64" class="LineNr"> 64 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># call</span>
 <span id="L66" class="LineNr"> 66 </span>  e8/call  _read/disp32
-<span id="L67" class="LineNr"> 67 </span>    <span class="Comment"># discard args</span>
-<span id="L68" class="LineNr"> 68 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L69" class="LineNr"> 69 </span>  <span class="Comment"># return</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="subxComment"># discard args</span>
+<span id="L68" class="LineNr"> 68 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L69" class="LineNr"> 69 </span>  <span class="subxComment"># return</span>
 <span id="L70" class="LineNr"> 70 </span>  eb/jump  $read:end/disp8
 <span id="L71" class="LineNr"> 71 </span>$read:fake:
-<span id="L72" class="LineNr"> 72 </span>  <span class="SalientComment">## otherwise, treat 'f' as a stream to scan from</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Comment"># save registers</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="subxComment">## otherwise, treat 'f' as a stream to scan from</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="subxComment"># save registers</span>
 <span id="L74" class="LineNr"> 74 </span>  56/push-ESI
 <span id="L75" class="LineNr"> 75 </span>  57/push-EDI
-<span id="L76" class="LineNr"> 76 </span>  <span class="Comment"># ESI = f</span>
-<span id="L77" class="LineNr"> 77 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ESI</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># EDI = s</span>
-<span id="L79" class="LineNr"> 79 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># EAX = _append-4(out = &amp;s-&gt;data[s-&gt;write], outend = &amp;s-&gt;data[s-&gt;length],</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Comment">#                 in  = &amp;f-&gt;data[f-&gt;read],  inend  = &amp;f-&gt;data[f-&gt;write])</span>
-<span id="L82" class="LineNr"> 82 </span>    <span class="Comment"># push &amp;f-&gt;data[f-&gt;write]</span>
-<span id="L83" class="LineNr"> 83 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ESI to EAX</span>
-<span id="L84" class="LineNr"> 84 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+EAX+12 to EAX</span>
+<span id="L76" class="LineNr"> 76 </span>  <span class="subxComment"># ESI = f</span>
+<span id="L77" class="LineNr"> 77 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="subxComment"># EDI = s</span>
+<span id="L79" class="LineNr"> 79 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="subxComment"># EAX = _append-4(out = &amp;s-&gt;data[s-&gt;write], outend = &amp;s-&gt;data[s-&gt;length],</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="subxComment">#                 in  = &amp;f-&gt;data[f-&gt;read],  inend  = &amp;f-&gt;data[f-&gt;write])</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># push &amp;f-&gt;data[f-&gt;write]</span>
+<span id="L83" class="LineNr"> 83 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L84" class="LineNr"> 84 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L85" class="LineNr"> 85 </span>  50/push-EAX
-<span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># push &amp;f-&gt;data[f-&gt;read]</span>
-<span id="L87" class="LineNr"> 87 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESI+4) to EAX</span>
-<span id="L88" class="LineNr"> 88 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+EAX+12 to EAX</span>
+<span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># push &amp;f-&gt;data[f-&gt;read]</span>
+<span id="L87" class="LineNr"> 87 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
+<span id="L88" class="LineNr"> 88 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L89" class="LineNr"> 89 </span>  50/push-EAX
-<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># push &amp;s-&gt;data[s-&gt;length]</span>
-<span id="L91" class="LineNr"> 91 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EDI+8) to EAX</span>
-<span id="L92" class="LineNr"> 92 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+EAX+12 to EAX</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># push &amp;s-&gt;data[s-&gt;length]</span>
+<span id="L91" class="LineNr"> 91 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EAX</span>
+<span id="L92" class="LineNr"> 92 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L93" class="LineNr"> 93 </span>  50/push-EAX
-<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># push &amp;s-&gt;data[s-&gt;write]</span>
-<span id="L95" class="LineNr"> 95 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDI to EAX</span>
-<span id="L96" class="LineNr"> 96 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+EAX+12 to EAX</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxComment"># push &amp;s-&gt;data[s-&gt;write]</span>
+<span id="L95" class="LineNr"> 95 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to EAX</span>
+<span id="L96" class="LineNr"> 96 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L97" class="LineNr"> 97 </span>  50/push-EAX
-<span id="L98" class="LineNr"> 98 </span>    <span class="Comment"># call</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxComment"># call</span>
 <span id="L99" class="LineNr"> 99 </span>  e8/call  _append-4/disp32
-<span id="L100" class="LineNr">100 </span>    <span class="Comment"># discard args</span>
-<span id="L101" class="LineNr">101 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Comment"># s-&gt;write += EAX</span>
-<span id="L103" class="LineNr">103 </span>  01/add                          0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *EDI</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Comment"># f.read += EAX</span>
-<span id="L105" class="LineNr">105 </span>  01/add                          1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *(ESI+4)</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Comment"># restore registers</span>
+<span id="L100" class="LineNr">100 </span>    <span class="subxComment"># discard args</span>
+<span id="L101" class="LineNr">101 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L102" class="LineNr">102 </span>  <span class="subxComment"># s-&gt;write += EAX</span>
+<span id="L103" class="LineNr">103 </span>  01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
+<span id="L104" class="LineNr">104 </span>  <span class="subxComment"># f.read += EAX</span>
+<span id="L105" class="LineNr">105 </span>  01/add                          1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *(ESI+4)</span>
+<span id="L106" class="LineNr">106 </span>  <span class="subxComment"># restore registers</span>
 <span id="L107" class="LineNr">107 </span>  5f/pop-to-EDI
 <span id="L108" class="LineNr">108 </span>  5e/pop-to-ESI
 <span id="L109" class="LineNr">109 </span>$read:end:
-<span id="L110" class="LineNr">110 </span>  <span class="Comment"># epilog</span>
-<span id="L111" class="LineNr">111 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L110" class="LineNr">110 </span>  <span class="subxComment"># epilog</span>
+<span id="L111" class="LineNr">111 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L112" class="LineNr">112 </span>  5d/pop-to-EBP
 <span id="L113" class="LineNr">113 </span>  c3/return
 <span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="SalientComment">## helpers</span>
+<span id="L115" class="LineNr">115 </span><span class="subxComment">## helpers</span>
 <span id="L116" class="LineNr">116 </span>
-<span id="L117" class="LineNr">117 </span><span class="Comment"># idea: a clear-if-empty method on streams that clears only if f.read == f.write</span>
-<span id="L118" class="LineNr">118 </span><span class="Comment"># Unclear how I'd use it, though. Callers seem to need the check anyway.</span>
-<span id="L119" class="LineNr">119 </span><span class="Comment"># Maybe a better helper would be 'empty-stream?'</span>
+<span id="L117" class="LineNr">117 </span><span class="subxComment"># idea: a clear-if-empty method on streams that clears only if f.read == f.write</span>
+<span id="L118" class="LineNr">118 </span><span class="subxComment"># Unclear how I'd use it, though. Callers seem to need the check anyway.</span>
+<span id="L119" class="LineNr">119 </span><span class="subxComment"># Maybe a better helper would be 'empty-stream?'</span>
 <span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span>_read:  <span class="Comment"># fd : int, s : (address stream) -&gt; num-bytes-read/EAX</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># prolog</span>
+<span id="L121" class="LineNr">121 </span>_read:  <span class="subxComment"># fd : int, s : (address stream) -&gt; num-bytes-read/EAX</span>
+<span id="L122" class="LineNr">122 </span>  <span class="subxComment"># prolog</span>
 <span id="L123" class="LineNr">123 </span>  55/push-EBP
-<span id="L124" class="LineNr">124 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Comment"># save registers</span>
+<span id="L124" class="LineNr">124 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L125" class="LineNr">125 </span>  <span class="subxComment"># save registers</span>
 <span id="L126" class="LineNr">126 </span>  51/push-ECX
 <span id="L127" class="LineNr">127 </span>  52/push-EDX
 <span id="L128" class="LineNr">128 </span>  53/push-EBX
 <span id="L129" class="LineNr">129 </span>  56/push-ESI
-<span id="L130" class="LineNr">130 </span>  <span class="Comment"># ESI = s</span>
-<span id="L131" class="LineNr">131 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Comment"># EAX = s-&gt;write</span>
-<span id="L133" class="LineNr">133 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ESI to EAX</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># EDX = s-&gt;length</span>
-<span id="L135" class="LineNr">135 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESI+8) to EDX</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Comment"># syscall(read, fd, &amp;s-&gt;data[s-&gt;write], s-&gt;length - s-&gt;write)</span>
-<span id="L137" class="LineNr">137 </span>    <span class="Comment"># fd : EBX</span>
-<span id="L138" class="LineNr">138 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
-<span id="L139" class="LineNr">139 </span>    <span class="Comment"># data : ECX = &amp;s-&gt;data[s-&gt;write]</span>
-<span id="L140" class="LineNr">140 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+EAX+12 to ECX</span>
-<span id="L141" class="LineNr">141 </span>    <span class="Comment"># size : EDX = s-&gt;length - s-&gt;write</span>
-<span id="L142" class="LineNr">142 </span>  29/subtract                     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># subtract EAX from EDX</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># syscall</span>
+<span id="L130" class="LineNr">130 </span>  <span class="subxComment"># ESI = s</span>
+<span id="L131" class="LineNr">131 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L132" class="LineNr">132 </span>  <span class="subxComment"># EAX = s-&gt;write</span>
+<span id="L133" class="LineNr">133 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L134" class="LineNr">134 </span>  <span class="subxComment"># EDX = s-&gt;length</span>
+<span id="L135" class="LineNr">135 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+8) to EDX</span>
+<span id="L136" class="LineNr">136 </span>  <span class="subxComment"># syscall(read, fd, &amp;s-&gt;data[s-&gt;write], s-&gt;length - s-&gt;write)</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxComment"># fd : EBX</span>
+<span id="L138" class="LineNr">138 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxComment"># data : ECX = &amp;s-&gt;data[s-&gt;write]</span>
+<span id="L140" class="LineNr">140 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to ECX</span>
+<span id="L141" class="LineNr">141 </span>    <span class="subxComment"># size : EDX = s-&gt;length - s-&gt;write</span>
+<span id="L142" class="LineNr">142 </span>  29/subtract                     3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract EAX from EDX</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxComment"># syscall</span>
 <span id="L144" class="LineNr">144 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L145" class="LineNr">145 </span>  cd/syscall  0x80/imm8
-<span id="L146" class="LineNr">146 </span>  <span class="Comment"># add the result EAX to s-&gt;write</span>
-<span id="L147" class="LineNr">147 </span>  01/add                          0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *ESI</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Comment"># restore registers</span>
+<span id="L146" class="LineNr">146 </span>  <span class="subxComment"># add the result EAX to s-&gt;write</span>
+<span id="L147" class="LineNr">147 </span>  01/add                          0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *ESI</span>
+<span id="L148" class="LineNr">148 </span>  <span class="subxComment"># restore registers</span>
 <span id="L149" class="LineNr">149 </span>  5e/pop-to-ESI
 <span id="L150" class="LineNr">150 </span>  5b/pop-to-EBX
 <span id="L151" class="LineNr">151 </span>  5a/pop-to-EDX
 <span id="L152" class="LineNr">152 </span>  59/pop-to-ECX
-<span id="L153" class="LineNr">153 </span>  <span class="Comment"># epilog</span>
-<span id="L154" class="LineNr">154 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L153" class="LineNr">153 </span>  <span class="subxComment"># epilog</span>
+<span id="L154" class="LineNr">154 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L155" class="LineNr">155 </span>  5d/pop-to-EBP
 <span id="L156" class="LineNr">156 </span>  c3/return
 <span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span>  <span class="Comment"># Two options:</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Comment">#   1 (what we have above):</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Comment">#     ECX = s</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Comment">#     EAX = s-&gt;write</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment">#     EDX = s-&gt;length</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Comment">#     # syscall</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Comment">#     ECX = lea ECX+EAX+12</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Comment">#     EDX = sub EDX EAX</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Comment">#</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Comment">#   2:</span>
-<span id="L168" class="LineNr">168 </span>  <span class="Comment">#     ECX = s</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Comment">#     EDX = s-&gt;length</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Comment">#     ECX = &amp;s-&gt;data</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Comment">#     # syscall</span>
-<span id="L172" class="LineNr">172 </span>  <span class="Comment">#     ECX = add ECX, s-&gt;write</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Comment">#     EDX = sub EDX, s-&gt;write</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Comment">#</span>
-<span id="L175" class="LineNr">175 </span>  <span class="Comment"># Not much to choose between the two? Option 2 performs a duplicate load to</span>
-<span id="L176" class="LineNr">176 </span>  <span class="Comment"># use one less register, but doesn't increase the amount of spilling (ECX</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Comment"># and EDX must be used, and EAX must be clobbered anyway).</span>
+<span id="L158" class="LineNr">158 </span>  <span class="subxComment"># Two options:</span>
+<span id="L159" class="LineNr">159 </span>  <span class="subxComment">#   1 (what we have above):</span>
+<span id="L160" class="LineNr">160 </span>  <span class="subxComment">#     ECX = s</span>
+<span id="L161" class="LineNr">161 </span>  <span class="subxComment">#     EAX = s-&gt;write</span>
+<span id="L162" class="LineNr">162 </span>  <span class="subxComment">#     EDX = s-&gt;length</span>
+<span id="L163" class="LineNr">163 </span>  <span class="subxComment">#     # syscall</span>
+<span id="L164" class="LineNr">164 </span>  <span class="subxComment">#     ECX = lea ECX+EAX+12</span>
+<span id="L165" class="LineNr">165 </span>  <span class="subxComment">#     EDX = sub EDX EAX</span>
+<span id="L166" class="LineNr">166 </span>  <span class="subxComment">#</span>
+<span id="L167" class="LineNr">167 </span>  <span class="subxComment">#   2:</span>
+<span id="L168" class="LineNr">168 </span>  <span class="subxComment">#     ECX = s</span>
+<span id="L169" class="LineNr">169 </span>  <span class="subxComment">#     EDX = s-&gt;length</span>
+<span id="L170" class="LineNr">170 </span>  <span class="subxComment">#     ECX = &amp;s-&gt;data</span>
+<span id="L171" class="LineNr">171 </span>  <span class="subxComment">#     # syscall</span>
+<span id="L172" class="LineNr">172 </span>  <span class="subxComment">#     ECX = add ECX, s-&gt;write</span>
+<span id="L173" class="LineNr">173 </span>  <span class="subxComment">#     EDX = sub EDX, s-&gt;write</span>
+<span id="L174" class="LineNr">174 </span>  <span class="subxComment">#</span>
+<span id="L175" class="LineNr">175 </span>  <span class="subxComment"># Not much to choose between the two? Option 2 performs a duplicate load to</span>
+<span id="L176" class="LineNr">176 </span>  <span class="subxComment"># use one less register, but doesn't increase the amount of spilling (ECX</span>
+<span id="L177" class="LineNr">177 </span>  <span class="subxComment"># and EDX must be used, and EAX must be clobbered anyway).</span>
 <span id="L178" class="LineNr">178 </span>
-<span id="L179" class="LineNr">179 </span><span class="SalientComment">## tests</span>
+<span id="L179" class="LineNr">179 </span><span class="subxComment">## tests</span>
 <span id="L180" class="LineNr">180 </span>
 <span id="L181" class="LineNr">181 </span>test-read-single:
-<span id="L182" class="LineNr">182 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L183" class="LineNr">183 </span>    <span class="Comment"># push args</span>
+<span id="L182" class="LineNr">182 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L183" class="LineNr">183 </span>    <span class="subxComment"># push args</span>
 <span id="L184" class="LineNr">184 </span>  68/push  _test-stream/imm32
-<span id="L185" class="LineNr">185 </span>    <span class="Comment"># call</span>
+<span id="L185" class="LineNr">185 </span>    <span class="subxComment"># call</span>
 <span id="L186" class="LineNr">186 </span>  e8/call  clear-stream/disp32
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># discard args</span>
-<span id="L188" class="LineNr">188 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Comment"># clear-stream(_test-stream-buffer)</span>
-<span id="L190" class="LineNr">190 </span>    <span class="Comment"># push args</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxComment"># discard args</span>
+<span id="L188" class="LineNr">188 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L189" class="LineNr">189 </span>  <span class="subxComment"># clear-stream(_test-stream-buffer)</span>
+<span id="L190" class="LineNr">190 </span>    <span class="subxComment"># push args</span>
 <span id="L191" class="LineNr">191 </span>  68/push  _test-stream-buffer/imm32
-<span id="L192" class="LineNr">192 </span>    <span class="Comment"># call</span>
+<span id="L192" class="LineNr">192 </span>    <span class="subxComment"># call</span>
 <span id="L193" class="LineNr">193 </span>  e8/call  clear-stream/disp32
-<span id="L194" class="LineNr">194 </span>    <span class="Comment"># discard args</span>
-<span id="L195" class="LineNr">195 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Comment"># write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L197" class="LineNr">197 </span>    <span class="Comment"># push args</span>
+<span id="L194" class="LineNr">194 </span>    <span class="subxComment"># discard args</span>
+<span id="L195" class="LineNr">195 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L196" class="LineNr">196 </span>  <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L197" class="LineNr">197 </span>    <span class="subxComment"># push args</span>
 <span id="L198" class="LineNr">198 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L199" class="LineNr">199 </span>  68/push  _test-stream/imm32
-<span id="L200" class="LineNr">200 </span>    <span class="Comment"># call</span>
+<span id="L200" class="LineNr">200 </span>    <span class="subxComment"># call</span>
 <span id="L201" class="LineNr">201 </span>  e8/call  write/disp32
-<span id="L202" class="LineNr">202 </span>    <span class="Comment"># discard args</span>
-<span id="L203" class="LineNr">203 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment"># read(_test-stream, _test-stream-buffer)</span>
-<span id="L205" class="LineNr">205 </span>    <span class="Comment"># push args</span>
+<span id="L202" class="LineNr">202 </span>    <span class="subxComment"># discard args</span>
+<span id="L203" class="LineNr">203 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L204" class="LineNr">204 </span>  <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
+<span id="L205" class="LineNr">205 </span>    <span class="subxComment"># push args</span>
 <span id="L206" class="LineNr">206 </span>  68/push  _test-stream-buffer/imm32
 <span id="L207" class="LineNr">207 </span>  68/push  _test-stream/imm32
-<span id="L208" class="LineNr">208 </span>    <span class="Comment"># call</span>
+<span id="L208" class="LineNr">208 </span>    <span class="subxComment"># call</span>
 <span id="L209" class="LineNr">209 </span>  e8/call  read/disp32
-<span id="L210" class="LineNr">210 </span>    <span class="Comment"># discard args</span>
-<span id="L211" class="LineNr">211 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Comment"># check-ints-equal(EAX, 2)</span>
-<span id="L213" class="LineNr">213 </span>    <span class="Comment"># push args</span>
+<span id="L210" class="LineNr">210 </span>    <span class="subxComment"># discard args</span>
+<span id="L211" class="LineNr">211 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L212" class="LineNr">212 </span>  <span class="subxComment"># check-ints-equal(EAX, 2)</span>
+<span id="L213" class="LineNr">213 </span>    <span class="subxComment"># push args</span>
 <span id="L214" class="LineNr">214 </span>  68/push  <span class="Constant">&quot;F - test-read-single: return EAX&quot;</span>/imm32
 <span id="L215" class="LineNr">215 </span>  68/push  2/imm32
 <span id="L216" class="LineNr">216 </span>  50/push-EAX
-<span id="L217" class="LineNr">217 </span>    <span class="Comment"># call</span>
+<span id="L217" class="LineNr">217 </span>    <span class="subxComment"># call</span>
 <span id="L218" class="LineNr">218 </span>  e8/call  check-ints-equal/disp32
-<span id="L219" class="LineNr">219 </span>    <span class="Comment"># discard args</span>
-<span id="L220" class="LineNr">220 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Comment"># check-ints-equal(*_test-stream-buffer-&gt;data, 41/A 62/b 00 00, msg)</span>
-<span id="L222" class="LineNr">222 </span>    <span class="Comment"># push args</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxComment"># discard args</span>
+<span id="L220" class="LineNr">220 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L221" class="LineNr">221 </span>  <span class="subxComment"># check-ints-equal(*_test-stream-buffer-&gt;data, 41/A 62/b 00 00, msg)</span>
+<span id="L222" class="LineNr">222 </span>    <span class="subxComment"># push args</span>
 <span id="L223" class="LineNr">223 </span>  68/push  <span class="Constant">&quot;F - test-read-single&quot;</span>/imm32
 <span id="L224" class="LineNr">224 </span>  68/push  0x006241/imm32/<span class="Special">Ab</span>
-<span id="L225" class="LineNr">225 </span>    <span class="Comment"># push *_test-stream-buffer-&gt;data</span>
+<span id="L225" class="LineNr">225 </span>    <span class="subxComment"># push *_test-stream-buffer-&gt;data</span>
 <span id="L226" class="LineNr">226 </span>  b8/copy-to-EAX  _test-stream-buffer/imm32
-<span id="L227" class="LineNr">227 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L228" class="LineNr">228 </span>    <span class="Comment"># call</span>
+<span id="L227" class="LineNr">227 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L228" class="LineNr">228 </span>    <span class="subxComment"># call</span>
 <span id="L229" class="LineNr">229 </span>  e8/call  check-ints-equal/disp32
-<span id="L230" class="LineNr">230 </span>    <span class="Comment"># discard args</span>
-<span id="L231" class="LineNr">231 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Comment"># end</span>
+<span id="L230" class="LineNr">230 </span>    <span class="subxComment"># discard args</span>
+<span id="L231" class="LineNr">231 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L232" class="LineNr">232 </span>  <span class="subxComment"># end</span>
 <span id="L233" class="LineNr">233 </span>  c3/return
 <span id="L234" class="LineNr">234 </span>
 <span id="L235" class="LineNr">235 </span>test-read-is-stateful:
-<span id="L236" class="LineNr">236 </span>  <span class="SalientComment">## make two consecutive reads, check that their results are appended</span>
-<span id="L237" class="LineNr">237 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L238" class="LineNr">238 </span>    <span class="Comment"># push args</span>
+<span id="L236" class="LineNr">236 </span>  <span class="subxComment">## make two consecutive reads, check that their results are appended</span>
+<span id="L237" class="LineNr">237 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L238" class="LineNr">238 </span>    <span class="subxComment"># push args</span>
 <span id="L239" class="LineNr">239 </span>  68/push  _test-stream/imm32
-<span id="L240" class="LineNr">240 </span>    <span class="Comment"># call</span>
+<span id="L240" class="LineNr">240 </span>    <span class="subxComment"># call</span>
 <span id="L241" class="LineNr">241 </span>  e8/call  clear-stream/disp32
-<span id="L242" class="LineNr">242 </span>    <span class="Comment"># discard args</span>
-<span id="L243" class="LineNr">243 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Comment"># clear-stream(_test-stream-buffer)</span>
-<span id="L245" class="LineNr">245 </span>    <span class="Comment"># push args</span>
+<span id="L242" class="LineNr">242 </span>    <span class="subxComment"># discard args</span>
+<span id="L243" class="LineNr">243 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L244" class="LineNr">244 </span>  <span class="subxComment"># clear-stream(_test-stream-buffer)</span>
+<span id="L245" class="LineNr">245 </span>    <span class="subxComment"># push args</span>
 <span id="L246" class="LineNr">246 </span>  68/push  _test-stream-buffer/imm32
-<span id="L247" class="LineNr">247 </span>    <span class="Comment"># call</span>
+<span id="L247" class="LineNr">247 </span>    <span class="subxComment"># call</span>
 <span id="L248" class="LineNr">248 </span>  e8/call  clear-stream/disp32
-<span id="L249" class="LineNr">249 </span>    <span class="Comment"># discard args</span>
-<span id="L250" class="LineNr">250 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Comment"># write(_test-stream, &quot;C&quot;)</span>
-<span id="L252" class="LineNr">252 </span>    <span class="Comment"># push args</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxComment"># discard args</span>
+<span id="L250" class="LineNr">250 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L251" class="LineNr">251 </span>  <span class="subxComment"># write(_test-stream, &quot;C&quot;)</span>
+<span id="L252" class="LineNr">252 </span>    <span class="subxComment"># push args</span>
 <span id="L253" class="LineNr">253 </span>  68/push  <span class="Constant">&quot;C&quot;</span>/imm32
 <span id="L254" class="LineNr">254 </span>  68/push  _test-stream/imm32
-<span id="L255" class="LineNr">255 </span>    <span class="Comment"># call</span>
+<span id="L255" class="LineNr">255 </span>    <span class="subxComment"># call</span>
 <span id="L256" class="LineNr">256 </span>  e8/call  write/disp32
-<span id="L257" class="LineNr">257 </span>    <span class="Comment"># discard args</span>
-<span id="L258" class="LineNr">258 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Comment"># read(_test-stream, _test-stream-buffer)</span>
-<span id="L260" class="LineNr">260 </span>    <span class="Comment"># push args</span>
+<span id="L257" class="LineNr">257 </span>    <span class="subxComment"># discard args</span>
+<span id="L258" class="LineNr">258 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L259" class="LineNr">259 </span>  <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
+<span id="L260" class="LineNr">260 </span>    <span class="subxComment"># push args</span>
 <span id="L261" class="LineNr">261 </span>  68/push  _test-stream-buffer/imm32
 <span id="L262" class="LineNr">262 </span>  68/push  _test-stream/imm32
-<span id="L263" class="LineNr">263 </span>    <span class="Comment"># call</span>
+<span id="L263" class="LineNr">263 </span>    <span class="subxComment"># call</span>
 <span id="L264" class="LineNr">264 </span>  e8/call  read/disp32
-<span id="L265" class="LineNr">265 </span>    <span class="Comment"># discard args</span>
-<span id="L266" class="LineNr">266 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L267" class="LineNr">267 </span>  <span class="Comment"># write(_test-stream, &quot;D&quot;)</span>
-<span id="L268" class="LineNr">268 </span>    <span class="Comment"># push args</span>
+<span id="L265" class="LineNr">265 </span>    <span class="subxComment"># discard args</span>
+<span id="L266" class="LineNr">266 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L267" class="LineNr">267 </span>  <span class="subxComment"># write(_test-stream, &quot;D&quot;)</span>
+<span id="L268" class="LineNr">268 </span>    <span class="subxComment"># push args</span>
 <span id="L269" class="LineNr">269 </span>  68/push  <span class="Constant">&quot;D&quot;</span>/imm32
 <span id="L270" class="LineNr">270 </span>  68/push  _test-stream/imm32
-<span id="L271" class="LineNr">271 </span>    <span class="Comment"># call</span>
+<span id="L271" class="LineNr">271 </span>    <span class="subxComment"># call</span>
 <span id="L272" class="LineNr">272 </span>  e8/call  write/disp32
-<span id="L273" class="LineNr">273 </span>    <span class="Comment"># discard args</span>
-<span id="L274" class="LineNr">274 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Comment"># read(_test-stream, _test-stream-buffer)</span>
-<span id="L276" class="LineNr">276 </span>    <span class="Comment"># push args</span>
+<span id="L273" class="LineNr">273 </span>    <span class="subxComment"># discard args</span>
+<span id="L274" class="LineNr">274 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L275" class="LineNr">275 </span>  <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
+<span id="L276" class="LineNr">276 </span>    <span class="subxComment"># push args</span>
 <span id="L277" class="LineNr">277 </span>  68/push  _test-stream-buffer/imm32
 <span id="L278" class="LineNr">278 </span>  68/push  _test-stream/imm32
-<span id="L279" class="LineNr">279 </span>    <span class="Comment"># call</span>
+<span id="L279" class="LineNr">279 </span>    <span class="subxComment"># call</span>
 <span id="L280" class="LineNr">280 </span>  e8/call  read/disp32
-<span id="L281" class="LineNr">281 </span>    <span class="Comment"># discard args</span>
-<span id="L282" class="LineNr">282 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L283" class="LineNr">283 </span>  <span class="Comment"># check-ints-equal(*_test-stream-buffer-&gt;data, 43/C 44/D 00 00, msg)</span>
-<span id="L284" class="LineNr">284 </span>    <span class="Comment"># push args</span>
+<span id="L281" class="LineNr">281 </span>    <span class="subxComment"># discard args</span>
+<span id="L282" class="LineNr">282 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L283" class="LineNr">283 </span>  <span class="subxComment"># check-ints-equal(*_test-stream-buffer-&gt;data, 43/C 44/D 00 00, msg)</span>
+<span id="L284" class="LineNr">284 </span>    <span class="subxComment"># push args</span>
 <span id="L285" class="LineNr">285 </span>  68/push  <span class="Constant">&quot;F - test-read-is-stateful&quot;</span>/imm32
 <span id="L286" class="LineNr">286 </span>  68/push  0x00004443/imm32/C-D
-<span id="L287" class="LineNr">287 </span>    <span class="Comment"># push *_test-stream-buffer-&gt;data</span>
+<span id="L287" class="LineNr">287 </span>    <span class="subxComment"># push *_test-stream-buffer-&gt;data</span>
 <span id="L288" class="LineNr">288 </span>  b8/copy-to-EAX  _test-stream-buffer/imm32
-<span id="L289" class="LineNr">289 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L290" class="LineNr">290 </span>    <span class="Comment"># call</span>
+<span id="L289" class="LineNr">289 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L290" class="LineNr">290 </span>    <span class="subxComment"># call</span>
 <span id="L291" class="LineNr">291 </span>  e8/call  check-ints-equal/disp32
-<span id="L292" class="LineNr">292 </span>    <span class="Comment"># discard args</span>
-<span id="L293" class="LineNr">293 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Comment"># end</span>
+<span id="L292" class="LineNr">292 </span>    <span class="subxComment"># discard args</span>
+<span id="L293" class="LineNr">293 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L294" class="LineNr">294 </span>  <span class="subxComment"># end</span>
 <span id="L295" class="LineNr">295 </span>  c3/return
 <span id="L296" class="LineNr">296 </span>
 <span id="L297" class="LineNr">297 </span>test-read-returns-0-on-end-of-file:
-<span id="L298" class="LineNr">298 </span>  <span class="SalientComment">## read after hitting end-of-file, check that result is 0</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Comment"># push args</span>
+<span id="L298" class="LineNr">298 </span>  <span class="subxComment">## read after hitting end-of-file, check that result is 0</span>
+<span id="L299" class="LineNr">299 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L300" class="LineNr">300 </span>    <span class="subxComment"># push args</span>
 <span id="L301" class="LineNr">301 </span>  68/push  _test-stream/imm32
-<span id="L302" class="LineNr">302 </span>    <span class="Comment"># call</span>
+<span id="L302" class="LineNr">302 </span>    <span class="subxComment"># call</span>
 <span id="L303" class="LineNr">303 </span>  e8/call  clear-stream/disp32
-<span id="L304" class="LineNr">304 </span>    <span class="Comment"># discard args</span>
-<span id="L305" class="LineNr">305 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Comment"># clear-stream(_test-stream-buffer)</span>
-<span id="L307" class="LineNr">307 </span>    <span class="Comment"># push args</span>
+<span id="L304" class="LineNr">304 </span>    <span class="subxComment"># discard args</span>
+<span id="L305" class="LineNr">305 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L306" class="LineNr">306 </span>  <span class="subxComment"># clear-stream(_test-stream-buffer)</span>
+<span id="L307" class="LineNr">307 </span>    <span class="subxComment"># push args</span>
 <span id="L308" class="LineNr">308 </span>  68/push  _test-stream-buffer/imm32
-<span id="L309" class="LineNr">309 </span>    <span class="Comment"># call</span>
+<span id="L309" class="LineNr">309 </span>    <span class="subxComment"># call</span>
 <span id="L310" class="LineNr">310 </span>  e8/call  clear-stream/disp32
-<span id="L311" class="LineNr">311 </span>    <span class="Comment"># discard args</span>
-<span id="L312" class="LineNr">312 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Comment"># write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L314" class="LineNr">314 </span>    <span class="Comment"># push args</span>
+<span id="L311" class="LineNr">311 </span>    <span class="subxComment"># discard args</span>
+<span id="L312" class="LineNr">312 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L313" class="LineNr">313 </span>  <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L314" class="LineNr">314 </span>    <span class="subxComment"># push args</span>
 <span id="L315" class="LineNr">315 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L316" class="LineNr">316 </span>  68/push  _test-stream/imm32
-<span id="L317" class="LineNr">317 </span>    <span class="Comment"># call</span>
+<span id="L317" class="LineNr">317 </span>    <span class="subxComment"># call</span>
 <span id="L318" class="LineNr">318 </span>  e8/call  write/disp32
-<span id="L319" class="LineNr">319 </span>    <span class="Comment"># discard args</span>
-<span id="L320" class="LineNr">320 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L321" class="LineNr">321 </span>  <span class="SalientComment">## first read gets to end-of-file</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Comment"># read(_test-stream, _test-stream-buffer)</span>
-<span id="L323" class="LineNr">323 </span>    <span class="Comment"># push args</span>
+<span id="L319" class="LineNr">319 </span>    <span class="subxComment"># discard args</span>
+<span id="L320" class="LineNr">320 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L321" class="LineNr">321 </span>  <span class="subxComment">## first read gets to end-of-file</span>
+<span id="L322" class="LineNr">322 </span>  <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
+<span id="L323" class="LineNr">323 </span>    <span class="subxComment"># push args</span>
 <span id="L324" class="LineNr">324 </span>  68/push  _test-stream-buffer/imm32
 <span id="L325" class="LineNr">325 </span>  68/push  _test-stream/imm32
-<span id="L326" class="LineNr">326 </span>    <span class="Comment"># call</span>
+<span id="L326" class="LineNr">326 </span>    <span class="subxComment"># call</span>
 <span id="L327" class="LineNr">327 </span>  e8/call  read/disp32
-<span id="L328" class="LineNr">328 </span>    <span class="Comment"># discard args</span>
-<span id="L329" class="LineNr">329 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L330" class="LineNr">330 </span>  <span class="SalientComment">## second read</span>
-<span id="L331" class="LineNr">331 </span>  <span class="Comment"># read(_test-stream, _test-stream-buffer)</span>
-<span id="L332" class="LineNr">332 </span>    <span class="Comment"># push args</span>
+<span id="L328" class="LineNr">328 </span>    <span class="subxComment"># discard args</span>
+<span id="L329" class="LineNr">329 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L330" class="LineNr">330 </span>  <span class="subxComment">## second read</span>
+<span id="L331" class="LineNr">331 </span>  <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
+<span id="L332" class="LineNr">332 </span>    <span class="subxComment"># push args</span>
 <span id="L333" class="LineNr">333 </span>  68/push  _test-stream-buffer/imm32
 <span id="L334" class="LineNr">334 </span>  68/push  _test-stream/imm32
-<span id="L335" class="LineNr">335 </span>    <span class="Comment"># call</span>
+<span id="L335" class="LineNr">335 </span>    <span class="subxComment"># call</span>
 <span id="L336" class="LineNr">336 </span>  e8/call  read/disp32
-<span id="L337" class="LineNr">337 </span>    <span class="Comment"># discard args</span>
-<span id="L338" class="LineNr">338 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Comment"># check-ints-equal(EAX, 0)</span>
-<span id="L340" class="LineNr">340 </span>    <span class="Comment"># push args</span>
+<span id="L337" class="LineNr">337 </span>    <span class="subxComment"># discard args</span>
+<span id="L338" class="LineNr">338 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L339" class="LineNr">339 </span>  <span class="subxComment"># check-ints-equal(EAX, 0)</span>
+<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># push args</span>
 <span id="L341" class="LineNr">341 </span>  68/push  <span class="Constant">&quot;F - test-read-returns-0-on-end-of-file&quot;</span>/imm32
 <span id="L342" class="LineNr">342 </span>  68/push  0/imm32
 <span id="L343" class="LineNr">343 </span>  50/push-EAX
-<span id="L344" class="LineNr">344 </span>    <span class="Comment"># call</span>
+<span id="L344" class="LineNr">344 </span>    <span class="subxComment"># call</span>
 <span id="L345" class="LineNr">345 </span>  e8/call  check-ints-equal/disp32
-<span id="L346" class="LineNr">346 </span>    <span class="Comment"># discard args</span>
-<span id="L347" class="LineNr">347 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Comment"># end</span>
+<span id="L346" class="LineNr">346 </span>    <span class="subxComment"># discard args</span>
+<span id="L347" class="LineNr">347 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L348" class="LineNr">348 </span>  <span class="subxComment"># end</span>
 <span id="L349" class="LineNr">349 </span>  c3/return
 <span id="L350" class="LineNr">350 </span>
 <span id="L351" class="LineNr">351 </span>== data
 <span id="L352" class="LineNr">352 </span>
 <span id="L353" class="LineNr">353 </span>_test-stream-buffer:
-<span id="L354" class="LineNr">354 </span>  <span class="Comment"># current write index</span>
+<span id="L354" class="LineNr">354 </span>  <span class="subxComment"># current write index</span>
 <span id="L355" class="LineNr">355 </span>  00 00 00 00
-<span id="L356" class="LineNr">356 </span>  <span class="Comment"># current read index</span>
+<span id="L356" class="LineNr">356 </span>  <span class="subxComment"># current read index</span>
 <span id="L357" class="LineNr">357 </span>  00 00 00 00
-<span id="L358" class="LineNr">358 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L358" class="LineNr">358 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L359" class="LineNr">359 </span>  08 00 00 00
-<span id="L360" class="LineNr">360 </span>  <span class="Comment"># data</span>
-<span id="L361" class="LineNr">361 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L360" class="LineNr">360 </span>  <span class="subxComment"># data</span>
+<span id="L361" class="LineNr">361 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L362" class="LineNr">362 </span>
-<span id="L363" class="LineNr">363 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L363" class="LineNr">363 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/059read-byte.subx.html b/html/subx/059read-byte.subx.html
index 070d5afb..87eecd8e 100644
--- a/html/subx/059read-byte.subx.html
+++ b/html/subx/059read-byte.subx.html
@@ -15,14 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -57,253 +54,253 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># read-byte: one higher-level abstraction atop 'read'.</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># There are many situations where 'read' is a lot to manage, and we need</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># to abstract some details away. One of them is when we want to read a file</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># character by character. In this situation we follow C's FILE data structure,</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># which manages the underlying file descriptor together with the buffer it</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># reads into. We call our version 'buffered-file'. Should be useful with other</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># primitives as well, in later layers.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># read-byte: one higher-level abstraction atop 'read'.</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># There are many situations where 'read' is a lot to manage, and we need</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># to abstract some details away. One of them is when we want to read a file</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># character by character. In this situation we follow C's FILE data structure,</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># which manages the underlying file descriptor together with the buffer it</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># reads into. We call our version 'buffered-file'. Should be useful with other</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># primitives as well, in later layers.</span>
 <span id="L9" class="LineNr">  9 </span>
 <span id="L10" class="LineNr"> 10 </span>== data
 <span id="L11" class="LineNr"> 11 </span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment"># The buffered file for standard input. Also illustrates the layout for</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># buffered-file.</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment"># The buffered file for standard input. Also illustrates the layout for</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># buffered-file.</span>
 <span id="L14" class="LineNr"> 14 </span>
 <span id="L15" class="LineNr"> 15 </span><span class="Special">Stdin</span>:
-<span id="L16" class="LineNr"> 16 </span>  <span class="Comment"># file descriptor or (address stream)</span>
-<span id="L17" class="LineNr"> 17 </span>  00 00 00 00  <span class="Comment"># 0 = standard input</span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Comment"># current write index</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="subxComment"># file descriptor or (address stream)</span>
+<span id="L17" class="LineNr"> 17 </span>  00 00 00 00  <span class="subxComment"># 0 = standard input</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="subxComment"># current write index</span>
 <span id="L19" class="LineNr"> 19 </span>  00 00 00 00
-<span id="L20" class="LineNr"> 20 </span>  <span class="Comment"># current read index</span>
+<span id="L20" class="LineNr"> 20 </span>  <span class="subxComment"># current read index</span>
 <span id="L21" class="LineNr"> 21 </span>  00 00 00 00
-<span id="L22" class="LineNr"> 22 </span>  <span class="Comment"># length (8)</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="subxComment"># length (8)</span>
 <span id="L23" class="LineNr"> 23 </span>  08 00 00 00
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># data</span>
-<span id="L25" class="LineNr"> 25 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="subxComment"># data</span>
+<span id="L25" class="LineNr"> 25 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L26" class="LineNr"> 26 </span>
-<span id="L27" class="LineNr"> 27 </span><span class="Comment"># TODO: 8 bytes is too small. We'll need to grow the buffer for efficiency.</span>
+<span id="L27" class="LineNr"> 27 </span><span class="subxComment"># TODO: 8 bytes is too small. We'll need to grow the buffer for efficiency.</span>
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span>== code
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L32" class="LineNr"> 32 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Comment"># main:</span>
-<span id="L35" class="LineNr"> 35 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L34" class="LineNr"> 34 </span><span class="subxComment"># main:</span>
+<span id="L35" class="LineNr"> 35 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L36" class="LineNr"> 36 </span><span class="CommentedCode">#?   e8/call  test-read-byte-multiple/disp32</span>
-<span id="L37" class="LineNr"> 37 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
-<span id="L38" class="LineNr"> 38 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L38" class="LineNr"> 38 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L39" class="LineNr"> 39 </span>  b8/copy-to-EAX  1/imm32
 <span id="L40" class="LineNr"> 40 </span>  cd/syscall  0x80/imm8
 <span id="L41" class="LineNr"> 41 </span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment"># return next byte value in EAX, with top 3 bytes cleared.</span>
-<span id="L43" class="LineNr"> 43 </span><span class="Comment"># On EOF, return 0xffffffff.</span>
-<span id="L44" class="LineNr"> 44 </span>read-byte:  <span class="Comment"># f : (address buffered-file) -&gt; byte/EAX</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Comment"># prolog</span>
+<span id="L42" class="LineNr"> 42 </span><span class="subxComment"># return next byte value in EAX, with top 3 bytes cleared.</span>
+<span id="L43" class="LineNr"> 43 </span><span class="subxComment"># On EOF, return 0xffffffff.</span>
+<span id="L44" class="LineNr"> 44 </span>read-byte:  <span class="subxComment"># f : (address buffered-file) -&gt; byte/EAX</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="subxComment"># prolog</span>
 <span id="L46" class="LineNr"> 46 </span>  55/push-EBP
-<span id="L47" class="LineNr"> 47 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Comment"># save registers</span>
+<span id="L47" class="LineNr"> 47 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="subxComment"># save registers</span>
 <span id="L49" class="LineNr"> 49 </span>  51/push-ECX
 <span id="L50" class="LineNr"> 50 </span>  56/push-ESI
-<span id="L51" class="LineNr"> 51 </span>  <span class="Comment"># ESI = f</span>
-<span id="L52" class="LineNr"> 52 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ESI</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Comment"># ECX = f-&gt;read</span>
-<span id="L54" class="LineNr"> 54 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESI+8) to ECX</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="SalientComment">## if (f-&gt;read &lt; f-&gt;write) read byte from stream</span>
-<span id="L56" class="LineNr"> 56 </span>  3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with *(ESI+4)</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="subxComment"># ESI = f</span>
+<span id="L52" class="LineNr"> 52 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="subxComment"># ECX = f-&gt;read</span>
+<span id="L54" class="LineNr"> 54 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+8) to ECX</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="subxComment">## if (f-&gt;read &lt; f-&gt;write) read byte from stream</span>
+<span id="L56" class="LineNr"> 56 </span>  3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with *(ESI+4)</span>
 <span id="L57" class="LineNr"> 57 </span>  7c/jump-if-lesser  $read-byte:from-stream/disp8
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment"># clear-stream(stream = f+4)</span>
-<span id="L59" class="LineNr"> 59 </span>    <span class="Comment"># push args</span>
-<span id="L60" class="LineNr"> 60 </span>  8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+4 to EAX</span>
+<span id="L58" class="LineNr"> 58 </span>  <span class="subxComment"># clear-stream(stream = f+4)</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="subxComment"># push args</span>
+<span id="L60" class="LineNr"> 60 </span>  8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+4 to EAX</span>
 <span id="L61" class="LineNr"> 61 </span>  50/push-EAX
-<span id="L62" class="LineNr"> 62 </span>    <span class="Comment"># call</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="subxComment"># call</span>
 <span id="L63" class="LineNr"> 63 </span>  e8/call  clear-stream/disp32
-<span id="L64" class="LineNr"> 64 </span>    <span class="Comment"># discard args</span>
-<span id="L65" class="LineNr"> 65 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Comment"># EAX = read(f-&gt;fd, stream = f+4)</span>
-<span id="L67" class="LineNr"> 67 </span>    <span class="Comment"># push args</span>
+<span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># discard args</span>
+<span id="L65" class="LineNr"> 65 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="subxComment"># EAX = read(f-&gt;fd, stream = f+4)</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="subxComment"># push args</span>
 <span id="L68" class="LineNr"> 68 </span>  50/push-EAX
-<span id="L69" class="LineNr"> 69 </span>  ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push *ESI</span>
-<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># call</span>
+<span id="L69" class="LineNr"> 69 </span>  ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># push *ESI</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxComment"># call</span>
 <span id="L71" class="LineNr"> 71 </span>  e8/call  read/disp32
-<span id="L72" class="LineNr"> 72 </span>    <span class="Comment"># discard args</span>
-<span id="L73" class="LineNr"> 73 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Comment"># if EAX = 0 return 0xffffffff</span>
-<span id="L75" class="LineNr"> 75 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EAX</span>
+<span id="L72" class="LineNr"> 72 </span>    <span class="subxComment"># discard args</span>
+<span id="L73" class="LineNr"> 73 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L74" class="LineNr"> 74 </span>  <span class="subxComment"># if EAX = 0 return 0xffffffff</span>
+<span id="L75" class="LineNr"> 75 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
 <span id="L76" class="LineNr"> 76 </span>  75/jump-if-not-equal  $read-byte:from-stream/disp8
 <span id="L77" class="LineNr"> 77 </span>  b8/copy-to-EAX  0xffffffff/imm32
 <span id="L78" class="LineNr"> 78 </span>  eb/jump  $read-byte:end/disp8
 <span id="L79" class="LineNr"> 79 </span>$read-byte:from-stream:
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># AL = f-&gt;data[f-&gt;read]</span>
-<span id="L81" class="LineNr"> 81 </span>  31/xor                          3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># clear EAX</span>
-<span id="L82" class="LineNr"> 82 </span>  8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Delimiter"> . </span>          0/r32/AL    0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESI+ECX+16) to AL</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment"># ++f-&gt;read</span>
-<span id="L84" class="LineNr"> 84 </span>  ff          0/subop/increment   1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># increment *(ESI+8)</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="subxComment"># AL = f-&gt;data[f-&gt;read]</span>
+<span id="L81" class="LineNr"> 81 </span>  31/xor                          3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L82" class="LineNr"> 82 </span>  8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="CommentedCode"> . </span>          0/r32/AL    0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+ECX+16) to AL</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="subxComment"># ++f-&gt;read</span>
+<span id="L84" class="LineNr"> 84 </span>  ff          0/subop/increment   1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># increment *(ESI+8)</span>
 <span id="L85" class="LineNr"> 85 </span>$read-byte:end:
-<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># restore registers</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="subxComment"># restore registers</span>
 <span id="L87" class="LineNr"> 87 </span>  5e/pop-to-ESI
 <span id="L88" class="LineNr"> 88 </span>  59/pop-to-ECX
-<span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># epilog</span>
-<span id="L90" class="LineNr"> 90 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="subxComment"># epilog</span>
+<span id="L90" class="LineNr"> 90 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L91" class="LineNr"> 91 </span>  5d/pop-to-EBP
 <span id="L92" class="LineNr"> 92 </span>  c3/return
 <span id="L93" class="LineNr"> 93 </span>
-<span id="L94" class="LineNr"> 94 </span><span class="Comment"># todo: how should write-byte look? What should it do when the output has no</span>
-<span id="L95" class="LineNr"> 95 </span><span class="Comment"># space remaining? Maybe return an error code.</span>
+<span id="L94" class="LineNr"> 94 </span><span class="subxComment"># todo: how should write-byte look? What should it do when the output has no</span>
+<span id="L95" class="LineNr"> 95 </span><span class="subxComment"># space remaining? Maybe return an error code.</span>
 <span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="SalientComment">## tests</span>
+<span id="L97" class="LineNr"> 97 </span><span class="subxComment">## tests</span>
 <span id="L98" class="LineNr"> 98 </span>
 <span id="L99" class="LineNr"> 99 </span>test-read-byte-single:
-<span id="L100" class="LineNr">100 </span>  <span class="SalientComment">## check that read-byte returns first byte of 'file'</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># push args</span>
+<span id="L100" class="LineNr">100 </span>  <span class="subxComment">## check that read-byte returns first byte of 'file'</span>
+<span id="L101" class="LineNr">101 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L102" class="LineNr">102 </span>    <span class="subxComment"># push args</span>
 <span id="L103" class="LineNr">103 </span>  68/push  _test-stream/imm32
-<span id="L104" class="LineNr">104 </span>    <span class="Comment"># call</span>
+<span id="L104" class="LineNr">104 </span>    <span class="subxComment"># call</span>
 <span id="L105" class="LineNr">105 </span>  e8/call  clear-stream/disp32
-<span id="L106" class="LineNr">106 </span>    <span class="Comment"># discard args</span>
-<span id="L107" class="LineNr">107 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Comment"># push args</span>
+<span id="L106" class="LineNr">106 </span>    <span class="subxComment"># discard args</span>
+<span id="L107" class="LineNr">107 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L108" class="LineNr">108 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L109" class="LineNr">109 </span>    <span class="subxComment"># push args</span>
 <span id="L110" class="LineNr">110 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L111" class="LineNr">111 </span>  05/add-to-EAX  4/imm32
 <span id="L112" class="LineNr">112 </span>  50/push-EAX
-<span id="L113" class="LineNr">113 </span>    <span class="Comment"># call</span>
+<span id="L113" class="LineNr">113 </span>    <span class="subxComment"># call</span>
 <span id="L114" class="LineNr">114 </span>  e8/call  clear-stream/disp32
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># discard args</span>
-<span id="L116" class="LineNr">116 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Comment"># write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># push args</span>
+<span id="L115" class="LineNr">115 </span>    <span class="subxComment"># discard args</span>
+<span id="L116" class="LineNr">116 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L117" class="LineNr">117 </span>  <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L118" class="LineNr">118 </span>    <span class="subxComment"># push args</span>
 <span id="L119" class="LineNr">119 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L120" class="LineNr">120 </span>  68/push  _test-stream/imm32
-<span id="L121" class="LineNr">121 </span>    <span class="Comment"># call</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxComment"># call</span>
 <span id="L122" class="LineNr">122 </span>  e8/call  write/disp32
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># discard args</span>
-<span id="L124" class="LineNr">124 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Comment"># read-byte(_test-buffered-file)</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Comment"># push args</span>
+<span id="L123" class="LineNr">123 </span>    <span class="subxComment"># discard args</span>
+<span id="L124" class="LineNr">124 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L125" class="LineNr">125 </span>  <span class="subxComment"># read-byte(_test-buffered-file)</span>
+<span id="L126" class="LineNr">126 </span>    <span class="subxComment"># push args</span>
 <span id="L127" class="LineNr">127 </span>  68/push  _test-buffered-file/imm32
-<span id="L128" class="LineNr">128 </span>    <span class="Comment"># call</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxComment"># call</span>
 <span id="L129" class="LineNr">129 </span>  e8/call  read-byte/disp32
-<span id="L130" class="LineNr">130 </span>    <span class="Comment"># discard args</span>
-<span id="L131" class="LineNr">131 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L132" class="LineNr">132 </span>  <span class="Comment"># check-ints-equal(EAX, 'A')</span>
-<span id="L133" class="LineNr">133 </span>    <span class="Comment"># push args</span>
+<span id="L130" class="LineNr">130 </span>    <span class="subxComment"># discard args</span>
+<span id="L131" class="LineNr">131 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L132" class="LineNr">132 </span>  <span class="subxComment"># check-ints-equal(EAX, 'A')</span>
+<span id="L133" class="LineNr">133 </span>    <span class="subxComment"># push args</span>
 <span id="L134" class="LineNr">134 </span>  68/push  <span class="Constant">&quot;F - test-read-byte-single&quot;</span>/imm32
 <span id="L135" class="LineNr">135 </span>  68/push  0x41/imm32
 <span id="L136" class="LineNr">136 </span>  50/push-EAX
-<span id="L137" class="LineNr">137 </span>    <span class="Comment"># call</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxComment"># call</span>
 <span id="L138" class="LineNr">138 </span>  e8/call  check-ints-equal/disp32
-<span id="L139" class="LineNr">139 </span>    <span class="Comment"># discard args</span>
-<span id="L140" class="LineNr">140 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Comment"># end</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxComment"># discard args</span>
+<span id="L140" class="LineNr">140 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L141" class="LineNr">141 </span>  <span class="subxComment"># end</span>
 <span id="L142" class="LineNr">142 </span>  c3/return
 <span id="L143" class="LineNr">143 </span>
 <span id="L144" class="LineNr">144 </span>test-read-byte-multiple:
-<span id="L145" class="LineNr">145 </span>  <span class="SalientComment">## call read-byte twice, check that second call returns second byte</span>
-<span id="L146" class="LineNr">146 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L147" class="LineNr">147 </span>    <span class="Comment"># push args</span>
+<span id="L145" class="LineNr">145 </span>  <span class="subxComment">## call read-byte twice, check that second call returns second byte</span>
+<span id="L146" class="LineNr">146 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L147" class="LineNr">147 </span>    <span class="subxComment"># push args</span>
 <span id="L148" class="LineNr">148 </span>  68/push  _test-stream/imm32
-<span id="L149" class="LineNr">149 </span>    <span class="Comment"># call</span>
+<span id="L149" class="LineNr">149 </span>    <span class="subxComment"># call</span>
 <span id="L150" class="LineNr">150 </span>  e8/call  clear-stream/disp32
-<span id="L151" class="LineNr">151 </span>    <span class="Comment"># discard args</span>
-<span id="L152" class="LineNr">152 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L154" class="LineNr">154 </span>    <span class="Comment"># push args</span>
+<span id="L151" class="LineNr">151 </span>    <span class="subxComment"># discard args</span>
+<span id="L152" class="LineNr">152 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L153" class="LineNr">153 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxComment"># push args</span>
 <span id="L155" class="LineNr">155 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L156" class="LineNr">156 </span>  05/add-to-EAX  4/imm32
 <span id="L157" class="LineNr">157 </span>  50/push-EAX
-<span id="L158" class="LineNr">158 </span>    <span class="Comment"># call</span>
+<span id="L158" class="LineNr">158 </span>    <span class="subxComment"># call</span>
 <span id="L159" class="LineNr">159 </span>  e8/call  clear-stream/disp32
-<span id="L160" class="LineNr">160 </span>    <span class="Comment"># discard args</span>
-<span id="L161" class="LineNr">161 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment"># write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># push args</span>
+<span id="L160" class="LineNr">160 </span>    <span class="subxComment"># discard args</span>
+<span id="L161" class="LineNr">161 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L162" class="LineNr">162 </span>  <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxComment"># push args</span>
 <span id="L164" class="LineNr">164 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L165" class="LineNr">165 </span>  68/push  _test-stream/imm32
-<span id="L166" class="LineNr">166 </span>    <span class="Comment"># call</span>
+<span id="L166" class="LineNr">166 </span>    <span class="subxComment"># call</span>
 <span id="L167" class="LineNr">167 </span>  e8/call  write/disp32
-<span id="L168" class="LineNr">168 </span>    <span class="Comment"># discard args</span>
-<span id="L169" class="LineNr">169 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L170" class="LineNr">170 </span>  <span class="Comment"># read-byte(_test-buffered-file)</span>
-<span id="L171" class="LineNr">171 </span>    <span class="Comment"># push args</span>
+<span id="L168" class="LineNr">168 </span>    <span class="subxComment"># discard args</span>
+<span id="L169" class="LineNr">169 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L170" class="LineNr">170 </span>  <span class="subxComment"># read-byte(_test-buffered-file)</span>
+<span id="L171" class="LineNr">171 </span>    <span class="subxComment"># push args</span>
 <span id="L172" class="LineNr">172 </span>  68/push  _test-buffered-file/imm32
-<span id="L173" class="LineNr">173 </span>    <span class="Comment"># call</span>
+<span id="L173" class="LineNr">173 </span>    <span class="subxComment"># call</span>
 <span id="L174" class="LineNr">174 </span>  e8/call  read-byte/disp32
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># discard args</span>
-<span id="L176" class="LineNr">176 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L177" class="LineNr">177 </span>  <span class="Comment"># read-byte(_test-buffered-file)</span>
-<span id="L178" class="LineNr">178 </span>    <span class="Comment"># push args</span>
+<span id="L175" class="LineNr">175 </span>    <span class="subxComment"># discard args</span>
+<span id="L176" class="LineNr">176 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L177" class="LineNr">177 </span>  <span class="subxComment"># read-byte(_test-buffered-file)</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxComment"># push args</span>
 <span id="L179" class="LineNr">179 </span>  68/push  _test-buffered-file/imm32
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># call</span>
+<span id="L180" class="LineNr">180 </span>    <span class="subxComment"># call</span>
 <span id="L181" class="LineNr">181 </span>  e8/call  read-byte/disp32
-<span id="L182" class="LineNr">182 </span>    <span class="Comment"># discard args</span>
-<span id="L183" class="LineNr">183 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L184" class="LineNr">184 </span>  <span class="Comment"># check-ints-equal(EAX, 'b')</span>
-<span id="L185" class="LineNr">185 </span>    <span class="Comment"># push args</span>
+<span id="L182" class="LineNr">182 </span>    <span class="subxComment"># discard args</span>
+<span id="L183" class="LineNr">183 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L184" class="LineNr">184 </span>  <span class="subxComment"># check-ints-equal(EAX, 'b')</span>
+<span id="L185" class="LineNr">185 </span>    <span class="subxComment"># push args</span>
 <span id="L186" class="LineNr">186 </span>  68/push  <span class="Constant">&quot;F - test-read-byte-multiple&quot;</span>/imm32
 <span id="L187" class="LineNr">187 </span>  68/push  0x62/imm32
 <span id="L188" class="LineNr">188 </span>  50/push-EAX
-<span id="L189" class="LineNr">189 </span>    <span class="Comment"># call</span>
+<span id="L189" class="LineNr">189 </span>    <span class="subxComment"># call</span>
 <span id="L190" class="LineNr">190 </span>  e8/call  check-ints-equal/disp32
-<span id="L191" class="LineNr">191 </span>    <span class="Comment"># discard args</span>
-<span id="L192" class="LineNr">192 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Comment"># end</span>
+<span id="L191" class="LineNr">191 </span>    <span class="subxComment"># discard args</span>
+<span id="L192" class="LineNr">192 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L193" class="LineNr">193 </span>  <span class="subxComment"># end</span>
 <span id="L194" class="LineNr">194 </span>  c3/return
 <span id="L195" class="LineNr">195 </span>
 <span id="L196" class="LineNr">196 </span>test-read-byte-end-of-file:
-<span id="L197" class="LineNr">197 </span>  <span class="SalientComment">## call read-byte on an empty 'file', check that it returns -1</span>
-<span id="L198" class="LineNr">198 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L199" class="LineNr">199 </span>    <span class="Comment"># push args</span>
+<span id="L197" class="LineNr">197 </span>  <span class="subxComment">## call read-byte on an empty 'file', check that it returns -1</span>
+<span id="L198" class="LineNr">198 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L199" class="LineNr">199 </span>    <span class="subxComment"># push args</span>
 <span id="L200" class="LineNr">200 </span>  68/push  _test-stream/imm32
-<span id="L201" class="LineNr">201 </span>    <span class="Comment"># call</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxComment"># call</span>
 <span id="L202" class="LineNr">202 </span>  e8/call  clear-stream/disp32
-<span id="L203" class="LineNr">203 </span>    <span class="Comment"># discard args</span>
-<span id="L204" class="LineNr">204 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L206" class="LineNr">206 </span>    <span class="Comment"># push args</span>
+<span id="L203" class="LineNr">203 </span>    <span class="subxComment"># discard args</span>
+<span id="L204" class="LineNr">204 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L205" class="LineNr">205 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L206" class="LineNr">206 </span>    <span class="subxComment"># push args</span>
 <span id="L207" class="LineNr">207 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L208" class="LineNr">208 </span>  05/add-to-EAX  4/imm32
 <span id="L209" class="LineNr">209 </span>  50/push-EAX
-<span id="L210" class="LineNr">210 </span>    <span class="Comment"># call</span>
+<span id="L210" class="LineNr">210 </span>    <span class="subxComment"># call</span>
 <span id="L211" class="LineNr">211 </span>  e8/call  clear-stream/disp32
-<span id="L212" class="LineNr">212 </span>    <span class="Comment"># discard args</span>
-<span id="L213" class="LineNr">213 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Comment"># read-byte(_test-buffered-file)</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Comment"># push args</span>
+<span id="L212" class="LineNr">212 </span>    <span class="subxComment"># discard args</span>
+<span id="L213" class="LineNr">213 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L214" class="LineNr">214 </span>  <span class="subxComment"># read-byte(_test-buffered-file)</span>
+<span id="L215" class="LineNr">215 </span>    <span class="subxComment"># push args</span>
 <span id="L216" class="LineNr">216 </span>  68/push  _test-buffered-file/imm32
-<span id="L217" class="LineNr">217 </span>    <span class="Comment"># call</span>
+<span id="L217" class="LineNr">217 </span>    <span class="subxComment"># call</span>
 <span id="L218" class="LineNr">218 </span>  e8/call  read-byte/disp32
-<span id="L219" class="LineNr">219 </span>    <span class="Comment"># discard args</span>
-<span id="L220" class="LineNr">220 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L221" class="LineNr">221 </span>  <span class="Comment"># check-ints-equal(EAX, -1)</span>
-<span id="L222" class="LineNr">222 </span>    <span class="Comment"># push args</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxComment"># discard args</span>
+<span id="L220" class="LineNr">220 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L221" class="LineNr">221 </span>  <span class="subxComment"># check-ints-equal(EAX, -1)</span>
+<span id="L222" class="LineNr">222 </span>    <span class="subxComment"># push args</span>
 <span id="L223" class="LineNr">223 </span>  68/push  <span class="Constant">&quot;F - test-read-byte-end-of-file&quot;</span>/imm32
 <span id="L224" class="LineNr">224 </span>  68/push  -1/imm32
 <span id="L225" class="LineNr">225 </span>  50/push-EAX
-<span id="L226" class="LineNr">226 </span>    <span class="Comment"># call</span>
+<span id="L226" class="LineNr">226 </span>    <span class="subxComment"># call</span>
 <span id="L227" class="LineNr">227 </span>  e8/call  check-ints-equal/disp32
-<span id="L228" class="LineNr">228 </span>    <span class="Comment"># discard args</span>
-<span id="L229" class="LineNr">229 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L230" class="LineNr">230 </span>  <span class="Comment"># end</span>
+<span id="L228" class="LineNr">228 </span>    <span class="subxComment"># discard args</span>
+<span id="L229" class="LineNr">229 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L230" class="LineNr">230 </span>  <span class="subxComment"># end</span>
 <span id="L231" class="LineNr">231 </span>  c3/return
 <span id="L232" class="LineNr">232 </span>
 <span id="L233" class="LineNr">233 </span>== data
 <span id="L234" class="LineNr">234 </span>
 <span id="L235" class="LineNr">235 </span>_test-buffered-file:
-<span id="L236" class="LineNr">236 </span>  <span class="Comment"># file descriptor or (address stream)</span>
+<span id="L236" class="LineNr">236 </span>  <span class="subxComment"># file descriptor or (address stream)</span>
 <span id="L237" class="LineNr">237 </span>  _test-stream/imm32
-<span id="L238" class="LineNr">238 </span>  <span class="Comment"># current write index</span>
+<span id="L238" class="LineNr">238 </span>  <span class="subxComment"># current write index</span>
 <span id="L239" class="LineNr">239 </span>  00 00 00 00
-<span id="L240" class="LineNr">240 </span>  <span class="Comment"># current read index</span>
+<span id="L240" class="LineNr">240 </span>  <span class="subxComment"># current read index</span>
 <span id="L241" class="LineNr">241 </span>  00 00 00 00
-<span id="L242" class="LineNr">242 </span>  <span class="Comment"># length (8)</span>
+<span id="L242" class="LineNr">242 </span>  <span class="subxComment"># length (8)</span>
 <span id="L243" class="LineNr">243 </span>  08 00 00 00
-<span id="L244" class="LineNr">244 </span>  <span class="Comment"># data</span>
-<span id="L245" class="LineNr">245 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L244" class="LineNr">244 </span>  <span class="subxComment"># data</span>
+<span id="L245" class="LineNr">245 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L246" class="LineNr">246 </span>
-<span id="L247" class="LineNr">247 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L247" class="LineNr">247 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/060write-stream.subx.html b/html/subx/060write-stream.subx.html
index 90a90fa3..139c461d 100644
--- a/html/subx/060write-stream.subx.html
+++ b/html/subx/060write-stream.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
@@ -56,245 +54,245 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="Comment"># write-stream: like write, but write streams rather than strings</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># write-stream: like write, but write streams rather than strings</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span>== code
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L7" class="LineNr">  7 </span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># main:</span>
-<span id="L9" class="LineNr">  9 </span>  <span class="Comment"># manual test</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># main:</span>
+<span id="L9" class="LineNr">  9 </span>  <span class="subxComment"># manual test</span>
 <span id="L10" class="LineNr"> 10 </span><span class="CommentedCode">#?   # write-stream(stdout, _test-stream2)</span>
 <span id="L11" class="LineNr"> 11 </span><span class="CommentedCode">#?   68/push  _test-stream2/imm32</span>
 <span id="L12" class="LineNr"> 12 </span><span class="CommentedCode">#?   68/push  1/imm32/stdout</span>
 <span id="L13" class="LineNr"> 13 </span><span class="CommentedCode">#?   e8/call write-stream/disp32</span>
-<span id="L14" class="LineNr"> 14 </span>  <span class="Comment"># automatic test</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="subxComment"># automatic test</span>
 <span id="L15" class="LineNr"> 15 </span><span class="CommentedCode">#?   e8/call test-write-stream-appends/disp32</span>
-<span id="L16" class="LineNr"> 16 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L17" class="LineNr"> 17 </span>  <span class="Comment"># syscall(exit, Num-test-failures)</span>
-<span id="L18" class="LineNr"> 18 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L16" class="LineNr"> 16 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L17" class="LineNr"> 17 </span>  <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L18" class="LineNr"> 18 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L19" class="LineNr"> 19 </span>  b8/copy-to-EAX  1/imm32
 <span id="L20" class="LineNr"> 20 </span>  cd/syscall  0x80/imm8
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span>write-stream:  <span class="Comment"># f : fd or (address stream), s : (address stream) -&gt; &lt;void&gt;</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Comment"># prolog</span>
+<span id="L22" class="LineNr"> 22 </span>write-stream:  <span class="subxComment"># f : fd or (address stream), s : (address stream) -&gt; &lt;void&gt;</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="subxComment"># prolog</span>
 <span id="L24" class="LineNr"> 24 </span>  55/push-EBP
-<span id="L25" class="LineNr"> 25 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L26" class="LineNr"> 26 </span>  <span class="Comment"># if (f &lt; 0x08000000) _write-stream(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
-<span id="L27" class="LineNr"> 27 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         0x08000000/imm32  <span class="Comment"># compare *(EBP+8)</span>
+<span id="L25" class="LineNr"> 25 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L26" class="LineNr"> 26 </span>  <span class="subxComment"># if (f &lt; 0x08000000) _write-stream(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
+<span id="L27" class="LineNr"> 27 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L28" class="LineNr"> 28 </span>  7d/jump-if-greater-or-equal  $write-stream:fake/disp8
-<span id="L29" class="LineNr"> 29 </span>    <span class="Comment"># push args</span>
-<span id="L30" class="LineNr"> 30 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L31" class="LineNr"> 31 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="Comment"># call</span>
+<span id="L29" class="LineNr"> 29 </span>    <span class="subxComment"># push args</span>
+<span id="L30" class="LineNr"> 30 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L31" class="LineNr"> 31 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># call</span>
 <span id="L33" class="LineNr"> 33 </span>  e8/call  _write-stream/disp32
-<span id="L34" class="LineNr"> 34 </span>    <span class="Comment"># discard args</span>
-<span id="L35" class="LineNr"> 35 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment"># discard args</span>
+<span id="L35" class="LineNr"> 35 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L36" class="LineNr"> 36 </span>  eb/jump  $write-stream:end/disp8
 <span id="L37" class="LineNr"> 37 </span>$write-stream:fake:
-<span id="L38" class="LineNr"> 38 </span>  <span class="Comment"># otherwise, treat 'f' as a stream to append to</span>
-<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># save registers</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="subxComment"># otherwise, treat 'f' as a stream to append to</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="subxComment"># save registers</span>
 <span id="L40" class="LineNr"> 40 </span>  50/push-EAX
 <span id="L41" class="LineNr"> 41 </span>  56/push-ESI
 <span id="L42" class="LineNr"> 42 </span>  57/push-EDI
-<span id="L43" class="LineNr"> 43 </span>  <span class="Comment"># ESI = f</span>
-<span id="L44" class="LineNr"> 44 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              6/r32/ESI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ESI</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Comment"># EDI = s</span>
-<span id="L46" class="LineNr"> 46 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDI</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Comment"># EAX = _append-4(&amp;f-&gt;data[f-&gt;write], &amp;f-&gt;data[f-&gt;length], &amp;s-&gt;data[s-&gt;read], &amp;s-&gt;data[s-&gt;write])</span>
-<span id="L48" class="LineNr"> 48 </span>    <span class="Comment"># push &amp;s-&gt;data[s-&gt;write]</span>
-<span id="L49" class="LineNr"> 49 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDI to EAX</span>
-<span id="L50" class="LineNr"> 50 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+EAX+12 to EAX</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="subxComment"># ESI = f</span>
+<span id="L44" class="LineNr"> 44 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="subxComment"># EDI = s</span>
+<span id="L46" class="LineNr"> 46 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="subxComment"># EAX = _append-4(&amp;f-&gt;data[f-&gt;write], &amp;f-&gt;data[f-&gt;length], &amp;s-&gt;data[s-&gt;read], &amp;s-&gt;data[s-&gt;write])</span>
+<span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># push &amp;s-&gt;data[s-&gt;write]</span>
+<span id="L49" class="LineNr"> 49 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to EAX</span>
+<span id="L50" class="LineNr"> 50 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L51" class="LineNr"> 51 </span>  50/push-EAX
-<span id="L52" class="LineNr"> 52 </span>    <span class="Comment"># push &amp;s-&gt;data[s-&gt;read]</span>
-<span id="L53" class="LineNr"> 53 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EDI+4) to EAX</span>
-<span id="L54" class="LineNr"> 54 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+EAX+12 to EAX</span>
+<span id="L52" class="LineNr"> 52 </span>    <span class="subxComment"># push &amp;s-&gt;data[s-&gt;read]</span>
+<span id="L53" class="LineNr"> 53 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+4) to EAX</span>
+<span id="L54" class="LineNr"> 54 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L55" class="LineNr"> 55 </span>  50/push-EAX
-<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># push &amp;f-&gt;data[f-&gt;length]</span>
-<span id="L57" class="LineNr"> 57 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESI+8) to EAX</span>
-<span id="L58" class="LineNr"> 58 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+EAX+12 to EAX</span>
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># push &amp;f-&gt;data[f-&gt;length]</span>
+<span id="L57" class="LineNr"> 57 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+8) to EAX</span>
+<span id="L58" class="LineNr"> 58 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L59" class="LineNr"> 59 </span>  50/push-EAX
-<span id="L60" class="LineNr"> 60 </span>    <span class="Comment"># push &amp;f-&gt;data[f-&gt;write]</span>
-<span id="L61" class="LineNr"> 61 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ESI to EAX</span>
-<span id="L62" class="LineNr"> 62 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Delimiter"> . </span>          0/r32/EAX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+EAX+12 to EAX</span>
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># push &amp;f-&gt;data[f-&gt;write]</span>
+<span id="L61" class="LineNr"> 61 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L62" class="LineNr"> 62 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L63" class="LineNr"> 63 </span>  50/push-EAX
-<span id="L64" class="LineNr"> 64 </span>    <span class="Comment"># call</span>
+<span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># call</span>
 <span id="L65" class="LineNr"> 65 </span>  e8/call  _append-4/disp32
-<span id="L66" class="LineNr"> 66 </span>    <span class="Comment"># discard args</span>
-<span id="L67" class="LineNr"> 67 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Comment"># f-&gt;write += EAX</span>
-<span id="L69" class="LineNr"> 69 </span>  01/add                          0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *ESI</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Comment"># s-&gt;read += EAX</span>
-<span id="L71" class="LineNr"> 71 </span>  01/add                          1/mod/*+disp8   7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># add EAX to *(EDI+4)</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># restore registers</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="subxComment"># discard args</span>
+<span id="L67" class="LineNr"> 67 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="subxComment"># f-&gt;write += EAX</span>
+<span id="L69" class="LineNr"> 69 </span>  01/add                          0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *ESI</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="subxComment"># s-&gt;read += EAX</span>
+<span id="L71" class="LineNr"> 71 </span>  01/add                          1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *(EDI+4)</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="subxComment"># restore registers</span>
 <span id="L73" class="LineNr"> 73 </span>  5f/pop-to-EDI
 <span id="L74" class="LineNr"> 74 </span>  5e/pop-to-ESI
 <span id="L75" class="LineNr"> 75 </span>  58/pop-to-EAX
 <span id="L76" class="LineNr"> 76 </span>$write-stream:end:
-<span id="L77" class="LineNr"> 77 </span>  <span class="Comment"># epilog</span>
-<span id="L78" class="LineNr"> 78 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="subxComment"># epilog</span>
+<span id="L78" class="LineNr"> 78 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L79" class="LineNr"> 79 </span>  5d/pop-to-EBP
 <span id="L80" class="LineNr"> 80 </span>  c3/return
 <span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span>_write-stream:  <span class="Comment"># fd : int, s : (address stream) -&gt; &lt;void&gt;</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment"># prolog</span>
+<span id="L82" class="LineNr"> 82 </span>_write-stream:  <span class="subxComment"># fd : int, s : (address stream) -&gt; &lt;void&gt;</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="subxComment"># prolog</span>
 <span id="L84" class="LineNr"> 84 </span>  55/push-EBP
-<span id="L85" class="LineNr"> 85 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># save registers</span>
+<span id="L85" class="LineNr"> 85 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="subxComment"># save registers</span>
 <span id="L87" class="LineNr"> 87 </span>  50/push-EAX
 <span id="L88" class="LineNr"> 88 </span>  51/push-ECX
 <span id="L89" class="LineNr"> 89 </span>  52/push-EDX
 <span id="L90" class="LineNr"> 90 </span>  53/push-EBX
 <span id="L91" class="LineNr"> 91 </span>  56/push-ESI
 <span id="L92" class="LineNr"> 92 </span>  57/push-EDI
-<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># ESI = s</span>
-<span id="L94" class="LineNr"> 94 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># EDI = s-&gt;read</span>
-<span id="L96" class="LineNr"> 96 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          7/r32/EDI   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESI+4) to EDI</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Comment"># EDX = s-&gt;write</span>
-<span id="L98" class="LineNr"> 98 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ESI to EDX</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment"># syscall(write, fd, &amp;s-&gt;data[s-&gt;read], s-&gt;write-s-&gt;read)</span>
-<span id="L100" class="LineNr">100 </span>    <span class="Comment"># fd : EBX</span>
-<span id="L101" class="LineNr">101 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># data : ECX = &amp;s-&gt;data[s-&gt;read]</span>
-<span id="L103" class="LineNr">103 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  7/index/EDI  <span class="Delimiter"> . </span>          1/r32/ECX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy ESI+EDI+12 to ECX</span>
-<span id="L104" class="LineNr">104 </span>    <span class="Comment"># size : EDX = s-&gt;write - s-&gt;read</span>
-<span id="L105" class="LineNr">105 </span>  29/subtract                     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          7/r32/EDI  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># subtract EDI from EDX</span>
-<span id="L106" class="LineNr">106 </span>    <span class="Comment"># syscall</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="subxComment"># ESI = s</span>
+<span id="L94" class="LineNr"> 94 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="subxComment"># EDI = s-&gt;read</span>
+<span id="L96" class="LineNr"> 96 </span>  8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          7/r32/EDI   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+4) to EDI</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="subxComment"># EDX = s-&gt;write</span>
+<span id="L98" class="LineNr"> 98 </span>  8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EDX</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="subxComment"># syscall(write, fd, &amp;s-&gt;data[s-&gt;read], s-&gt;write-s-&gt;read)</span>
+<span id="L100" class="LineNr">100 </span>    <span class="subxComment"># fd : EBX</span>
+<span id="L101" class="LineNr">101 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L102" class="LineNr">102 </span>    <span class="subxComment"># data : ECX = &amp;s-&gt;data[s-&gt;read]</span>
+<span id="L103" class="LineNr">103 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  7/index/EDI  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EDI+12 to ECX</span>
+<span id="L104" class="LineNr">104 </span>    <span class="subxComment"># size : EDX = s-&gt;write - s-&gt;read</span>
+<span id="L105" class="LineNr">105 </span>  29/subtract                     3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          7/r32/EDI  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract EDI from EDX</span>
+<span id="L106" class="LineNr">106 </span>    <span class="subxComment"># syscall</span>
 <span id="L107" class="LineNr">107 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L108" class="LineNr">108 </span>  cd/syscall  0x80/imm8
-<span id="L109" class="LineNr">109 </span>  <span class="Comment"># restore registers</span>
+<span id="L109" class="LineNr">109 </span>  <span class="subxComment"># restore registers</span>
 <span id="L110" class="LineNr">110 </span>  5f/pop-to-EDI
 <span id="L111" class="LineNr">111 </span>  5e/pop-to-ESI
 <span id="L112" class="LineNr">112 </span>  5b/pop-to-EBX
 <span id="L113" class="LineNr">113 </span>  5a/pop-to-EDX
 <span id="L114" class="LineNr">114 </span>  59/pop-to-ECX
 <span id="L115" class="LineNr">115 </span>  58/pop-to-EAX
-<span id="L116" class="LineNr">116 </span>  <span class="Comment"># epilog</span>
-<span id="L117" class="LineNr">117 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L116" class="LineNr">116 </span>  <span class="subxComment"># epilog</span>
+<span id="L117" class="LineNr">117 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L118" class="LineNr">118 </span>  5d/pop-to-EBP
 <span id="L119" class="LineNr">119 </span>  c3/return
 <span id="L120" class="LineNr">120 </span>
 <span id="L121" class="LineNr">121 </span>test-write-stream-single:
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># push args</span>
+<span id="L122" class="LineNr">122 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L123" class="LineNr">123 </span>    <span class="subxComment"># push args</span>
 <span id="L124" class="LineNr">124 </span>  68/push  _test-stream/imm32
-<span id="L125" class="LineNr">125 </span>    <span class="Comment"># call</span>
+<span id="L125" class="LineNr">125 </span>    <span class="subxComment"># call</span>
 <span id="L126" class="LineNr">126 </span>  e8/call  clear-stream/disp32
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># discard args</span>
-<span id="L128" class="LineNr">128 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L129" class="LineNr">129 </span>  <span class="Comment"># clear-stream(_test-stream2)</span>
-<span id="L130" class="LineNr">130 </span>    <span class="Comment"># push args</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxComment"># discard args</span>
+<span id="L128" class="LineNr">128 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L129" class="LineNr">129 </span>  <span class="subxComment"># clear-stream(_test-stream2)</span>
+<span id="L130" class="LineNr">130 </span>    <span class="subxComment"># push args</span>
 <span id="L131" class="LineNr">131 </span>  68/push  _test-stream2/imm32
-<span id="L132" class="LineNr">132 </span>    <span class="Comment"># call</span>
+<span id="L132" class="LineNr">132 </span>    <span class="subxComment"># call</span>
 <span id="L133" class="LineNr">133 </span>  e8/call  clear-stream/disp32
-<span id="L134" class="LineNr">134 </span>    <span class="Comment"># discard args</span>
-<span id="L135" class="LineNr">135 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Comment"># write(_test-stream2, &quot;Ab&quot;)</span>
-<span id="L137" class="LineNr">137 </span>    <span class="Comment"># push args</span>
+<span id="L134" class="LineNr">134 </span>    <span class="subxComment"># discard args</span>
+<span id="L135" class="LineNr">135 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L136" class="LineNr">136 </span>  <span class="subxComment"># write(_test-stream2, &quot;Ab&quot;)</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxComment"># push args</span>
 <span id="L138" class="LineNr">138 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L139" class="LineNr">139 </span>  68/push  _test-stream2/imm32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># call</span>
+<span id="L140" class="LineNr">140 </span>    <span class="subxComment"># call</span>
 <span id="L141" class="LineNr">141 </span>  e8/call  write/disp32
-<span id="L142" class="LineNr">142 </span>    <span class="Comment"># discard args</span>
-<span id="L143" class="LineNr">143 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L144" class="LineNr">144 </span>  <span class="Comment"># write-stream(_test-stream, _test-stream2)</span>
-<span id="L145" class="LineNr">145 </span>    <span class="Comment"># push args</span>
+<span id="L142" class="LineNr">142 </span>    <span class="subxComment"># discard args</span>
+<span id="L143" class="LineNr">143 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L144" class="LineNr">144 </span>  <span class="subxComment"># write-stream(_test-stream, _test-stream2)</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxComment"># push args</span>
 <span id="L146" class="LineNr">146 </span>  68/push  _test-stream2/imm32
 <span id="L147" class="LineNr">147 </span>  68/push  _test-stream/imm32
-<span id="L148" class="LineNr">148 </span>    <span class="Comment"># call</span>
+<span id="L148" class="LineNr">148 </span>    <span class="subxComment"># call</span>
 <span id="L149" class="LineNr">149 </span>  e8/call  write-stream/disp32
-<span id="L150" class="LineNr">150 </span>    <span class="Comment"># discard args</span>
-<span id="L151" class="LineNr">151 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Comment"># check-ints-equal(*_test-stream.data, 41/A 62/b 00 00, msg)</span>
-<span id="L153" class="LineNr">153 </span>    <span class="Comment"># push args</span>
+<span id="L150" class="LineNr">150 </span>    <span class="subxComment"># discard args</span>
+<span id="L151" class="LineNr">151 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L152" class="LineNr">152 </span>  <span class="subxComment"># check-ints-equal(*_test-stream.data, 41/A 62/b 00 00, msg)</span>
+<span id="L153" class="LineNr">153 </span>    <span class="subxComment"># push args</span>
 <span id="L154" class="LineNr">154 </span>  68/push  <span class="Constant">&quot;F - test-write-stream-single&quot;</span>/imm32
 <span id="L155" class="LineNr">155 </span>  68/push  0x006241/imm32/<span class="Special">Ab</span>
-<span id="L156" class="LineNr">156 </span>    <span class="Comment"># push *_test-stream.data</span>
+<span id="L156" class="LineNr">156 </span>    <span class="subxComment"># push *_test-stream.data</span>
 <span id="L157" class="LineNr">157 </span>  b8/copy-to-EAX  _test-stream/imm32
-<span id="L158" class="LineNr">158 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L159" class="LineNr">159 </span>    <span class="Comment"># call</span>
+<span id="L158" class="LineNr">158 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># call</span>
 <span id="L160" class="LineNr">160 </span>  e8/call  check-ints-equal/disp32
-<span id="L161" class="LineNr">161 </span>    <span class="Comment"># discard args</span>
-<span id="L162" class="LineNr">162 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Comment"># end</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxComment"># discard args</span>
+<span id="L162" class="LineNr">162 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>  <span class="subxComment"># end</span>
 <span id="L164" class="LineNr">164 </span>  c3/return
 <span id="L165" class="LineNr">165 </span>
 <span id="L166" class="LineNr">166 </span>test-write-stream-appends:
-<span id="L167" class="LineNr">167 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Comment"># push args</span>
+<span id="L167" class="LineNr">167 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L168" class="LineNr">168 </span>    <span class="subxComment"># push args</span>
 <span id="L169" class="LineNr">169 </span>  68/push  _test-stream/imm32
-<span id="L170" class="LineNr">170 </span>    <span class="Comment"># call</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxComment"># call</span>
 <span id="L171" class="LineNr">171 </span>  e8/call  clear-stream/disp32
-<span id="L172" class="LineNr">172 </span>    <span class="Comment"># discard args</span>
-<span id="L173" class="LineNr">173 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Comment"># clear-stream(_test-stream2)</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># push args</span>
+<span id="L172" class="LineNr">172 </span>    <span class="subxComment"># discard args</span>
+<span id="L173" class="LineNr">173 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L174" class="LineNr">174 </span>  <span class="subxComment"># clear-stream(_test-stream2)</span>
+<span id="L175" class="LineNr">175 </span>    <span class="subxComment"># push args</span>
 <span id="L176" class="LineNr">176 </span>  68/push  _test-stream2/imm32
-<span id="L177" class="LineNr">177 </span>    <span class="Comment"># call</span>
+<span id="L177" class="LineNr">177 </span>    <span class="subxComment"># call</span>
 <span id="L178" class="LineNr">178 </span>  e8/call  clear-stream/disp32
-<span id="L179" class="LineNr">179 </span>    <span class="Comment"># discard args</span>
-<span id="L180" class="LineNr">180 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Comment"># write(_test-stream2, &quot;C&quot;)</span>
-<span id="L182" class="LineNr">182 </span>    <span class="Comment"># push args</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxComment"># discard args</span>
+<span id="L180" class="LineNr">180 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>  <span class="subxComment"># write(_test-stream2, &quot;C&quot;)</span>
+<span id="L182" class="LineNr">182 </span>    <span class="subxComment"># push args</span>
 <span id="L183" class="LineNr">183 </span>  68/push  <span class="Constant">&quot;C&quot;</span>/imm32
 <span id="L184" class="LineNr">184 </span>  68/push  _test-stream2/imm32
-<span id="L185" class="LineNr">185 </span>    <span class="Comment"># call</span>
+<span id="L185" class="LineNr">185 </span>    <span class="subxComment"># call</span>
 <span id="L186" class="LineNr">186 </span>  e8/call  write/disp32
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># discard args</span>
-<span id="L188" class="LineNr">188 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L189" class="LineNr">189 </span>  <span class="Comment"># write-stream(_test-stream, _test-stream2)</span>
-<span id="L190" class="LineNr">190 </span>    <span class="Comment"># push args</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxComment"># discard args</span>
+<span id="L188" class="LineNr">188 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L189" class="LineNr">189 </span>  <span class="subxComment"># write-stream(_test-stream, _test-stream2)</span>
+<span id="L190" class="LineNr">190 </span>    <span class="subxComment"># push args</span>
 <span id="L191" class="LineNr">191 </span>  68/push  _test-stream2/imm32
 <span id="L192" class="LineNr">192 </span>  68/push  _test-stream/imm32
-<span id="L193" class="LineNr">193 </span>    <span class="Comment"># call</span>
+<span id="L193" class="LineNr">193 </span>    <span class="subxComment"># call</span>
 <span id="L194" class="LineNr">194 </span>  e8/call  write-stream/disp32
-<span id="L195" class="LineNr">195 </span>    <span class="Comment"># discard args</span>
-<span id="L196" class="LineNr">196 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment"># write(_test-stream2, &quot;D&quot;)</span>
-<span id="L198" class="LineNr">198 </span>    <span class="Comment"># push args</span>
+<span id="L195" class="LineNr">195 </span>    <span class="subxComment"># discard args</span>
+<span id="L196" class="LineNr">196 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L197" class="LineNr">197 </span>  <span class="subxComment"># write(_test-stream2, &quot;D&quot;)</span>
+<span id="L198" class="LineNr">198 </span>    <span class="subxComment"># push args</span>
 <span id="L199" class="LineNr">199 </span>  68/push  <span class="Constant">&quot;D&quot;</span>/imm32
 <span id="L200" class="LineNr">200 </span>  68/push  _test-stream2/imm32
-<span id="L201" class="LineNr">201 </span>    <span class="Comment"># call</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxComment"># call</span>
 <span id="L202" class="LineNr">202 </span>  e8/call  write/disp32
-<span id="L203" class="LineNr">203 </span>    <span class="Comment"># discard args</span>
-<span id="L204" class="LineNr">204 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment"># write-stream(_test-stream, _test-stream2)</span>
-<span id="L206" class="LineNr">206 </span>    <span class="Comment"># push args</span>
+<span id="L203" class="LineNr">203 </span>    <span class="subxComment"># discard args</span>
+<span id="L204" class="LineNr">204 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L205" class="LineNr">205 </span>  <span class="subxComment"># write-stream(_test-stream, _test-stream2)</span>
+<span id="L206" class="LineNr">206 </span>    <span class="subxComment"># push args</span>
 <span id="L207" class="LineNr">207 </span>  68/push  _test-stream2/imm32
 <span id="L208" class="LineNr">208 </span>  68/push  _test-stream/imm32
-<span id="L209" class="LineNr">209 </span>    <span class="Comment"># call</span>
+<span id="L209" class="LineNr">209 </span>    <span class="subxComment"># call</span>
 <span id="L210" class="LineNr">210 </span>  e8/call  write-stream/disp32
-<span id="L211" class="LineNr">211 </span>    <span class="Comment"># discard args</span>
-<span id="L212" class="LineNr">212 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Comment"># check-ints-equal(*_test-stream.data, 43/C 44/D 00 00, msg)</span>
-<span id="L214" class="LineNr">214 </span>    <span class="Comment"># push args</span>
+<span id="L211" class="LineNr">211 </span>    <span class="subxComment"># discard args</span>
+<span id="L212" class="LineNr">212 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L213" class="LineNr">213 </span>  <span class="subxComment"># check-ints-equal(*_test-stream.data, 43/C 44/D 00 00, msg)</span>
+<span id="L214" class="LineNr">214 </span>    <span class="subxComment"># push args</span>
 <span id="L215" class="LineNr">215 </span>  68/push  <span class="Constant">&quot;F - test-write-stream-appends&quot;</span>/imm32
 <span id="L216" class="LineNr">216 </span>  68/push  0x00004443/imm32/C-D
-<span id="L217" class="LineNr">217 </span>    <span class="Comment"># push *_test-stream.data</span>
+<span id="L217" class="LineNr">217 </span>    <span class="subxComment"># push *_test-stream.data</span>
 <span id="L218" class="LineNr">218 </span>  b8/copy-to-EAX  _test-stream/imm32
-<span id="L219" class="LineNr">219 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L220" class="LineNr">220 </span>    <span class="Comment"># call</span>
+<span id="L219" class="LineNr">219 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L220" class="LineNr">220 </span>    <span class="subxComment"># call</span>
 <span id="L221" class="LineNr">221 </span>  e8/call  check-ints-equal/disp32
-<span id="L222" class="LineNr">222 </span>    <span class="Comment"># discard args</span>
-<span id="L223" class="LineNr">223 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Comment"># end</span>
+<span id="L222" class="LineNr">222 </span>    <span class="subxComment"># discard args</span>
+<span id="L223" class="LineNr">223 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L224" class="LineNr">224 </span>  <span class="subxComment"># end</span>
 <span id="L225" class="LineNr">225 </span>  c3/return
 <span id="L226" class="LineNr">226 </span>
 <span id="L227" class="LineNr">227 </span>== data
 <span id="L228" class="LineNr">228 </span>
 <span id="L229" class="LineNr">229 </span>_test-stream2:
-<span id="L230" class="LineNr">230 </span>  <span class="Comment"># current write index</span>
+<span id="L230" class="LineNr">230 </span>  <span class="subxComment"># current write index</span>
 <span id="L231" class="LineNr">231 </span>  04 00 00 00
-<span id="L232" class="LineNr">232 </span>  <span class="Comment"># current read index</span>
+<span id="L232" class="LineNr">232 </span>  <span class="subxComment"># current read index</span>
 <span id="L233" class="LineNr">233 </span>  01 00 00 00
-<span id="L234" class="LineNr">234 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L234" class="LineNr">234 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L235" class="LineNr">235 </span>  08 00 00 00
-<span id="L236" class="LineNr">236 </span>  <span class="Comment"># data</span>
-<span id="L237" class="LineNr">237 </span>  41 42 43 44 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L236" class="LineNr">236 </span>  <span class="subxComment"># data</span>
+<span id="L237" class="LineNr">237 </span>  41 42 43 44 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L239" class="LineNr">239 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index 157eee2d..fd232ed2 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -15,14 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005fff; }
+.subxS1Comment { color: #0000af; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.subxH2Comment { color: #00afff; }
 -->
 </style>
 
@@ -57,610 +56,610 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## Port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment"># Corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">#   $ ./subx translate *.subx apps/crenshaw2-1.subx -o crenshaw2-1</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">#   $ echo '3'  |./subx run apps/crenshaw2-1</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment"># Expected output (not working yet):</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">#   # syscall(exit, 3)</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#   bb/copy-to-EBX  3/imm32</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   b8/copy-to-EAX  1/imm32/exit</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   cd/syscall  0x80/imm8</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># To run the generated output:</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   $ echo '3'  |./subx run apps/crenshaw2-1 &gt; z1.subx</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   $ ./subx translate z1.subx -o z1</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">#   $ ./subx run z1</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">#   $ echo $?</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">#   3</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">#</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment"># Stdin must contain just a single hex digit. Other input will print an error:</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment">#   $ echo 'xyz'  |./subx run apps/crenshaw2-1</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment">#   Error: integer expected</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">#</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment"># Names in this file sometimes follow Crenshaw's original rather than my usual</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment"># naming conventions.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># Port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment"># Corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment">#   $ ./subx translate *.subx apps/crenshaw2-1.subx -o crenshaw2-1</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#   $ echo '3'  |./subx run apps/crenshaw2-1</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># Expected output (not working yet):</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#   # syscall(exit, 3)</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#   bb/copy-to-EBX  3/imm32</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#   b8/copy-to-EAX  1/imm32/exit</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   cd/syscall  0x80/imm8</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># To run the generated output:</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment">#   $ echo '3'  |./subx run apps/crenshaw2-1 &gt; z1.subx</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment">#   $ ./subx translate z1.subx -o z1</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment">#   $ ./subx run z1</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment">#   3</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment">#</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># Stdin must contain just a single hex digit. Other input will print an error:</span>
+<span id="L21" class="LineNr"> 21 </span><span class="subxComment">#   $ echo 'xyz'  |./subx run apps/crenshaw2-1</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment">#   Error: integer expected</span>
+<span id="L23" class="LineNr"> 23 </span><span class="subxComment">#</span>
+<span id="L24" class="LineNr"> 24 </span><span class="subxComment"># Names in this file sometimes follow Crenshaw's original rather than my usual</span>
+<span id="L25" class="LineNr"> 25 </span><span class="subxComment"># naming conventions.</span>
 <span id="L26" class="LineNr"> 26 </span>
 <span id="L27" class="LineNr"> 27 </span>== code
-<span id="L28" class="LineNr"> 28 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L28" class="LineNr"> 28 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L31" class="LineNr"> 31 </span>
-<span id="L32" class="LineNr"> 32 </span><span class="Comment"># main: run tests if necessary, call 'compile' if not</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Comment"># prolog</span>
-<span id="L34" class="LineNr"> 34 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># if (argc &gt; 1)</span>
-<span id="L36" class="LineNr"> 36 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0/disp8         1/imm32           <span class="Comment"># compare *EBP</span>
+<span id="L32" class="LineNr"> 32 </span><span class="subxComment"># main: run tests if necessary, call 'compile' if not</span>
+<span id="L33" class="LineNr"> 33 </span>  <span class="subxComment"># prolog</span>
+<span id="L34" class="LineNr"> 34 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="subxComment"># if (argc &gt; 1)</span>
+<span id="L36" class="LineNr"> 36 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L37" class="LineNr"> 37 </span>  7e/jump-if-lesser-or-equal  $run-main/disp8
-<span id="L38" class="LineNr"> 38 </span>  <span class="Comment"># and if (argv[1] == &quot;test&quot;)</span>
-<span id="L39" class="LineNr"> 39 </span>    <span class="Comment"># push args</span>
+<span id="L38" class="LineNr"> 38 </span>  <span class="subxComment"># and if (argv[1] == &quot;test&quot;)</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L40" class="LineNr"> 40 </span>  68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L41" class="LineNr"> 41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L42" class="LineNr"> 42 </span>    <span class="Comment"># call</span>
+<span id="L41" class="LineNr"> 41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L43" class="LineNr"> 43 </span>  e8/call  kernel-string-equal/disp32
-<span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># discard args</span>
-<span id="L45" class="LineNr"> 45 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L46" class="LineNr"> 46 </span>    <span class="Comment"># check result</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L45" class="LineNr"> 45 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="subxS1Comment"># . check result</span>
 <span id="L47" class="LineNr"> 47 </span>  3d/compare-EAX  1/imm32
 <span id="L48" class="LineNr"> 48 </span>  75/jump-if-not-equal  $run-main/disp8
-<span id="L49" class="LineNr"> 49 </span>  <span class="Comment"># then return run-tests()</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="subxComment"># then return run-tests()</span>
 <span id="L50" class="LineNr"> 50 </span>  e8/call  run-tests/disp32
 <span id="L51" class="LineNr"> 51 </span><span class="CommentedCode">#?   e8/call test-get-num-reads-multiple-digits/disp32</span>
-<span id="L52" class="LineNr"> 52 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L52" class="LineNr"> 52 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L53" class="LineNr"> 53 </span>  eb/jump  $main:end/disp8
 <span id="L54" class="LineNr"> 54 </span>$run-main:
-<span id="L55" class="LineNr"> 55 </span>  <span class="Comment"># allocate space for an exit-descriptor</span>
-<span id="L56" class="LineNr"> 56 </span>    <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L57" class="LineNr"> 57 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L58" class="LineNr"> 58 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L59" class="LineNr"> 59 </span>    <span class="Comment"># clear ed-&gt;target (so we really exit)</span>
-<span id="L60" class="LineNr"> 60 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Comment"># compile(Stdin, 1/stdout, 2/stderr, ed)</span>
-<span id="L62" class="LineNr"> 62 </span>    <span class="Comment"># push args</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="subxComment"># allocate space for an exit-descriptor</span>
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxS1Comment"># . var ed/EAX : (address exit-descriptor)</span>
+<span id="L57" class="LineNr"> 57 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L58" class="LineNr"> 58 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . clear ed-&gt;target (so we really exit)</span>
+<span id="L60" class="LineNr"> 60 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L61" class="LineNr"> 61 </span>  <span class="subxComment"># compile(Stdin, 1/stdout, 2/stderr, ed)</span>
+<span id="L62" class="LineNr"> 62 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L63" class="LineNr"> 63 </span>  50/push-EAX/ed
 <span id="L64" class="LineNr"> 64 </span>  68/push  2/imm32/stderr
 <span id="L65" class="LineNr"> 65 </span>  68/push  1/imm32/stdout
 <span id="L66" class="LineNr"> 66 </span>  68/push  <span class="Special">Stdin</span>/imm32
-<span id="L67" class="LineNr"> 67 </span>    <span class="Comment"># call</span>
+<span id="L67" class="LineNr"> 67 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L68" class="LineNr"> 68 </span>  e8/call  compile/disp32
-<span id="L69" class="LineNr"> 69 </span>    <span class="Comment"># discard args</span>
-<span id="L70" class="LineNr"> 70 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># syscall(exit, 0)</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L70" class="LineNr"> 70 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="subxComment"># syscall(exit, 0)</span>
 <span id="L72" class="LineNr"> 72 </span>  bb/copy-to-EBX  0/imm32
 <span id="L73" class="LineNr"> 73 </span>$main:end:
 <span id="L74" class="LineNr"> 74 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L75" class="LineNr"> 75 </span>  cd/syscall  0x80/imm8
 <span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment"># the main entry point</span>
-<span id="L78" class="LineNr"> 78 </span>compile:  <span class="Comment"># in : fd or (address stream), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Comment"># prolog</span>
+<span id="L77" class="LineNr"> 77 </span><span class="subxComment"># the main entry point</span>
+<span id="L78" class="LineNr"> 78 </span>compile:  <span class="subxComment"># in : fd or (address stream), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
+<span id="L79" class="LineNr"> 79 </span>  <span class="subxComment"># prolog</span>
 <span id="L80" class="LineNr"> 80 </span>  55/push-EBP
-<span id="L81" class="LineNr"> 81 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L82" class="LineNr"> 82 </span>  <span class="Comment"># save registers</span>
+<span id="L81" class="LineNr"> 81 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="subxComment"># save registers</span>
 <span id="L83" class="LineNr"> 83 </span>  50/push-EAX
 <span id="L84" class="LineNr"> 84 </span>  51/push-ECX
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># Look = get-char(in)</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># push args</span>
-<span id="L87" class="LineNr"> 87 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8     <span class="Delimiter"> . </span>                   <span class="Comment"># push *(EBP+8)</span>
-<span id="L88" class="LineNr"> 88 </span>    <span class="Comment"># call</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="subxComment"># Look = get-char(in)</span>
+<span id="L86" class="LineNr"> 86 </span>    <span class="subxS1Comment"># . push args</span>
+<span id="L87" class="LineNr"> 87 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L88" class="LineNr"> 88 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L89" class="LineNr"> 89 </span>  e8/call  get-char/disp32
-<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># discard args</span>
-<span id="L91" class="LineNr"> 91 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Comment"># var num/ECX : (address stream) on the stack</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Comment"># We won't add more, so that we can get overflow-handling for free.</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># Add 12 bytes for 'read', 'write' and 'length' fields, for a total of 19 bytes, or 0x13 in hex.</span>
-<span id="L96" class="LineNr"> 96 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x13/imm32        <span class="Comment"># subtract from ESP</span>
-<span id="L97" class="LineNr"> 97 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to ECX</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment"># num-&gt;length = 7</span>
-<span id="L99" class="LineNr"> 99 </span>  c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         7/imm32           <span class="Comment"># copy to *(ECX+8)</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># clear-stream(num)</span>
-<span id="L101" class="LineNr">101 </span>    <span class="Comment"># push args</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L91" class="LineNr"> 91 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="subxComment"># var num/ECX : (address stream) on the stack</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="subxComment"># Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="subxComment"># We won't add more, so that we can get overflow-handling for free.</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="subxComment"># Add 12 bytes for 'read', 'write' and 'length' fields, for a total of 19 bytes, or 0x13 in hex.</span>
+<span id="L96" class="LineNr"> 96 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x13/imm32        <span class="subxComment"># subtract from ESP</span>
+<span id="L97" class="LineNr"> 97 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="subxComment"># num-&gt;length = 7</span>
+<span id="L99" class="LineNr"> 99 </span>  c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         7/imm32           <span class="subxComment"># copy to *(ECX+8)</span>
+<span id="L100" class="LineNr">100 </span>  <span class="subxComment"># clear-stream(num)</span>
+<span id="L101" class="LineNr">101 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L102" class="LineNr">102 </span>  51/push-ECX
-<span id="L103" class="LineNr">103 </span>    <span class="Comment"># call</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L104" class="LineNr">104 </span>  e8/call  clear-stream/disp32
-<span id="L105" class="LineNr">105 </span>    <span class="Comment"># discard args</span>
-<span id="L106" class="LineNr">106 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Comment"># get-num(in, num, err, ed)</span>
-<span id="L108" class="LineNr">108 </span>    <span class="Comment"># push args</span>
-<span id="L109" class="LineNr">109 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+20)</span>
-<span id="L110" class="LineNr">110 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
+<span id="L105" class="LineNr">105 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L106" class="LineNr">106 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L107" class="LineNr">107 </span>  <span class="subxComment"># get-num(in, num, err, ed)</span>
+<span id="L108" class="LineNr">108 </span>    <span class="subxS1Comment"># . push args</span>
+<span id="L109" class="LineNr">109 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L110" class="LineNr">110 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
 <span id="L111" class="LineNr">111 </span>  51/push-ECX/num
-<span id="L112" class="LineNr">112 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8     <span class="Delimiter"> . </span>                   <span class="Comment"># push *(EBP+8)</span>
-<span id="L113" class="LineNr">113 </span>    <span class="Comment"># call</span>
+<span id="L112" class="LineNr">112 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L113" class="LineNr">113 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L114" class="LineNr">114 </span>  e8/call  get-num/disp32
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># discard args</span>
-<span id="L116" class="LineNr">116 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Comment"># EAX = write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># push args</span>
+<span id="L115" class="LineNr">115 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L116" class="LineNr">116 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L117" class="LineNr">117 </span>  <span class="subxComment"># EAX = write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L118" class="LineNr">118 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L119" class="LineNr">119 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L120" class="LineNr">120 </span>  68/push  _test-stream/imm32
-<span id="L121" class="LineNr">121 </span>    <span class="Comment"># call</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L122" class="LineNr">122 </span>  e8/call  write/disp32
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># discard args</span>
-<span id="L124" class="LineNr">124 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Comment"># EAX = write(out, &quot;bb/copy-to-EBX  &quot;)</span>
-<span id="L126" class="LineNr">126 </span>    <span class="Comment"># push args</span>
+<span id="L123" class="LineNr">123 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L124" class="LineNr">124 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L125" class="LineNr">125 </span>  <span class="subxComment"># EAX = write(out, &quot;bb/copy-to-EBX  &quot;)</span>
+<span id="L126" class="LineNr">126 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L127" class="LineNr">127 </span>  68/push  <span class="Constant">&quot;bb/copy-to-EBX  &quot;</span>/imm32
-<span id="L128" class="LineNr">128 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L129" class="LineNr">129 </span>    <span class="Comment"># call</span>
+<span id="L128" class="LineNr">128 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L129" class="LineNr">129 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L130" class="LineNr">130 </span>  e8/call  write/disp32
-<span id="L131" class="LineNr">131 </span>    <span class="Comment"># discard args</span>
-<span id="L132" class="LineNr">132 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Comment"># write-stream(out, num)</span>
-<span id="L134" class="LineNr">134 </span>    <span class="Comment"># push args</span>
+<span id="L131" class="LineNr">131 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L132" class="LineNr">132 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L133" class="LineNr">133 </span>  <span class="subxComment"># write-stream(out, num)</span>
+<span id="L134" class="LineNr">134 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L135" class="LineNr">135 </span>  51/push-ECX/num
-<span id="L136" class="LineNr">136 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L137" class="LineNr">137 </span>    <span class="Comment"># call</span>
+<span id="L136" class="LineNr">136 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L138" class="LineNr">138 </span>  e8/call  write-stream/disp32
-<span id="L139" class="LineNr">139 </span>    <span class="Comment"># discard args</span>
-<span id="L140" class="LineNr">140 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Comment"># write(out, Newline)</span>
-<span id="L142" class="LineNr">142 </span>    <span class="Comment"># push args</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L140" class="LineNr">140 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L141" class="LineNr">141 </span>  <span class="subxComment"># write(out, Newline)</span>
+<span id="L142" class="LineNr">142 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L143" class="LineNr">143 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L144" class="LineNr">144 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L145" class="LineNr">145 </span>    <span class="Comment"># call</span>
+<span id="L144" class="LineNr">144 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L146" class="LineNr">146 </span>  e8/call  write/disp32
-<span id="L147" class="LineNr">147 </span>    <span class="Comment"># discard args</span>
-<span id="L148" class="LineNr">148 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Comment"># EAX = write(out, &quot;b8/copy-to-EAX  1/imm32/exit&quot;)</span>
-<span id="L150" class="LineNr">150 </span>    <span class="Comment"># push args</span>
+<span id="L147" class="LineNr">147 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L148" class="LineNr">148 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L149" class="LineNr">149 </span>  <span class="subxComment"># EAX = write(out, &quot;b8/copy-to-EAX  1/imm32/exit&quot;)</span>
+<span id="L150" class="LineNr">150 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L151" class="LineNr">151 </span>  68/push  <span class="Constant">&quot;b8/copy-to-EAX  1/imm32/exit&quot;</span>/imm32
-<span id="L152" class="LineNr">152 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L153" class="LineNr">153 </span>    <span class="Comment"># call</span>
+<span id="L152" class="LineNr">152 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L153" class="LineNr">153 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L154" class="LineNr">154 </span>  e8/call  write/disp32
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># discard args</span>
-<span id="L156" class="LineNr">156 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Comment"># EAX = write(out, Newline)</span>
-<span id="L158" class="LineNr">158 </span>    <span class="Comment"># push args</span>
+<span id="L155" class="LineNr">155 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L156" class="LineNr">156 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L157" class="LineNr">157 </span>  <span class="subxComment"># EAX = write(out, Newline)</span>
+<span id="L158" class="LineNr">158 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L159" class="LineNr">159 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L160" class="LineNr">160 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L161" class="LineNr">161 </span>    <span class="Comment"># call</span>
+<span id="L160" class="LineNr">160 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L162" class="LineNr">162 </span>  e8/call  write/disp32
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># discard args</span>
-<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Comment"># EAX = write(out, &quot;cd/syscall  0x80/imm8&quot;)</span>
-<span id="L166" class="LineNr">166 </span>    <span class="Comment"># push args</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L164" class="LineNr">164 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L165" class="LineNr">165 </span>  <span class="subxComment"># EAX = write(out, &quot;cd/syscall  0x80/imm8&quot;)</span>
+<span id="L166" class="LineNr">166 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L167" class="LineNr">167 </span>  68/push  <span class="Constant">&quot;cd/syscall  0x80/imm8&quot;</span>/imm32
-<span id="L168" class="LineNr">168 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L169" class="LineNr">169 </span>    <span class="Comment"># call</span>
+<span id="L168" class="LineNr">168 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L170" class="LineNr">170 </span>  e8/call  write/disp32
-<span id="L171" class="LineNr">171 </span>    <span class="Comment"># discard args</span>
-<span id="L172" class="LineNr">172 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L173" class="LineNr">173 </span>  <span class="Comment"># EAX = write(out, Newline)</span>
-<span id="L174" class="LineNr">174 </span>    <span class="Comment"># push args</span>
+<span id="L171" class="LineNr">171 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L172" class="LineNr">172 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L173" class="LineNr">173 </span>  <span class="subxComment"># EAX = write(out, Newline)</span>
+<span id="L174" class="LineNr">174 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L175" class="LineNr">175 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L176" class="LineNr">176 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L177" class="LineNr">177 </span>    <span class="Comment"># call</span>
+<span id="L176" class="LineNr">176 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L177" class="LineNr">177 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L178" class="LineNr">178 </span>  e8/call  write/disp32
-<span id="L179" class="LineNr">179 </span>    <span class="Comment"># discard args</span>
-<span id="L180" class="LineNr">180 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L181" class="LineNr">181 </span>  <span class="Comment"># restore registers</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L180" class="LineNr">180 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>  <span class="subxComment"># restore registers</span>
 <span id="L182" class="LineNr">182 </span>  59/pop-to-ECX
 <span id="L183" class="LineNr">183 </span>  58/pop-to-EAX
-<span id="L184" class="LineNr">184 </span>  <span class="Comment"># epilog</span>
-<span id="L185" class="LineNr">185 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L184" class="LineNr">184 </span>  <span class="subxComment"># epilog</span>
+<span id="L185" class="LineNr">185 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L186" class="LineNr">186 </span>  5d/pop-to-EBP
 <span id="L187" class="LineNr">187 </span>  c3/return
 <span id="L188" class="LineNr">188 </span>
-<span id="L189" class="LineNr">189 </span><span class="Comment"># Read a single digit into 'out'. Abort if there are none, or if there is no space in 'out'.</span>
-<span id="L190" class="LineNr">190 </span><span class="Comment"># Input comes from the global variable 'Look', and we leave the next byte from</span>
-<span id="L191" class="LineNr">191 </span><span class="Comment"># 'in' into it on exit.</span>
-<span id="L192" class="LineNr">192 </span>get-num:  <span class="Comment"># in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
-<span id="L193" class="LineNr">193 </span>  <span class="Comment"># pseudocode:</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Comment">#   if !is-digit?(Look) expected(ed, err, &quot;integer&quot;)</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Comment">#   if out.write &gt;= out.length</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Comment">#     write(err, &quot;Error: too many digits in number\n&quot;)</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment">#     stop(ed, 1)</span>
-<span id="L198" class="LineNr">198 </span>  <span class="Comment">#   out.data[out.write] = LSB(Look)</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Comment">#   ++out.write</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Comment">#   Look = get-char(in)</span>
-<span id="L201" class="LineNr">201 </span>  <span class="Comment">#</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment"># within the loop we'll try to keep things in registers:</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Comment">#   ESI : in</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment">#   EDI : out</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment">#   EAX : temp</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Comment">#   ECX : out-&gt;write</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Comment">#   EDX : out-&gt;length</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Comment">#   EBX : temp2</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Comment"># We can't allocate Look to a register because it gets written implicitly in</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Comment"># get-char in each iteration of the loop. (Thereby demonstrating that it's</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Comment"># not the right interface for us. But we'll keep it just to follow Crenshaw.)</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Comment">#</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Comment"># prolog</span>
+<span id="L189" class="LineNr">189 </span><span class="subxComment"># Read a single digit into 'out'. Abort if there are none, or if there is no space in 'out'.</span>
+<span id="L190" class="LineNr">190 </span><span class="subxComment"># Input comes from the global variable 'Look', and we leave the next byte from</span>
+<span id="L191" class="LineNr">191 </span><span class="subxComment"># 'in' into it on exit.</span>
+<span id="L192" class="LineNr">192 </span>get-num:  <span class="subxComment"># in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
+<span id="L193" class="LineNr">193 </span>  <span class="subxComment"># pseudocode:</span>
+<span id="L194" class="LineNr">194 </span>  <span class="subxComment">#   if !is-digit?(Look) expected(ed, err, &quot;integer&quot;)</span>
+<span id="L195" class="LineNr">195 </span>  <span class="subxComment">#   if out.write &gt;= out.length</span>
+<span id="L196" class="LineNr">196 </span>  <span class="subxComment">#     write(err, &quot;Error: too many digits in number\n&quot;)</span>
+<span id="L197" class="LineNr">197 </span>  <span class="subxComment">#     stop(ed, 1)</span>
+<span id="L198" class="LineNr">198 </span>  <span class="subxComment">#   out.data[out.write] = LSB(Look)</span>
+<span id="L199" class="LineNr">199 </span>  <span class="subxComment">#   ++out.write</span>
+<span id="L200" class="LineNr">200 </span>  <span class="subxComment">#   Look = get-char(in)</span>
+<span id="L201" class="LineNr">201 </span>  <span class="subxComment">#</span>
+<span id="L202" class="LineNr">202 </span>  <span class="subxComment"># within the loop we'll try to keep things in registers:</span>
+<span id="L203" class="LineNr">203 </span>  <span class="subxComment">#   ESI : in</span>
+<span id="L204" class="LineNr">204 </span>  <span class="subxComment">#   EDI : out</span>
+<span id="L205" class="LineNr">205 </span>  <span class="subxComment">#   EAX : temp</span>
+<span id="L206" class="LineNr">206 </span>  <span class="subxComment">#   ECX : out-&gt;write</span>
+<span id="L207" class="LineNr">207 </span>  <span class="subxComment">#   EDX : out-&gt;length</span>
+<span id="L208" class="LineNr">208 </span>  <span class="subxComment">#   EBX : temp2</span>
+<span id="L209" class="LineNr">209 </span>  <span class="subxComment"># We can't allocate Look to a register because it gets written implicitly in</span>
+<span id="L210" class="LineNr">210 </span>  <span class="subxComment"># get-char in each iteration of the loop. (Thereby demonstrating that it's</span>
+<span id="L211" class="LineNr">211 </span>  <span class="subxComment"># not the right interface for us. But we'll keep it just to follow Crenshaw.)</span>
+<span id="L212" class="LineNr">212 </span>  <span class="subxComment">#</span>
+<span id="L213" class="LineNr">213 </span>  <span class="subxComment"># prolog</span>
 <span id="L214" class="LineNr">214 </span>  55/push-EBP
-<span id="L215" class="LineNr">215 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Comment"># EAX = is-digit?(Look)</span>
-<span id="L217" class="LineNr">217 </span>    <span class="Comment"># push args</span>
-<span id="L218" class="LineNr">218 </span>  ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># push *Look</span>
-<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L215" class="LineNr">215 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L216" class="LineNr">216 </span>  <span class="subxComment"># EAX = is-digit?(Look)</span>
+<span id="L217" class="LineNr">217 </span>    <span class="subxS1Comment"># . push args</span>
+<span id="L218" class="LineNr">218 </span>  ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># push *Look</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L220" class="LineNr">220 </span>  e8/call  is-digit?/disp32
-<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
-<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment"># if EAX == 0 error</span>
+<span id="L221" class="LineNr">221 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L222" class="LineNr">222 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>  <span class="subxComment"># if EAX == 0 error</span>
 <span id="L224" class="LineNr">224 </span>  3d/compare-EAX  0/imm32
 <span id="L225" class="LineNr">225 </span>  75/jump-if-not-equal  $get-num:main/disp8
-<span id="L226" class="LineNr">226 </span>    <span class="Comment"># expected(ed, err, &quot;integer&quot;)</span>
-<span id="L227" class="LineNr">227 </span>      <span class="Comment"># push args</span>
+<span id="L226" class="LineNr">226 </span>    <span class="subxS1Comment"># . expected(ed, err, &quot;integer&quot;)</span>
+<span id="L227" class="LineNr">227 </span>      <span class="subxComment"># push args</span>
 <span id="L228" class="LineNr">228 </span>  68/push  <span class="Constant">&quot;integer&quot;</span>/imm32
-<span id="L229" class="LineNr">229 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L230" class="LineNr">230 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+20)</span>
-<span id="L231" class="LineNr">231 </span>      <span class="Comment"># call</span>
-<span id="L232" class="LineNr">232 </span>  e8/call  expected/disp32  <span class="Comment"># never returns</span>
-<span id="L233" class="LineNr">233 </span>      <span class="Comment"># discard args</span>
-<span id="L234" class="LineNr">234 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L229" class="LineNr">229 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L230" class="LineNr">230 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L231" class="LineNr">231 </span>      <span class="subxComment"># call</span>
+<span id="L232" class="LineNr">232 </span>  e8/call  expected/disp32  <span class="subxComment"># never returns</span>
+<span id="L233" class="LineNr">233 </span>      <span class="subxComment"># discard args</span>
+<span id="L234" class="LineNr">234 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L235" class="LineNr">235 </span>$get-num:main:
-<span id="L236" class="LineNr">236 </span>  <span class="Comment"># save registers</span>
+<span id="L236" class="LineNr">236 </span>  <span class="subxComment"># save registers</span>
 <span id="L237" class="LineNr">237 </span>  50/push-EAX
 <span id="L238" class="LineNr">238 </span>  51/push-ECX
 <span id="L239" class="LineNr">239 </span>  52/push-EDX
 <span id="L240" class="LineNr">240 </span>  53/push-EBX
 <span id="L241" class="LineNr">241 </span>  56/push-ESI
 <span id="L242" class="LineNr">242 </span>  57/push-EDI
-<span id="L243" class="LineNr">243 </span>  <span class="Comment"># read necessary variables to registers</span>
-<span id="L244" class="LineNr">244 </span>    <span class="Comment"># ESI = in</span>
-<span id="L245" class="LineNr">245 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ESI</span>
-<span id="L246" class="LineNr">246 </span>    <span class="Comment"># EDI = out</span>
-<span id="L247" class="LineNr">247 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDI</span>
-<span id="L248" class="LineNr">248 </span>    <span class="Comment"># ECX = out-&gt;write</span>
-<span id="L249" class="LineNr">249 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDI to ECX</span>
-<span id="L250" class="LineNr">250 </span>    <span class="Comment"># EDX = out-&gt;length</span>
-<span id="L251" class="LineNr">251 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EDI+8) to EDX</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Comment"># if out-&gt;write &gt;= out-&gt;length error</span>
-<span id="L253" class="LineNr">253 </span>  3b/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EDX with ECX</span>
+<span id="L243" class="LineNr">243 </span>  <span class="subxComment"># read necessary variables to registers</span>
+<span id="L244" class="LineNr">244 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L245" class="LineNr">245 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L246" class="LineNr">246 </span>    <span class="subxComment"># EDI = out</span>
+<span id="L247" class="LineNr">247 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L248" class="LineNr">248 </span>    <span class="subxComment"># ECX = out-&gt;write</span>
+<span id="L249" class="LineNr">249 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L250" class="LineNr">250 </span>    <span class="subxComment"># EDX = out-&gt;length</span>
+<span id="L251" class="LineNr">251 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
+<span id="L252" class="LineNr">252 </span>  <span class="subxComment"># if out-&gt;write &gt;= out-&gt;length error</span>
+<span id="L253" class="LineNr">253 </span>  3b/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EDX with ECX</span>
 <span id="L254" class="LineNr">254 </span>  7d/jump-if-lesser  $get-num:stage2/disp8
-<span id="L255" class="LineNr">255 </span>    <span class="Comment"># error(ed, err, &quot;get-num: too many digits in number&quot;)  # TODO: show full number</span>
-<span id="L256" class="LineNr">256 </span>      <span class="Comment"># push args</span>
+<span id="L255" class="LineNr">255 </span>    <span class="subxComment"># error(ed, err, &quot;get-num: too many digits in number&quot;)  # TODO: show full number</span>
+<span id="L256" class="LineNr">256 </span>      <span class="subxS1Comment"># . push args</span>
 <span id="L257" class="LineNr">257 </span>  68/push  <span class="Constant">&quot;get-num: too many digits in number&quot;</span>/imm32
-<span id="L258" class="LineNr">258 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L259" class="LineNr">259 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+20)</span>
-<span id="L260" class="LineNr">260 </span>      <span class="Comment"># call</span>
-<span id="L261" class="LineNr">261 </span>  e8/call  error/disp32  <span class="Comment"># never returns</span>
-<span id="L262" class="LineNr">262 </span>      <span class="Comment"># discard args</span>
-<span id="L263" class="LineNr">263 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L258" class="LineNr">258 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L259" class="LineNr">259 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L260" class="LineNr">260 </span>      <span class="subxS1Comment"># . call</span>
+<span id="L261" class="LineNr">261 </span>  e8/call  error/disp32  <span class="subxComment"># never returns</span>
+<span id="L262" class="LineNr">262 </span>      <span class="subxS1Comment"># . discard args</span>
+<span id="L263" class="LineNr">263 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L264" class="LineNr">264 </span>$get-num:stage2:
-<span id="L265" class="LineNr">265 </span>  <span class="Comment"># out-&gt;data[out-&gt;write] = LSB(Look)</span>
-<span id="L266" class="LineNr">266 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+ECX+12 to EBX</span>
-<span id="L267" class="LineNr">267 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy *Look to EAX</span>
-<span id="L268" class="LineNr">268 </span>  88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/AL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at AL to *EBX</span>
-<span id="L269" class="LineNr">269 </span>  <span class="Comment"># ++out-&gt;write</span>
+<span id="L265" class="LineNr">265 </span>  <span class="subxComment"># out-&gt;data[out-&gt;write] = LSB(Look)</span>
+<span id="L266" class="LineNr">266 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
+<span id="L267" class="LineNr">267 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *Look to EAX</span>
+<span id="L268" class="LineNr">268 </span>  88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/AL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at AL to *EBX</span>
+<span id="L269" class="LineNr">269 </span>  <span class="subxComment"># ++out-&gt;write</span>
 <span id="L270" class="LineNr">270 </span>  41/increment-ECX
-<span id="L271" class="LineNr">271 </span>  <span class="Comment"># Look = get-char(in)</span>
-<span id="L272" class="LineNr">272 </span>    <span class="Comment"># push args</span>
+<span id="L271" class="LineNr">271 </span>  <span class="subxComment"># Look = get-char(in)</span>
+<span id="L272" class="LineNr">272 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L273" class="LineNr">273 </span>  56/push-ESI
-<span id="L274" class="LineNr">274 </span>    <span class="Comment"># call</span>
+<span id="L274" class="LineNr">274 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L275" class="LineNr">275 </span>  e8/call  get-char/disp32
-<span id="L276" class="LineNr">276 </span>    <span class="Comment"># discard args</span>
-<span id="L277" class="LineNr">277 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L276" class="LineNr">276 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L277" class="LineNr">277 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L278" class="LineNr">278 </span>$get-num:loop-end:
-<span id="L279" class="LineNr">279 </span>  <span class="Comment"># persist necessary variables from registers</span>
-<span id="L280" class="LineNr">280 </span>  89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ECX to *EDI</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Comment"># restore registers</span>
+<span id="L279" class="LineNr">279 </span>  <span class="subxComment"># persist necessary variables from registers</span>
+<span id="L280" class="LineNr">280 </span>  89/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX to *EDI</span>
+<span id="L281" class="LineNr">281 </span>  <span class="subxComment"># restore registers</span>
 <span id="L282" class="LineNr">282 </span>  5f/pop-to-EDI
 <span id="L283" class="LineNr">283 </span>  5e/pop-to-ESI
 <span id="L284" class="LineNr">284 </span>  5b/pop-to-EBX
 <span id="L285" class="LineNr">285 </span>  5a/pop-to-EDX
 <span id="L286" class="LineNr">286 </span>  59/pop-to-ECX
 <span id="L287" class="LineNr">287 </span>  58/pop-to-EAX
-<span id="L288" class="LineNr">288 </span>  <span class="Comment"># epilog</span>
-<span id="L289" class="LineNr">289 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L288" class="LineNr">288 </span>  <span class="subxComment"># epilog</span>
+<span id="L289" class="LineNr">289 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L290" class="LineNr">290 </span>  5d/pop-to-EBP
 <span id="L291" class="LineNr">291 </span>  c3/return
 <span id="L292" class="LineNr">292 </span>
 <span id="L293" class="LineNr">293 </span>test-get-num-reads-single-digit:
-<span id="L294" class="LineNr">294 </span>  <span class="SalientComment">## check that get-num returns first character if it's a digit</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Comment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
+<span id="L294" class="LineNr">294 </span>  <span class="subxH2Comment"># - check that get-num returns first character if it's a digit</span>
+<span id="L295" class="LineNr">295 </span>  <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L296" class="LineNr">296 </span>  55/push-EBP
-<span id="L297" class="LineNr">297 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L298" class="LineNr">298 </span>  <span class="SalientComment">## clear all streams</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Comment"># push args</span>
+<span id="L297" class="LineNr">297 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L298" class="LineNr">298 </span>  <span class="subxH2Comment"># - clear all streams</span>
+<span id="L299" class="LineNr">299 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L300" class="LineNr">300 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L301" class="LineNr">301 </span>  68/push  _test-stream/imm32
-<span id="L302" class="LineNr">302 </span>    <span class="Comment"># call</span>
+<span id="L302" class="LineNr">302 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L303" class="LineNr">303 </span>  e8/call  clear-stream/disp32
-<span id="L304" class="LineNr">304 </span>    <span class="Comment"># discard args</span>
-<span id="L305" class="LineNr">305 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L307" class="LineNr">307 </span>    <span class="Comment"># push args</span>
+<span id="L304" class="LineNr">304 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L305" class="LineNr">305 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L306" class="LineNr">306 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L307" class="LineNr">307 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L308" class="LineNr">308 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L309" class="LineNr">309 </span>  05/add-to-EAX  4/imm32
 <span id="L310" class="LineNr">310 </span>  50/push-EAX
-<span id="L311" class="LineNr">311 </span>    <span class="Comment"># call</span>
+<span id="L311" class="LineNr">311 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L312" class="LineNr">312 </span>  e8/call  clear-stream/disp32
-<span id="L313" class="LineNr">313 </span>    <span class="Comment"># discard args</span>
-<span id="L314" class="LineNr">314 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L315" class="LineNr">315 </span>  <span class="Comment"># clear-stream(_test-output-stream)</span>
-<span id="L316" class="LineNr">316 </span>    <span class="Comment"># push args</span>
+<span id="L313" class="LineNr">313 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L314" class="LineNr">314 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L315" class="LineNr">315 </span>  <span class="subxComment"># clear-stream(_test-output-stream)</span>
+<span id="L316" class="LineNr">316 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L317" class="LineNr">317 </span>  68/push  _test-output-stream/imm32
-<span id="L318" class="LineNr">318 </span>    <span class="Comment"># call</span>
+<span id="L318" class="LineNr">318 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L319" class="LineNr">319 </span>  e8/call  clear-stream/disp32
-<span id="L320" class="LineNr">320 </span>    <span class="Comment"># discard args</span>
-<span id="L321" class="LineNr">321 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Comment"># clear-stream(_test-error-stream)</span>
-<span id="L323" class="LineNr">323 </span>    <span class="Comment"># push args</span>
+<span id="L320" class="LineNr">320 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L321" class="LineNr">321 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L322" class="LineNr">322 </span>  <span class="subxComment"># clear-stream(_test-error-stream)</span>
+<span id="L323" class="LineNr">323 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L324" class="LineNr">324 </span>  68/push  _test-error-stream/imm32
-<span id="L325" class="LineNr">325 </span>    <span class="Comment"># call</span>
+<span id="L325" class="LineNr">325 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L326" class="LineNr">326 </span>  e8/call  clear-stream/disp32
-<span id="L327" class="LineNr">327 </span>    <span class="Comment"># discard args</span>
-<span id="L328" class="LineNr">328 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L329" class="LineNr">329 </span>  <span class="SalientComment">## initialize 'in'</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Comment"># write(_test-stream, &quot;3&quot;)</span>
-<span id="L331" class="LineNr">331 </span>    <span class="Comment"># push args</span>
+<span id="L327" class="LineNr">327 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L328" class="LineNr">328 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L329" class="LineNr">329 </span>  <span class="subxH2Comment"># - initialize 'in'</span>
+<span id="L330" class="LineNr">330 </span>  <span class="subxComment"># write(_test-stream, &quot;3&quot;)</span>
+<span id="L331" class="LineNr">331 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L332" class="LineNr">332 </span>  68/push  <span class="Constant">&quot;3&quot;</span>/imm32
 <span id="L333" class="LineNr">333 </span>  68/push  _test-stream/imm32
-<span id="L334" class="LineNr">334 </span>    <span class="Comment"># call</span>
+<span id="L334" class="LineNr">334 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L335" class="LineNr">335 </span>  e8/call  write/disp32
-<span id="L336" class="LineNr">336 </span>    <span class="Comment"># discard args</span>
-<span id="L337" class="LineNr">337 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L338" class="LineNr">338 </span>  <span class="SalientComment">## initialize exit-descriptor 'ed'</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Comment"># allocate on stack</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L341" class="LineNr">341 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L342" class="LineNr">342 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Comment"># size the exit-descriptor for the call to get-num below</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 16)</span>
-<span id="L345" class="LineNr">345 </span>    <span class="Comment"># push args</span>
+<span id="L336" class="LineNr">336 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L337" class="LineNr">337 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L338" class="LineNr">338 </span>  <span class="subxH2Comment"># - initialize exit-descriptor 'ed'</span>
+<span id="L339" class="LineNr">339 </span>  <span class="subxComment"># allocate on stack</span>
+<span id="L340" class="LineNr">340 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L341" class="LineNr">341 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L342" class="LineNr">342 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L343" class="LineNr">343 </span>  <span class="subxComment"># size the exit-descriptor for the call to get-num below</span>
+<span id="L344" class="LineNr">344 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 16)</span>
+<span id="L345" class="LineNr">345 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L346" class="LineNr">346 </span>  68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L347" class="LineNr">347 </span>  50/push-EAX/ed
-<span id="L348" class="LineNr">348 </span>    <span class="Comment"># call</span>
+<span id="L348" class="LineNr">348 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L349" class="LineNr">349 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L350" class="LineNr">350 </span>    <span class="Comment"># discard args</span>
-<span id="L351" class="LineNr">351 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L352" class="LineNr">352 </span>  <span class="SalientComment">## prime the pump</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Comment"># get-char(_test-buffered-file)</span>
-<span id="L354" class="LineNr">354 </span>    <span class="Comment"># push args</span>
+<span id="L350" class="LineNr">350 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L351" class="LineNr">351 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L352" class="LineNr">352 </span>  <span class="subxH2Comment"># - prime the pump</span>
+<span id="L353" class="LineNr">353 </span>  <span class="subxComment"># get-char(_test-buffered-file)</span>
+<span id="L354" class="LineNr">354 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L355" class="LineNr">355 </span>  68/push  _test-buffered-file/imm32
-<span id="L356" class="LineNr">356 </span>    <span class="Comment"># call</span>
+<span id="L356" class="LineNr">356 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L357" class="LineNr">357 </span>  e8/call  get-char/disp32
-<span id="L358" class="LineNr">358 </span>    <span class="Comment"># discard args</span>
-<span id="L359" class="LineNr">359 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L360" class="LineNr">360 </span>  <span class="SalientComment">## get-num(in, out, err, ed)</span>
-<span id="L361" class="LineNr">361 </span>    <span class="Comment"># push args</span>
+<span id="L358" class="LineNr">358 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L359" class="LineNr">359 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L360" class="LineNr">360 </span>  <span class="subxComment">## get-num(in, out, err, ed)</span>
+<span id="L361" class="LineNr">361 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L362" class="LineNr">362 </span>  50/push-EAX/ed
 <span id="L363" class="LineNr">363 </span>  68/push  _test-error-stream/imm32
 <span id="L364" class="LineNr">364 </span>  68/push  _test-output-stream/imm32
 <span id="L365" class="LineNr">365 </span>  68/push  _test-buffered-file/imm32
-<span id="L366" class="LineNr">366 </span>    <span class="Comment"># call</span>
+<span id="L366" class="LineNr">366 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L367" class="LineNr">367 </span>  e8/call  get-num/disp32
-<span id="L368" class="LineNr">368 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L369" class="LineNr">369 </span>    <span class="Comment"># discard args</span>
-<span id="L370" class="LineNr">370 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Comment"># check-ints-equal(*_test-output-stream.data, '3')</span>
-<span id="L372" class="LineNr">372 </span>    <span class="Comment"># push args</span>
+<span id="L368" class="LineNr">368 </span>  <span class="subxComment">## registers except ESP may be clobbered at this point</span>
+<span id="L369" class="LineNr">369 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L370" class="LineNr">370 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L371" class="LineNr">371 </span>  <span class="subxComment"># check-ints-equal(*_test-output-stream.data, '3')</span>
+<span id="L372" class="LineNr">372 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L373" class="LineNr">373 </span>  68/push  <span class="Constant">&quot;F - test-get-num-reads-single-digit&quot;</span>/imm32
 <span id="L374" class="LineNr">374 </span>  68/push  0x33/imm32
 <span id="L375" class="LineNr">375 </span>  b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L376" class="LineNr">376 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L377" class="LineNr">377 </span>    <span class="Comment"># call</span>
+<span id="L376" class="LineNr">376 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L377" class="LineNr">377 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L378" class="LineNr">378 </span>  e8/call  check-ints-equal/disp32
-<span id="L379" class="LineNr">379 </span>    <span class="Comment"># discard args</span>
-<span id="L380" class="LineNr">380 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Comment"># reclaim locals</span>
-<span id="L382" class="LineNr">382 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L379" class="LineNr">379 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L380" class="LineNr">380 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L381" class="LineNr">381 </span>  <span class="subxComment"># reclaim locals</span>
+<span id="L382" class="LineNr">382 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L383" class="LineNr">383 </span>  5d/pop-to-EBP
 <span id="L384" class="LineNr">384 </span>  c3/return
 <span id="L385" class="LineNr">385 </span>
 <span id="L386" class="LineNr">386 </span>test-get-num-aborts-on-non-digit-in-Look:
-<span id="L387" class="LineNr">387 </span>  <span class="SalientComment">## check that get-num returns first character if it's a digit</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Comment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
+<span id="L387" class="LineNr">387 </span>  <span class="subxH2Comment"># - check that get-num returns first character if it's a digit</span>
+<span id="L388" class="LineNr">388 </span>  <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L389" class="LineNr">389 </span>  55/push-EBP
-<span id="L390" class="LineNr">390 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L391" class="LineNr">391 </span>  <span class="SalientComment">## clear all streams</span>
-<span id="L392" class="LineNr">392 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L393" class="LineNr">393 </span>    <span class="Comment"># push args</span>
+<span id="L390" class="LineNr">390 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L391" class="LineNr">391 </span>  <span class="subxH2Comment"># - clear all streams</span>
+<span id="L392" class="LineNr">392 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L393" class="LineNr">393 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L394" class="LineNr">394 </span>  68/push  _test-stream/imm32
-<span id="L395" class="LineNr">395 </span>    <span class="Comment"># call</span>
+<span id="L395" class="LineNr">395 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L396" class="LineNr">396 </span>  e8/call  clear-stream/disp32
-<span id="L397" class="LineNr">397 </span>    <span class="Comment"># discard args</span>
-<span id="L398" class="LineNr">398 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L399" class="LineNr">399 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L400" class="LineNr">400 </span>    <span class="Comment"># push args</span>
+<span id="L397" class="LineNr">397 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L398" class="LineNr">398 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L399" class="LineNr">399 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L400" class="LineNr">400 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L401" class="LineNr">401 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L402" class="LineNr">402 </span>  05/add-to-EAX  4/imm32
 <span id="L403" class="LineNr">403 </span>  50/push-EAX
-<span id="L404" class="LineNr">404 </span>    <span class="Comment"># call</span>
+<span id="L404" class="LineNr">404 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L405" class="LineNr">405 </span>  e8/call  clear-stream/disp32
-<span id="L406" class="LineNr">406 </span>    <span class="Comment"># discard args</span>
-<span id="L407" class="LineNr">407 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L408" class="LineNr">408 </span>  <span class="Comment"># clear-stream(_test-output-stream)</span>
-<span id="L409" class="LineNr">409 </span>    <span class="Comment"># push args</span>
+<span id="L406" class="LineNr">406 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L407" class="LineNr">407 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L408" class="LineNr">408 </span>  <span class="subxComment"># clear-stream(_test-output-stream)</span>
+<span id="L409" class="LineNr">409 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L410" class="LineNr">410 </span>  68/push  _test-output-stream/imm32
-<span id="L411" class="LineNr">411 </span>    <span class="Comment"># call</span>
+<span id="L411" class="LineNr">411 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L412" class="LineNr">412 </span>  e8/call  clear-stream/disp32
-<span id="L413" class="LineNr">413 </span>    <span class="Comment"># discard args</span>
-<span id="L414" class="LineNr">414 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L415" class="LineNr">415 </span>  <span class="Comment"># clear-stream(_test-error-stream)</span>
-<span id="L416" class="LineNr">416 </span>    <span class="Comment"># push args</span>
+<span id="L413" class="LineNr">413 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L414" class="LineNr">414 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L415" class="LineNr">415 </span>  <span class="subxComment"># clear-stream(_test-error-stream)</span>
+<span id="L416" class="LineNr">416 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L417" class="LineNr">417 </span>  68/push  _test-error-stream/imm32
-<span id="L418" class="LineNr">418 </span>    <span class="Comment"># call</span>
+<span id="L418" class="LineNr">418 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L419" class="LineNr">419 </span>  e8/call  clear-stream/disp32
-<span id="L420" class="LineNr">420 </span>    <span class="Comment"># discard args</span>
-<span id="L421" class="LineNr">421 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L422" class="LineNr">422 </span>  <span class="SalientComment">## initialize 'in'</span>
-<span id="L423" class="LineNr">423 </span>  <span class="Comment"># write(_test-stream, &quot;3&quot;)</span>
-<span id="L424" class="LineNr">424 </span>    <span class="Comment"># push args</span>
+<span id="L420" class="LineNr">420 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L421" class="LineNr">421 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L422" class="LineNr">422 </span>  <span class="subxH2Comment"># - initialize 'in'</span>
+<span id="L423" class="LineNr">423 </span>  <span class="subxComment"># write(_test-stream, &quot;3&quot;)</span>
+<span id="L424" class="LineNr">424 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L425" class="LineNr">425 </span>  68/push  <span class="Constant">&quot;3&quot;</span>/imm32
 <span id="L426" class="LineNr">426 </span>  68/push  _test-stream/imm32
-<span id="L427" class="LineNr">427 </span>    <span class="Comment"># call</span>
+<span id="L427" class="LineNr">427 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L428" class="LineNr">428 </span>  e8/call  write/disp32
-<span id="L429" class="LineNr">429 </span>    <span class="Comment"># discard args</span>
-<span id="L430" class="LineNr">430 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L431" class="LineNr">431 </span>  <span class="SalientComment">## initialize exit-descriptor 'ed'</span>
-<span id="L432" class="LineNr">432 </span>  <span class="Comment"># allocate on stack</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L434" class="LineNr">434 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L435" class="LineNr">435 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Comment"># size the exit-descriptor for the call to get-num below</span>
-<span id="L437" class="LineNr">437 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 16)</span>
-<span id="L438" class="LineNr">438 </span>    <span class="Comment"># push args</span>
+<span id="L429" class="LineNr">429 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L430" class="LineNr">430 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L431" class="LineNr">431 </span>  <span class="subxH2Comment"># - initialize exit-descriptor 'ed'</span>
+<span id="L432" class="LineNr">432 </span>  <span class="subxComment"># allocate on stack</span>
+<span id="L433" class="LineNr">433 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L434" class="LineNr">434 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L435" class="LineNr">435 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L436" class="LineNr">436 </span>  <span class="subxComment"># size the exit-descriptor for the call to get-num below</span>
+<span id="L437" class="LineNr">437 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 16)</span>
+<span id="L438" class="LineNr">438 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L439" class="LineNr">439 </span>  68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L440" class="LineNr">440 </span>  50/push-EAX/ed
-<span id="L441" class="LineNr">441 </span>    <span class="Comment"># call</span>
+<span id="L441" class="LineNr">441 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L442" class="LineNr">442 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L443" class="LineNr">443 </span>    <span class="Comment"># discard args</span>
-<span id="L444" class="LineNr">444 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L445" class="LineNr">445 </span>  <span class="SalientComment">## don't initialize Look</span>
-<span id="L446" class="LineNr">446 </span>  <span class="SalientComment">## get-num(in, out, err, ed)</span>
-<span id="L447" class="LineNr">447 </span>    <span class="Comment"># push args</span>
+<span id="L443" class="LineNr">443 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L444" class="LineNr">444 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L445" class="LineNr">445 </span>  <span class="subxH2Comment"># - don't initialize Look</span>
+<span id="L446" class="LineNr">446 </span>  <span class="subxH2Comment"># - get-num(in, out, err, ed)</span>
+<span id="L447" class="LineNr">447 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L448" class="LineNr">448 </span>  50/push-EAX/ed
 <span id="L449" class="LineNr">449 </span>  68/push  _test-error-stream/imm32
 <span id="L450" class="LineNr">450 </span>  68/push  _test-output-stream/imm32
 <span id="L451" class="LineNr">451 </span>  68/push  _test-buffered-file/imm32
-<span id="L452" class="LineNr">452 </span>    <span class="Comment"># call</span>
+<span id="L452" class="LineNr">452 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L453" class="LineNr">453 </span>  e8/call  get-num/disp32
-<span id="L454" class="LineNr">454 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L455" class="LineNr">455 </span>    <span class="Comment"># discard args</span>
-<span id="L456" class="LineNr">456 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L457" class="LineNr">457 </span>  <span class="SalientComment">## check that get-num tried to call exit(1)</span>
-<span id="L458" class="LineNr">458 </span>  <span class="Comment"># check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
-<span id="L459" class="LineNr">459 </span>    <span class="Comment"># push args</span>
+<span id="L454" class="LineNr">454 </span>  <span class="subxComment"># registers except ESP may be clobbered at this point</span>
+<span id="L455" class="LineNr">455 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L456" class="LineNr">456 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L457" class="LineNr">457 </span>  <span class="subxH2Comment"># - check that get-num tried to call exit(1)</span>
+<span id="L458" class="LineNr">458 </span>  <span class="subxComment"># check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
+<span id="L459" class="LineNr">459 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L460" class="LineNr">460 </span>  68/push  <span class="Constant">&quot;F - test-get-num-aborts-on-non-digit-in-Look&quot;</span>/imm32
 <span id="L461" class="LineNr">461 </span>  68/push  2/imm32
-<span id="L462" class="LineNr">462 </span>    <span class="Comment"># push ed-&gt;value</span>
-<span id="L463" class="LineNr">463 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+4)</span>
-<span id="L464" class="LineNr">464 </span>    <span class="Comment"># call</span>
+<span id="L462" class="LineNr">462 </span>    <span class="subxS1Comment"># . push ed-&gt;value</span>
+<span id="L463" class="LineNr">463 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L464" class="LineNr">464 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L465" class="LineNr">465 </span>  e8/call  check-ints-equal/disp32
-<span id="L466" class="LineNr">466 </span>    <span class="Comment"># discard args</span>
-<span id="L467" class="LineNr">467 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L468" class="LineNr">468 </span>  <span class="Comment"># reclaim locals</span>
-<span id="L469" class="LineNr">469 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L466" class="LineNr">466 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L467" class="LineNr">467 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L468" class="LineNr">468 </span>  <span class="subxComment"># reclaim locals</span>
+<span id="L469" class="LineNr">469 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L470" class="LineNr">470 </span>  5d/pop-to-EBP
 <span id="L471" class="LineNr">471 </span>  c3/return
 <span id="L472" class="LineNr">472 </span>
-<span id="L473" class="LineNr">473 </span><span class="SalientComment">## helpers</span>
+<span id="L473" class="LineNr">473 </span><span class="subxComment">## helpers</span>
 <span id="L474" class="LineNr">474 </span>
-<span id="L475" class="LineNr">475 </span><span class="Comment"># write(f, &quot;Error: &quot;+s+&quot; expected\n&quot;) then stop(ed, 1)</span>
-<span id="L476" class="LineNr">476 </span>expected:  <span class="Comment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L477" class="LineNr">477 </span>  <span class="Comment"># prolog</span>
+<span id="L475" class="LineNr">475 </span><span class="subxComment"># write(f, &quot;Error: &quot;+s+&quot; expected\n&quot;) then stop(ed, 1)</span>
+<span id="L476" class="LineNr">476 </span>expected:  <span class="subxComment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L477" class="LineNr">477 </span>  <span class="subxComment"># prolog</span>
 <span id="L478" class="LineNr">478 </span>  55/push-EBP
-<span id="L479" class="LineNr">479 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L480" class="LineNr">480 </span>  <span class="Comment"># write(f, &quot;Error: &quot;)</span>
-<span id="L481" class="LineNr">481 </span>    <span class="Comment"># push args</span>
+<span id="L479" class="LineNr">479 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L480" class="LineNr">480 </span>  <span class="subxComment"># write(f, &quot;Error: &quot;)</span>
+<span id="L481" class="LineNr">481 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L482" class="LineNr">482 </span>  68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L483" class="LineNr">483 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L484" class="LineNr">484 </span>    <span class="Comment"># call</span>
+<span id="L483" class="LineNr">483 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L484" class="LineNr">484 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L485" class="LineNr">485 </span>  e8/call  write/disp32
-<span id="L486" class="LineNr">486 </span>    <span class="Comment"># discard args</span>
-<span id="L487" class="LineNr">487 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L488" class="LineNr">488 </span>  <span class="Comment"># write(f, s)</span>
-<span id="L489" class="LineNr">489 </span>    <span class="Comment"># push args</span>
-<span id="L490" class="LineNr">490 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L491" class="LineNr">491 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L492" class="LineNr">492 </span>    <span class="Comment"># call</span>
+<span id="L486" class="LineNr">486 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L487" class="LineNr">487 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L488" class="LineNr">488 </span>  <span class="subxComment"># write(f, s)</span>
+<span id="L489" class="LineNr">489 </span>    <span class="subxS1Comment"># . push args</span>
+<span id="L490" class="LineNr">490 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L491" class="LineNr">491 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L492" class="LineNr">492 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L493" class="LineNr">493 </span>  e8/call  write/disp32
-<span id="L494" class="LineNr">494 </span>    <span class="Comment"># discard args</span>
-<span id="L495" class="LineNr">495 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L496" class="LineNr">496 </span>  <span class="Comment"># write(f, &quot; expected&quot;)</span>
-<span id="L497" class="LineNr">497 </span>    <span class="Comment"># push args</span>
+<span id="L494" class="LineNr">494 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L495" class="LineNr">495 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L496" class="LineNr">496 </span>  <span class="subxComment"># write(f, &quot; expected&quot;)</span>
+<span id="L497" class="LineNr">497 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L498" class="LineNr">498 </span>  68/push  <span class="Constant">&quot; expected&quot;</span>/imm32
-<span id="L499" class="LineNr">499 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L500" class="LineNr">500 </span>    <span class="Comment"># call</span>
+<span id="L499" class="LineNr">499 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L500" class="LineNr">500 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L501" class="LineNr">501 </span>  e8/call  write/disp32
-<span id="L502" class="LineNr">502 </span>    <span class="Comment"># discard args</span>
-<span id="L503" class="LineNr">503 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L504" class="LineNr">504 </span>  <span class="Comment"># write(f, Newline)</span>
-<span id="L505" class="LineNr">505 </span>    <span class="Comment"># push args</span>
+<span id="L502" class="LineNr">502 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L503" class="LineNr">503 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L504" class="LineNr">504 </span>  <span class="subxComment"># write(f, Newline)</span>
+<span id="L505" class="LineNr">505 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L506" class="LineNr">506 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L507" class="LineNr">507 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L508" class="LineNr">508 </span>    <span class="Comment"># call</span>
+<span id="L507" class="LineNr">507 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L508" class="LineNr">508 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L509" class="LineNr">509 </span>  e8/call  write/disp32
-<span id="L510" class="LineNr">510 </span>    <span class="Comment"># discard args</span>
-<span id="L511" class="LineNr">511 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L512" class="LineNr">512 </span>  <span class="Comment"># stop(ed, 1)</span>
-<span id="L513" class="LineNr">513 </span>    <span class="Comment"># push args</span>
+<span id="L510" class="LineNr">510 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L511" class="LineNr">511 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L512" class="LineNr">512 </span>  <span class="subxComment"># stop(ed, 1)</span>
+<span id="L513" class="LineNr">513 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L514" class="LineNr">514 </span>  68/push  1/imm32
-<span id="L515" class="LineNr">515 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L516" class="LineNr">516 </span>    <span class="Comment"># call</span>
+<span id="L515" class="LineNr">515 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L516" class="LineNr">516 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L517" class="LineNr">517 </span>  e8/call  stop/disp32
-<span id="L518" class="LineNr">518 </span>  <span class="SalientComment">## should never get past this point</span>
-<span id="L519" class="LineNr">519 </span>  <span class="Comment"># epilog</span>
-<span id="L520" class="LineNr">520 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L518" class="LineNr">518 </span>  <span class="subxComment">## should never get past this point</span>
+<span id="L519" class="LineNr">519 </span>  <span class="subxComment"># epilog</span>
+<span id="L520" class="LineNr">520 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L521" class="LineNr">521 </span>  5d/pop-to-EBP
 <span id="L522" class="LineNr">522 </span>  c3/return
 <span id="L523" class="LineNr">523 </span>
-<span id="L524" class="LineNr">524 </span><span class="Comment"># write(f, &quot;Error: &quot;+s+&quot;\n&quot;) then stop(ed, 1)</span>
-<span id="L525" class="LineNr">525 </span>error:  <span class="Comment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Comment"># prolog</span>
+<span id="L524" class="LineNr">524 </span><span class="subxComment"># write(f, &quot;Error: &quot;+s+&quot;\n&quot;) then stop(ed, 1)</span>
+<span id="L525" class="LineNr">525 </span>error:  <span class="subxComment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L526" class="LineNr">526 </span>  <span class="subxComment"># prolog</span>
 <span id="L527" class="LineNr">527 </span>  55/push-EBP
-<span id="L528" class="LineNr">528 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L529" class="LineNr">529 </span>  <span class="Comment"># write(f, &quot;Error: &quot;)</span>
-<span id="L530" class="LineNr">530 </span>    <span class="Comment"># push args</span>
+<span id="L528" class="LineNr">528 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L529" class="LineNr">529 </span>  <span class="subxComment"># write(f, &quot;Error: &quot;)</span>
+<span id="L530" class="LineNr">530 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L531" class="LineNr">531 </span>  68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L532" class="LineNr">532 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L533" class="LineNr">533 </span>    <span class="Comment"># call</span>
+<span id="L532" class="LineNr">532 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L533" class="LineNr">533 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L534" class="LineNr">534 </span>  e8/call  write/disp32
-<span id="L535" class="LineNr">535 </span>    <span class="Comment"># discard args</span>
-<span id="L536" class="LineNr">536 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L537" class="LineNr">537 </span>  <span class="Comment"># write(f, s)</span>
-<span id="L538" class="LineNr">538 </span>    <span class="Comment"># push args</span>
-<span id="L539" class="LineNr">539 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L540" class="LineNr">540 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L541" class="LineNr">541 </span>    <span class="Comment"># call</span>
+<span id="L535" class="LineNr">535 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L536" class="LineNr">536 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L537" class="LineNr">537 </span>  <span class="subxComment"># write(f, s)</span>
+<span id="L538" class="LineNr">538 </span>    <span class="subxS1Comment"># . push args</span>
+<span id="L539" class="LineNr">539 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L540" class="LineNr">540 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L541" class="LineNr">541 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L542" class="LineNr">542 </span>  e8/call  write/disp32
-<span id="L543" class="LineNr">543 </span>    <span class="Comment"># discard args</span>
-<span id="L544" class="LineNr">544 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L545" class="LineNr">545 </span>  <span class="Comment"># write(f, Newline)</span>
-<span id="L546" class="LineNr">546 </span>    <span class="Comment"># push args</span>
+<span id="L543" class="LineNr">543 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L544" class="LineNr">544 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L545" class="LineNr">545 </span>  <span class="subxComment"># write(f, Newline)</span>
+<span id="L546" class="LineNr">546 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L547" class="LineNr">547 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L548" class="LineNr">548 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L549" class="LineNr">549 </span>    <span class="Comment"># call</span>
+<span id="L548" class="LineNr">548 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L549" class="LineNr">549 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L550" class="LineNr">550 </span>  e8/call  write/disp32
-<span id="L551" class="LineNr">551 </span>    <span class="Comment"># discard args</span>
-<span id="L552" class="LineNr">552 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L553" class="LineNr">553 </span>  <span class="Comment"># stop(ed, 1)</span>
-<span id="L554" class="LineNr">554 </span>    <span class="Comment"># push args</span>
+<span id="L551" class="LineNr">551 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L552" class="LineNr">552 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L553" class="LineNr">553 </span>  <span class="subxComment"># stop(ed, 1)</span>
+<span id="L554" class="LineNr">554 </span>    <span class="subxS1Comment"># . push args</span>
 <span id="L555" class="LineNr">555 </span>  68/push  1/imm32
-<span id="L556" class="LineNr">556 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L557" class="LineNr">557 </span>    <span class="Comment"># call</span>
+<span id="L556" class="LineNr">556 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L557" class="LineNr">557 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L558" class="LineNr">558 </span>  e8/call  stop/disp32
-<span id="L559" class="LineNr">559 </span>  <span class="SalientComment">## should never get past this point</span>
-<span id="L560" class="LineNr">560 </span>  <span class="Comment"># epilog</span>
-<span id="L561" class="LineNr">561 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L559" class="LineNr">559 </span>  <span class="subxComment">## should never get past this point</span>
+<span id="L560" class="LineNr">560 </span>  <span class="subxComment"># epilog</span>
+<span id="L561" class="LineNr">561 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L562" class="LineNr">562 </span>  5d/pop-to-EBP
 <span id="L563" class="LineNr">563 </span>  c3/return
 <span id="L564" class="LineNr">564 </span>
-<span id="L565" class="LineNr">565 </span><span class="Comment"># read a byte from 'f', and store it in 'Look'</span>
-<span id="L566" class="LineNr">566 </span>get-char:  <span class="Comment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
-<span id="L567" class="LineNr">567 </span>  <span class="Comment"># prolog</span>
+<span id="L565" class="LineNr">565 </span><span class="subxComment"># read a byte from 'f', and store it in 'Look'</span>
+<span id="L566" class="LineNr">566 </span>get-char:  <span class="subxComment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L567" class="LineNr">567 </span>  <span class="subxComment"># prolog</span>
 <span id="L568" class="LineNr">568 </span>  55/push-EBP
-<span id="L569" class="LineNr">569 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L570" class="LineNr">570 </span>  <span class="Comment"># save registers</span>
+<span id="L569" class="LineNr">569 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L570" class="LineNr">570 </span>  <span class="subxComment"># save registers</span>
 <span id="L571" class="LineNr">571 </span>  50/push-EAX
-<span id="L572" class="LineNr">572 </span>  <span class="Comment"># read-byte(f)</span>
-<span id="L573" class="LineNr">573 </span>    <span class="Comment"># push args</span>
-<span id="L574" class="LineNr">574 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L575" class="LineNr">575 </span>    <span class="Comment"># call</span>
+<span id="L572" class="LineNr">572 </span>  <span class="subxComment"># read-byte(f)</span>
+<span id="L573" class="LineNr">573 </span>    <span class="subxS1Comment"># . push args</span>
+<span id="L574" class="LineNr">574 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L575" class="LineNr">575 </span>    <span class="subxS1Comment"># . call</span>
 <span id="L576" class="LineNr">576 </span>  e8/call  read-byte/disp32
-<span id="L577" class="LineNr">577 </span>    <span class="Comment"># discard args</span>
-<span id="L578" class="LineNr">578 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L579" class="LineNr">579 </span>  <span class="Comment"># save EAX to Look</span>
-<span id="L580" class="LineNr">580 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to *Look</span>
-<span id="L581" class="LineNr">581 </span>  <span class="Comment"># restore registers</span>
+<span id="L577" class="LineNr">577 </span>    <span class="subxS1Comment"># . discard args</span>
+<span id="L578" class="LineNr">578 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L579" class="LineNr">579 </span>  <span class="subxComment"># save EAX to Look</span>
+<span id="L580" class="LineNr">580 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *Look</span>
+<span id="L581" class="LineNr">581 </span>  <span class="subxComment"># restore registers</span>
 <span id="L582" class="LineNr">582 </span>  58/pop-to-EAX
-<span id="L583" class="LineNr">583 </span>  <span class="Comment"># epilog</span>
-<span id="L584" class="LineNr">584 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L583" class="LineNr">583 </span>  <span class="subxComment"># epilog</span>
+<span id="L584" class="LineNr">584 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L585" class="LineNr">585 </span>  5d/pop-to-EBP
 <span id="L586" class="LineNr">586 </span>  c3/return
 <span id="L587" class="LineNr">587 </span>
-<span id="L588" class="LineNr">588 </span>is-digit?:  <span class="Comment"># c : int -&gt; bool/EAX</span>
-<span id="L589" class="LineNr">589 </span>  <span class="Comment"># prolog</span>
+<span id="L588" class="LineNr">588 </span>is-digit?:  <span class="subxComment"># c : int -&gt; bool/EAX</span>
+<span id="L589" class="LineNr">589 </span>  <span class="subxComment"># prolog</span>
 <span id="L590" class="LineNr">590 </span>  55/push-EBP
-<span id="L591" class="LineNr">591 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L592" class="LineNr">592 </span>  <span class="Comment"># EAX = false</span>
+<span id="L591" class="LineNr">591 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L592" class="LineNr">592 </span>  <span class="subxComment"># EAX = false</span>
 <span id="L593" class="LineNr">593 </span>  b8/copy-to-EAX  0/imm32
-<span id="L594" class="LineNr">594 </span>  <span class="Comment"># if c &lt; '0' return false</span>
-<span id="L595" class="LineNr">595 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8       0x30/imm32        <span class="Comment"># compare *(EBP+8)</span>
+<span id="L594" class="LineNr">594 </span>  <span class="subxComment"># if c &lt; '0' return false</span>
+<span id="L595" class="LineNr">595 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8       0x30/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L596" class="LineNr">596 </span>  7c/jump-if-lesser  $is-digit?:end/disp8
-<span id="L597" class="LineNr">597 </span>  <span class="Comment"># if c &gt; '9' return false</span>
-<span id="L598" class="LineNr">598 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8       0x39/imm32        <span class="Comment"># compare *(EBP+8)</span>
+<span id="L597" class="LineNr">597 </span>  <span class="subxComment"># if c &gt; '9' return false</span>
+<span id="L598" class="LineNr">598 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8       0x39/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L599" class="LineNr">599 </span>  7f/jump-if-greater  $is-digit?:end/disp8
-<span id="L600" class="LineNr">600 </span>  <span class="Comment"># otherwise return true</span>
+<span id="L600" class="LineNr">600 </span>  <span class="subxComment"># otherwise return true</span>
 <span id="L601" class="LineNr">601 </span>  b8/copy-to-EAX  1/imm32
 <span id="L602" class="LineNr">602 </span>$is-digit?:end:
-<span id="L603" class="LineNr">603 </span>  <span class="Comment"># epilog</span>
-<span id="L604" class="LineNr">604 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L603" class="LineNr">603 </span>  <span class="subxComment"># epilog</span>
+<span id="L604" class="LineNr">604 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L605" class="LineNr">605 </span>  5d/pop-to-EBP
 <span id="L606" class="LineNr">606 </span>  c3/return
 <span id="L607" class="LineNr">607 </span>
@@ -670,26 +669,26 @@ if ('onhashchange' in window) {
 <span id="L611" class="LineNr">611 </span>  00 00 00 00
 <span id="L612" class="LineNr">612 </span>
 <span id="L613" class="LineNr">613 </span>_test-output-stream:
-<span id="L614" class="LineNr">614 </span>  <span class="Comment"># current write index</span>
+<span id="L614" class="LineNr">614 </span>  <span class="subxComment"># current write index</span>
 <span id="L615" class="LineNr">615 </span>  00 00 00 00
-<span id="L616" class="LineNr">616 </span>  <span class="Comment"># current read index</span>
+<span id="L616" class="LineNr">616 </span>  <span class="subxComment"># current read index</span>
 <span id="L617" class="LineNr">617 </span>  00 00 00 00
-<span id="L618" class="LineNr">618 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L618" class="LineNr">618 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L619" class="LineNr">619 </span>  08 00 00 00
-<span id="L620" class="LineNr">620 </span>  <span class="Comment"># data</span>
-<span id="L621" class="LineNr">621 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L620" class="LineNr">620 </span>  <span class="subxComment"># data</span>
+<span id="L621" class="LineNr">621 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L622" class="LineNr">622 </span>
 <span id="L623" class="LineNr">623 </span>_test-error-stream:
-<span id="L624" class="LineNr">624 </span>  <span class="Comment"># current write index</span>
+<span id="L624" class="LineNr">624 </span>  <span class="subxComment"># current write index</span>
 <span id="L625" class="LineNr">625 </span>  00 00 00 00
-<span id="L626" class="LineNr">626 </span>  <span class="Comment"># current read index</span>
+<span id="L626" class="LineNr">626 </span>  <span class="subxComment"># current read index</span>
 <span id="L627" class="LineNr">627 </span>  00 00 00 00
-<span id="L628" class="LineNr">628 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L628" class="LineNr">628 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L629" class="LineNr">629 </span>  08 00 00 00
-<span id="L630" class="LineNr">630 </span>  <span class="Comment"># data</span>
-<span id="L631" class="LineNr">631 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L630" class="LineNr">630 </span>  <span class="subxComment"># data</span>
+<span id="L631" class="LineNr">631 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L632" class="LineNr">632 </span>
-<span id="L633" class="LineNr">633 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L633" class="LineNr">633 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/crenshaw2-1b.subx.html b/html/subx/apps/crenshaw2-1b.subx.html
index 21c9ab2f..5f231b7c 100644
--- a/html/subx/apps/crenshaw2-1b.subx.html
+++ b/html/subx/apps/crenshaw2-1b.subx.html
@@ -15,14 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -57,813 +54,813 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## Port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment"># Corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># except that we support numbers of multiple digits.</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment">#</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment">#   $ ./subx translate *.subx apps/crenshaw2-1.subx -o crenshaw2-1</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">#   $ echo '1a'  |./subx run apps/crenshaw2-1</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># Expected output (not working yet):</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#   # syscall(exit, 1a)</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   bb/copy-to-EBX  3/imm32</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   b8/copy-to-EAX  1/imm32/exit</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#   cd/syscall  0x80/imm8</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">#</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment"># To run the generated output:</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   $ echo '1a'  |./subx run apps/crenshaw2-1 &gt; z1.subx</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment">#   $ ./subx translate z1.subx -o z1</span>
-<span id="L17" class="LineNr"> 17 </span><span class="Comment">#   $ ./subx run z1</span>
-<span id="L18" class="LineNr"> 18 </span><span class="Comment">#   $ echo $?</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment">#   26  # 0x1a in decimal</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment">#</span>
-<span id="L21" class="LineNr"> 21 </span><span class="Comment"># Stdin must contain just a single hex digit. Other input will print an error:</span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment">#   $ echo 'xyz'  |./subx run apps/crenshaw2-1</span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment">#   Error: integer expected</span>
-<span id="L24" class="LineNr"> 24 </span><span class="Comment">#</span>
-<span id="L25" class="LineNr"> 25 </span><span class="Comment"># Names in this file sometimes follow Crenshaw's original rather than my usual</span>
-<span id="L26" class="LineNr"> 26 </span><span class="Comment"># naming conventions.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment">## Port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment"># Corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># except that we support numbers of multiple digits.</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment">#</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#   $ ./subx translate *.subx apps/crenshaw2-1.subx -o crenshaw2-1</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#   $ echo '1a'  |./subx run apps/crenshaw2-1</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># Expected output (not working yet):</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#   # syscall(exit, 1a)</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#   bb/copy-to-EBX  3/imm32</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   b8/copy-to-EAX  1/imm32/exit</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#   cd/syscall  0x80/imm8</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment">#</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># To run the generated output:</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment">#   $ echo '1a'  |./subx run apps/crenshaw2-1 &gt; z1.subx</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment">#   $ ./subx translate z1.subx -o z1</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxComment">#   $ ./subx run z1</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment">#   26  # 0x1a in decimal</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment">#</span>
+<span id="L21" class="LineNr"> 21 </span><span class="subxComment"># Stdin must contain just a single hex digit. Other input will print an error:</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment">#   $ echo 'xyz'  |./subx run apps/crenshaw2-1</span>
+<span id="L23" class="LineNr"> 23 </span><span class="subxComment">#   Error: integer expected</span>
+<span id="L24" class="LineNr"> 24 </span><span class="subxComment">#</span>
+<span id="L25" class="LineNr"> 25 </span><span class="subxComment"># Names in this file sometimes follow Crenshaw's original rather than my usual</span>
+<span id="L26" class="LineNr"> 26 </span><span class="subxComment"># naming conventions.</span>
 <span id="L27" class="LineNr"> 27 </span>
 <span id="L28" class="LineNr"> 28 </span>== code
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L31" class="LineNr"> 31 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L32" class="LineNr"> 32 </span>
-<span id="L33" class="LineNr"> 33 </span><span class="Comment"># main: run tests if necessary, call 'compile' if not</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># prolog</span>
-<span id="L35" class="LineNr"> 35 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Comment"># if (argc &gt; 1)</span>
-<span id="L37" class="LineNr"> 37 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0/disp8         1/imm32           <span class="Comment"># compare *EBP</span>
+<span id="L33" class="LineNr"> 33 </span><span class="subxComment"># main: run tests if necessary, call 'compile' if not</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="subxComment"># prolog</span>
+<span id="L35" class="LineNr"> 35 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="subxComment"># if (argc &gt; 1)</span>
+<span id="L37" class="LineNr"> 37 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L38" class="LineNr"> 38 </span>  7e/jump-if-lesser-or-equal  $run-main/disp8
-<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># and if (argv[1] == &quot;test&quot;)</span>
-<span id="L40" class="LineNr"> 40 </span>    <span class="Comment"># push args</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="subxComment"># and if (argv[1] == &quot;test&quot;)</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="subxComment"># push args</span>
 <span id="L41" class="LineNr"> 41 </span>  68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L42" class="LineNr"> 42 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L43" class="LineNr"> 43 </span>    <span class="Comment"># call</span>
+<span id="L42" class="LineNr"> 42 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="subxComment"># call</span>
 <span id="L44" class="LineNr"> 44 </span>  e8/call  kernel-string-equal/disp32
-<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># discard args</span>
-<span id="L46" class="LineNr"> 46 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L47" class="LineNr"> 47 </span>    <span class="Comment"># check result</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># discard args</span>
+<span id="L46" class="LineNr"> 46 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># check result</span>
 <span id="L48" class="LineNr"> 48 </span>  3d/compare-EAX  1/imm32
 <span id="L49" class="LineNr"> 49 </span>  75/jump-if-not-equal  $run-main/disp8
-<span id="L50" class="LineNr"> 50 </span>  <span class="Comment"># then return run-tests()</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="subxComment"># then return run-tests()</span>
 <span id="L51" class="LineNr"> 51 </span>  e8/call  run-tests/disp32
 <span id="L52" class="LineNr"> 52 </span><span class="CommentedCode">#?   e8/call test-get-num-reads-multiple-digits/disp32</span>
-<span id="L53" class="LineNr"> 53 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EBX</span>
+<span id="L53" class="LineNr"> 53 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L54" class="LineNr"> 54 </span>  eb/jump  $main:end/disp8
 <span id="L55" class="LineNr"> 55 </span>$run-main:
-<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># allocate space for an exit-descriptor</span>
-<span id="L57" class="LineNr"> 57 </span>    <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L58" class="LineNr"> 58 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L59" class="LineNr"> 59 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L60" class="LineNr"> 60 </span>    <span class="Comment"># clear ed-&gt;target (so we really exit)</span>
-<span id="L61" class="LineNr"> 61 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># compile(Stdin, 1/stdout, 2/stderr, ed)</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># push args</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="subxComment"># allocate space for an exit-descriptor</span>
+<span id="L57" class="LineNr"> 57 </span>    <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L58" class="LineNr"> 58 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L59" class="LineNr"> 59 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># clear ed-&gt;target (so we really exit)</span>
+<span id="L61" class="LineNr"> 61 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="subxComment"># compile(Stdin, 1/stdout, 2/stderr, ed)</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># push args</span>
 <span id="L64" class="LineNr"> 64 </span>  50/push-EAX/ed
 <span id="L65" class="LineNr"> 65 </span>  68/push  2/imm32/stderr
 <span id="L66" class="LineNr"> 66 </span>  68/push  1/imm32/stdout
 <span id="L67" class="LineNr"> 67 </span>  68/push  <span class="Special">Stdin</span>/imm32
-<span id="L68" class="LineNr"> 68 </span>    <span class="Comment"># call</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># call</span>
 <span id="L69" class="LineNr"> 69 </span>  e8/call  compile/disp32
-<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># discard args</span>
-<span id="L71" class="LineNr"> 71 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># syscall(exit, 0)</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxComment"># discard args</span>
+<span id="L71" class="LineNr"> 71 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="subxComment"># syscall(exit, 0)</span>
 <span id="L73" class="LineNr"> 73 </span>  bb/copy-to-EBX  0/imm32
 <span id="L74" class="LineNr"> 74 </span>$main:end:
 <span id="L75" class="LineNr"> 75 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L76" class="LineNr"> 76 </span>  cd/syscall  0x80/imm8
 <span id="L77" class="LineNr"> 77 </span>
-<span id="L78" class="LineNr"> 78 </span><span class="Comment"># the main entry point</span>
-<span id="L79" class="LineNr"> 79 </span>compile:  <span class="Comment"># in : fd or (address stream), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># prolog</span>
+<span id="L78" class="LineNr"> 78 </span><span class="subxComment"># the main entry point</span>
+<span id="L79" class="LineNr"> 79 </span>compile:  <span class="subxComment"># in : fd or (address stream), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="subxComment"># prolog</span>
 <span id="L81" class="LineNr"> 81 </span>  55/push-EBP
-<span id="L82" class="LineNr"> 82 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L83" class="LineNr"> 83 </span>  <span class="Comment"># save registers</span>
+<span id="L82" class="LineNr"> 82 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L83" class="LineNr"> 83 </span>  <span class="subxComment"># save registers</span>
 <span id="L84" class="LineNr"> 84 </span>  50/push-EAX
 <span id="L85" class="LineNr"> 85 </span>  51/push-ECX
-<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># Look = get-char(in)</span>
-<span id="L87" class="LineNr"> 87 </span>    <span class="Comment"># push args</span>
-<span id="L88" class="LineNr"> 88 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8     <span class="Delimiter"> . </span>                   <span class="Comment"># push *(EBP+8)</span>
-<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># call</span>
+<span id="L86" class="LineNr"> 86 </span>  <span class="subxComment"># Look = get-char(in)</span>
+<span id="L87" class="LineNr"> 87 </span>    <span class="subxComment"># push args</span>
+<span id="L88" class="LineNr"> 88 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxComment"># call</span>
 <span id="L90" class="LineNr"> 90 </span>  e8/call  get-char/disp32
-<span id="L91" class="LineNr"> 91 </span>    <span class="Comment"># discard args</span>
-<span id="L92" class="LineNr"> 92 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Comment"># var num/ECX : (address stream) on the stack</span>
-<span id="L94" class="LineNr"> 94 </span>  <span class="Comment"># Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># We won't add more, so that we can get overflow-handling for free.</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># Add 12 bytes for 'read', 'write' and 'length' fields, for a total of 19 bytes, or 0x13 in hex.</span>
-<span id="L97" class="LineNr"> 97 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x13/imm32        <span class="Comment"># subtract from ESP</span>
-<span id="L98" class="LineNr"> 98 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to ECX</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Comment"># num-&gt;length = 7</span>
-<span id="L100" class="LineNr">100 </span>  c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         7/imm32           <span class="Comment"># copy to *(ECX+8)</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Comment"># clear-stream(num)</span>
-<span id="L102" class="LineNr">102 </span>    <span class="Comment"># push args</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># discard args</span>
+<span id="L92" class="LineNr"> 92 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="subxComment"># var num/ECX : (address stream) on the stack</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="subxComment"># Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="subxComment"># We won't add more, so that we can get overflow-handling for free.</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="subxComment"># Add 12 bytes for 'read', 'write' and 'length' fields, for a total of 19 bytes, or 0x13 in hex.</span>
+<span id="L97" class="LineNr"> 97 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x13/imm32        <span class="subxComment"># subtract from ESP</span>
+<span id="L98" class="LineNr"> 98 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="subxComment"># num-&gt;length = 7</span>
+<span id="L100" class="LineNr">100 </span>  c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         7/imm32           <span class="subxComment"># copy to *(ECX+8)</span>
+<span id="L101" class="LineNr">101 </span>  <span class="subxComment"># clear-stream(num)</span>
+<span id="L102" class="LineNr">102 </span>    <span class="subxComment"># push args</span>
 <span id="L103" class="LineNr">103 </span>  51/push-ECX
-<span id="L104" class="LineNr">104 </span>    <span class="Comment"># call</span>
+<span id="L104" class="LineNr">104 </span>    <span class="subxComment"># call</span>
 <span id="L105" class="LineNr">105 </span>  e8/call  clear-stream/disp32
-<span id="L106" class="LineNr">106 </span>    <span class="Comment"># discard args</span>
-<span id="L107" class="LineNr">107 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Comment"># get-num(in, num, err, ed)</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Comment"># push args</span>
-<span id="L110" class="LineNr">110 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+20)</span>
-<span id="L111" class="LineNr">111 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
+<span id="L106" class="LineNr">106 </span>    <span class="subxComment"># discard args</span>
+<span id="L107" class="LineNr">107 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L108" class="LineNr">108 </span>  <span class="subxComment"># get-num(in, num, err, ed)</span>
+<span id="L109" class="LineNr">109 </span>    <span class="subxComment"># push args</span>
+<span id="L110" class="LineNr">110 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L111" class="LineNr">111 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
 <span id="L112" class="LineNr">112 </span>  51/push-ECX/num
-<span id="L113" class="LineNr">113 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8     <span class="Delimiter"> . </span>                   <span class="Comment"># push *(EBP+8)</span>
-<span id="L114" class="LineNr">114 </span>    <span class="Comment"># call</span>
+<span id="L113" class="LineNr">113 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L114" class="LineNr">114 </span>    <span class="subxComment"># call</span>
 <span id="L115" class="LineNr">115 </span>  e8/call  get-num/disp32
-<span id="L116" class="LineNr">116 </span>    <span class="Comment"># discard args</span>
-<span id="L117" class="LineNr">117 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Comment"># EAX = write(_test-stream, &quot;Ab&quot;)</span>
-<span id="L119" class="LineNr">119 </span>    <span class="Comment"># push args</span>
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># discard args</span>
+<span id="L117" class="LineNr">117 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L118" class="LineNr">118 </span>  <span class="subxComment"># EAX = write(_test-stream, &quot;Ab&quot;)</span>
+<span id="L119" class="LineNr">119 </span>    <span class="subxComment"># push args</span>
 <span id="L120" class="LineNr">120 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L121" class="LineNr">121 </span>  68/push  _test-stream/imm32
-<span id="L122" class="LineNr">122 </span>    <span class="Comment"># call</span>
+<span id="L122" class="LineNr">122 </span>    <span class="subxComment"># call</span>
 <span id="L123" class="LineNr">123 </span>  e8/call  write/disp32
-<span id="L124" class="LineNr">124 </span>    <span class="Comment"># discard args</span>
-<span id="L125" class="LineNr">125 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Comment"># EAX = write(out, &quot;bb/copy-to-EBX  &quot;)</span>
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># push args</span>
+<span id="L124" class="LineNr">124 </span>    <span class="subxComment"># discard args</span>
+<span id="L125" class="LineNr">125 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L126" class="LineNr">126 </span>  <span class="subxComment"># EAX = write(out, &quot;bb/copy-to-EBX  &quot;)</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxComment"># push args</span>
 <span id="L128" class="LineNr">128 </span>  68/push  <span class="Constant">&quot;bb/copy-to-EBX  &quot;</span>/imm32
-<span id="L129" class="LineNr">129 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L130" class="LineNr">130 </span>    <span class="Comment"># call</span>
+<span id="L129" class="LineNr">129 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L130" class="LineNr">130 </span>    <span class="subxComment"># call</span>
 <span id="L131" class="LineNr">131 </span>  e8/call  write/disp32
-<span id="L132" class="LineNr">132 </span>    <span class="Comment"># discard args</span>
-<span id="L133" class="LineNr">133 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># write-stream(out, num)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># push args</span>
+<span id="L132" class="LineNr">132 </span>    <span class="subxComment"># discard args</span>
+<span id="L133" class="LineNr">133 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L134" class="LineNr">134 </span>  <span class="subxComment"># write-stream(out, num)</span>
+<span id="L135" class="LineNr">135 </span>    <span class="subxComment"># push args</span>
 <span id="L136" class="LineNr">136 </span>  51/push-ECX/num
-<span id="L137" class="LineNr">137 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L138" class="LineNr">138 </span>    <span class="Comment"># call</span>
+<span id="L137" class="LineNr">137 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxComment"># call</span>
 <span id="L139" class="LineNr">139 </span>  e8/call  write-stream/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># discard args</span>
-<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment"># write(out, Newline)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># push args</span>
+<span id="L140" class="LineNr">140 </span>    <span class="subxComment"># discard args</span>
+<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L142" class="LineNr">142 </span>  <span class="subxComment"># write(out, Newline)</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxComment"># push args</span>
 <span id="L144" class="LineNr">144 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L145" class="LineNr">145 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L146" class="LineNr">146 </span>    <span class="Comment"># call</span>
+<span id="L145" class="LineNr">145 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L146" class="LineNr">146 </span>    <span class="subxComment"># call</span>
 <span id="L147" class="LineNr">147 </span>  e8/call  write/disp32
-<span id="L148" class="LineNr">148 </span>    <span class="Comment"># discard args</span>
-<span id="L149" class="LineNr">149 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Comment"># EAX = write(out, &quot;b8/copy-to-EAX  1/imm32/exit&quot;)</span>
-<span id="L151" class="LineNr">151 </span>    <span class="Comment"># push args</span>
+<span id="L148" class="LineNr">148 </span>    <span class="subxComment"># discard args</span>
+<span id="L149" class="LineNr">149 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L150" class="LineNr">150 </span>  <span class="subxComment"># EAX = write(out, &quot;b8/copy-to-EAX  1/imm32/exit&quot;)</span>
+<span id="L151" class="LineNr">151 </span>    <span class="subxComment"># push args</span>
 <span id="L152" class="LineNr">152 </span>  68/push  <span class="Constant">&quot;b8/copy-to-EAX  1/imm32/exit&quot;</span>/imm32
-<span id="L153" class="LineNr">153 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L154" class="LineNr">154 </span>    <span class="Comment"># call</span>
+<span id="L153" class="LineNr">153 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxComment"># call</span>
 <span id="L155" class="LineNr">155 </span>  e8/call  write/disp32
-<span id="L156" class="LineNr">156 </span>    <span class="Comment"># discard args</span>
-<span id="L157" class="LineNr">157 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Comment"># EAX = write(out, Newline)</span>
-<span id="L159" class="LineNr">159 </span>    <span class="Comment"># push args</span>
+<span id="L156" class="LineNr">156 </span>    <span class="subxComment"># discard args</span>
+<span id="L157" class="LineNr">157 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L158" class="LineNr">158 </span>  <span class="subxComment"># EAX = write(out, Newline)</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># push args</span>
 <span id="L160" class="LineNr">160 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L161" class="LineNr">161 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L162" class="LineNr">162 </span>    <span class="Comment"># call</span>
+<span id="L161" class="LineNr">161 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L162" class="LineNr">162 </span>    <span class="subxComment"># call</span>
 <span id="L163" class="LineNr">163 </span>  e8/call  write/disp32
-<span id="L164" class="LineNr">164 </span>    <span class="Comment"># discard args</span>
-<span id="L165" class="LineNr">165 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Comment"># EAX = write(out, &quot;cd/syscall  0x80/imm8&quot;)</span>
-<span id="L167" class="LineNr">167 </span>    <span class="Comment"># push args</span>
+<span id="L164" class="LineNr">164 </span>    <span class="subxComment"># discard args</span>
+<span id="L165" class="LineNr">165 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L166" class="LineNr">166 </span>  <span class="subxComment"># EAX = write(out, &quot;cd/syscall  0x80/imm8&quot;)</span>
+<span id="L167" class="LineNr">167 </span>    <span class="subxComment"># push args</span>
 <span id="L168" class="LineNr">168 </span>  68/push  <span class="Constant">&quot;cd/syscall  0x80/imm8&quot;</span>/imm32
-<span id="L169" class="LineNr">169 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L170" class="LineNr">170 </span>    <span class="Comment"># call</span>
+<span id="L169" class="LineNr">169 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxComment"># call</span>
 <span id="L171" class="LineNr">171 </span>  e8/call  write/disp32
-<span id="L172" class="LineNr">172 </span>    <span class="Comment"># discard args</span>
-<span id="L173" class="LineNr">173 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L174" class="LineNr">174 </span>  <span class="Comment"># EAX = write(out, Newline)</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># push args</span>
+<span id="L172" class="LineNr">172 </span>    <span class="subxComment"># discard args</span>
+<span id="L173" class="LineNr">173 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L174" class="LineNr">174 </span>  <span class="subxComment"># EAX = write(out, Newline)</span>
+<span id="L175" class="LineNr">175 </span>    <span class="subxComment"># push args</span>
 <span id="L176" class="LineNr">176 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L177" class="LineNr">177 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L178" class="LineNr">178 </span>    <span class="Comment"># call</span>
+<span id="L177" class="LineNr">177 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxComment"># call</span>
 <span id="L179" class="LineNr">179 </span>  e8/call  write/disp32
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># discard args</span>
-<span id="L181" class="LineNr">181 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Comment"># restore registers</span>
+<span id="L180" class="LineNr">180 </span>    <span class="subxComment"># discard args</span>
+<span id="L181" class="LineNr">181 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L182" class="LineNr">182 </span>  <span class="subxComment"># restore registers</span>
 <span id="L183" class="LineNr">183 </span>  59/pop-to-ECX
 <span id="L184" class="LineNr">184 </span>  58/pop-to-EAX
-<span id="L185" class="LineNr">185 </span>  <span class="Comment"># epilog</span>
-<span id="L186" class="LineNr">186 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L185" class="LineNr">185 </span>  <span class="subxComment"># epilog</span>
+<span id="L186" class="LineNr">186 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L187" class="LineNr">187 </span>  5d/pop-to-EBP
 <span id="L188" class="LineNr">188 </span>  c3/return
 <span id="L189" class="LineNr">189 </span>
-<span id="L190" class="LineNr">190 </span><span class="Comment"># Read a sequence of digits into 'out'. Abort if there are none, or if there is</span>
-<span id="L191" class="LineNr">191 </span><span class="Comment"># no space in 'out'.</span>
-<span id="L192" class="LineNr">192 </span><span class="Comment"># Input comes from the global variable 'Look' (first byte) and the argument</span>
-<span id="L193" class="LineNr">193 </span><span class="Comment"># 'in' (rest). We leave the next byte from 'in' into 'Look' on exit.</span>
-<span id="L194" class="LineNr">194 </span>get-num:  <span class="Comment"># in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
-<span id="L195" class="LineNr">195 </span>  <span class="Comment"># pseudocode:</span>
-<span id="L196" class="LineNr">196 </span>  <span class="Comment">#   if !is-digit?(Look) expected(ed, err, &quot;integer&quot;)</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment">#   do</span>
-<span id="L198" class="LineNr">198 </span>  <span class="Comment">#     if out.write &gt;= out.length</span>
-<span id="L199" class="LineNr">199 </span>  <span class="Comment">#       write(err, &quot;Error: too many digits in number\n&quot;)</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Comment">#       stop(ed, 1)</span>
-<span id="L201" class="LineNr">201 </span>  <span class="Comment">#     out.data[out.write] = LSB(Look)</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment">#     ++out.write</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Comment">#     Look = get-char(in)</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Comment">#   while is-digit?(Look)</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment"># This is complicated because I don't want to hard-code the error strategy in</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Comment"># a general helper like write-byte. Maybe I should just create a local helper.</span>
-<span id="L207" class="LineNr">207 </span>  <span class="Comment">#</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Comment"># within the loop we'll try to keep things in registers:</span>
-<span id="L209" class="LineNr">209 </span>  <span class="Comment">#   ESI : in</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Comment">#   EDI : out</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Comment">#   EAX : temp</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Comment">#   ECX : out-&gt;write</span>
-<span id="L213" class="LineNr">213 </span>  <span class="Comment">#   EDX : out-&gt;length</span>
-<span id="L214" class="LineNr">214 </span>  <span class="Comment">#   EBX : temp2</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Comment"># We can't allocate Look to a register because it gets written implicitly in</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Comment"># get-char in each iteration of the loop. (Thereby demonstrating that it's</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment"># not the right interface for us. But we'll keep it just to follow Crenshaw.)</span>
-<span id="L218" class="LineNr">218 </span>  <span class="Comment">#</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Comment"># prolog</span>
+<span id="L190" class="LineNr">190 </span><span class="subxComment"># Read a sequence of digits into 'out'. Abort if there are none, or if there is</span>
+<span id="L191" class="LineNr">191 </span><span class="subxComment"># no space in 'out'.</span>
+<span id="L192" class="LineNr">192 </span><span class="subxComment"># Input comes from the global variable 'Look' (first byte) and the argument</span>
+<span id="L193" class="LineNr">193 </span><span class="subxComment"># 'in' (rest). We leave the next byte from 'in' into 'Look' on exit.</span>
+<span id="L194" class="LineNr">194 </span>get-num:  <span class="subxComment"># in : (address buffered-file), out : (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
+<span id="L195" class="LineNr">195 </span>  <span class="subxComment"># pseudocode:</span>
+<span id="L196" class="LineNr">196 </span>  <span class="subxComment">#   if !is-digit?(Look) expected(ed, err, &quot;integer&quot;)</span>
+<span id="L197" class="LineNr">197 </span>  <span class="subxComment">#   do</span>
+<span id="L198" class="LineNr">198 </span>  <span class="subxComment">#     if out.write &gt;= out.length</span>
+<span id="L199" class="LineNr">199 </span>  <span class="subxComment">#       write(err, &quot;Error: too many digits in number\n&quot;)</span>
+<span id="L200" class="LineNr">200 </span>  <span class="subxComment">#       stop(ed, 1)</span>
+<span id="L201" class="LineNr">201 </span>  <span class="subxComment">#     out.data[out.write] = LSB(Look)</span>
+<span id="L202" class="LineNr">202 </span>  <span class="subxComment">#     ++out.write</span>
+<span id="L203" class="LineNr">203 </span>  <span class="subxComment">#     Look = get-char(in)</span>
+<span id="L204" class="LineNr">204 </span>  <span class="subxComment">#   while is-digit?(Look)</span>
+<span id="L205" class="LineNr">205 </span>  <span class="subxComment"># This is complicated because I don't want to hard-code the error strategy in</span>
+<span id="L206" class="LineNr">206 </span>  <span class="subxComment"># a general helper like write-byte. Maybe I should just create a local helper.</span>
+<span id="L207" class="LineNr">207 </span>  <span class="subxComment">#</span>
+<span id="L208" class="LineNr">208 </span>  <span class="subxComment"># within the loop we'll try to keep things in registers:</span>
+<span id="L209" class="LineNr">209 </span>  <span class="subxComment">#   ESI : in</span>
+<span id="L210" class="LineNr">210 </span>  <span class="subxComment">#   EDI : out</span>
+<span id="L211" class="LineNr">211 </span>  <span class="subxComment">#   EAX : temp</span>
+<span id="L212" class="LineNr">212 </span>  <span class="subxComment">#   ECX : out-&gt;write</span>
+<span id="L213" class="LineNr">213 </span>  <span class="subxComment">#   EDX : out-&gt;length</span>
+<span id="L214" class="LineNr">214 </span>  <span class="subxComment">#   EBX : temp2</span>
+<span id="L215" class="LineNr">215 </span>  <span class="subxComment"># We can't allocate Look to a register because it gets written implicitly in</span>
+<span id="L216" class="LineNr">216 </span>  <span class="subxComment"># get-char in each iteration of the loop. (Thereby demonstrating that it's</span>
+<span id="L217" class="LineNr">217 </span>  <span class="subxComment"># not the right interface for us. But we'll keep it just to follow Crenshaw.)</span>
+<span id="L218" class="LineNr">218 </span>  <span class="subxComment">#</span>
+<span id="L219" class="LineNr">219 </span>  <span class="subxComment"># prolog</span>
 <span id="L220" class="LineNr">220 </span>  55/push-EBP
-<span id="L221" class="LineNr">221 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment"># EAX = is-digit?(Look)</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Comment"># push args</span>
-<span id="L224" class="LineNr">224 </span>  ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># push *Look</span>
-<span id="L225" class="LineNr">225 </span>    <span class="Comment"># call</span>
+<span id="L221" class="LineNr">221 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L222" class="LineNr">222 </span>  <span class="subxComment"># EAX = is-digit?(Look)</span>
+<span id="L223" class="LineNr">223 </span>    <span class="subxComment"># push args</span>
+<span id="L224" class="LineNr">224 </span>  ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># push *Look</span>
+<span id="L225" class="LineNr">225 </span>    <span class="subxComment"># call</span>
 <span id="L226" class="LineNr">226 </span>  e8/call  is-digit?/disp32
-<span id="L227" class="LineNr">227 </span>    <span class="Comment"># discard args</span>
-<span id="L228" class="LineNr">228 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Comment"># if EAX == 0 error</span>
+<span id="L227" class="LineNr">227 </span>    <span class="subxComment"># discard args</span>
+<span id="L228" class="LineNr">228 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L229" class="LineNr">229 </span>  <span class="subxComment"># if EAX == 0 error</span>
 <span id="L230" class="LineNr">230 </span>  3d/compare-EAX  0/imm32
 <span id="L231" class="LineNr">231 </span>  75/jump-if-not-equal  $get-num:main/disp8
-<span id="L232" class="LineNr">232 </span>    <span class="Comment"># expected(ed, err, &quot;integer&quot;)</span>
-<span id="L233" class="LineNr">233 </span>      <span class="Comment"># push args</span>
+<span id="L232" class="LineNr">232 </span>    <span class="subxComment"># expected(ed, err, &quot;integer&quot;)</span>
+<span id="L233" class="LineNr">233 </span>      <span class="subxComment"># push args</span>
 <span id="L234" class="LineNr">234 </span>  68/push  <span class="Constant">&quot;integer&quot;</span>/imm32
-<span id="L235" class="LineNr">235 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L236" class="LineNr">236 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+20)</span>
-<span id="L237" class="LineNr">237 </span>      <span class="Comment"># call</span>
-<span id="L238" class="LineNr">238 </span>  e8/call  expected/disp32  <span class="Comment"># never returns</span>
-<span id="L239" class="LineNr">239 </span>      <span class="Comment"># discard args</span>
-<span id="L240" class="LineNr">240 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L235" class="LineNr">235 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L236" class="LineNr">236 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L237" class="LineNr">237 </span>      <span class="subxComment"># call</span>
+<span id="L238" class="LineNr">238 </span>  e8/call  expected/disp32  <span class="subxComment"># never returns</span>
+<span id="L239" class="LineNr">239 </span>      <span class="subxComment"># discard args</span>
+<span id="L240" class="LineNr">240 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L241" class="LineNr">241 </span>$get-num:main:
-<span id="L242" class="LineNr">242 </span>  <span class="Comment"># save registers</span>
+<span id="L242" class="LineNr">242 </span>  <span class="subxComment"># save registers</span>
 <span id="L243" class="LineNr">243 </span>  50/push-EAX
 <span id="L244" class="LineNr">244 </span>  51/push-ECX
 <span id="L245" class="LineNr">245 </span>  52/push-EDX
 <span id="L246" class="LineNr">246 </span>  53/push-EBX
 <span id="L247" class="LineNr">247 </span>  56/push-ESI
 <span id="L248" class="LineNr">248 </span>  57/push-EDI
-<span id="L249" class="LineNr">249 </span>  <span class="Comment"># read necessary variables to registers</span>
-<span id="L250" class="LineNr">250 </span>    <span class="Comment"># ESI = in</span>
-<span id="L251" class="LineNr">251 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ESI</span>
-<span id="L252" class="LineNr">252 </span>    <span class="Comment"># EDI = out</span>
-<span id="L253" class="LineNr">253 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDI</span>
-<span id="L254" class="LineNr">254 </span>    <span class="Comment"># ECX = out-&gt;write</span>
-<span id="L255" class="LineNr">255 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDI to ECX</span>
-<span id="L256" class="LineNr">256 </span>    <span class="Comment"># EDX = out-&gt;length</span>
-<span id="L257" class="LineNr">257 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EDI+8) to EDX</span>
+<span id="L249" class="LineNr">249 </span>  <span class="subxComment"># read necessary variables to registers</span>
+<span id="L250" class="LineNr">250 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L251" class="LineNr">251 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L252" class="LineNr">252 </span>    <span class="subxComment"># EDI = out</span>
+<span id="L253" class="LineNr">253 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L254" class="LineNr">254 </span>    <span class="subxComment"># ECX = out-&gt;write</span>
+<span id="L255" class="LineNr">255 </span>  8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L256" class="LineNr">256 </span>    <span class="subxComment"># EDX = out-&gt;length</span>
+<span id="L257" class="LineNr">257 </span>  8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
 <span id="L258" class="LineNr">258 </span>$get-num:loop:
-<span id="L259" class="LineNr">259 </span>  <span class="Comment"># if out-&gt;write &gt;= out-&gt;length error</span>
-<span id="L260" class="LineNr">260 </span>  3b/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EDX with ECX</span>
+<span id="L259" class="LineNr">259 </span>  <span class="subxComment"># if out-&gt;write &gt;= out-&gt;length error</span>
+<span id="L260" class="LineNr">260 </span>  3b/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EDX with ECX</span>
 <span id="L261" class="LineNr">261 </span>  7d/jump-if-lesser  $get-num:loop-stage2/disp8
-<span id="L262" class="LineNr">262 </span>    <span class="Comment"># error(ed, err, &quot;get-num: too many digits in number&quot;)  # TODO: show full number</span>
-<span id="L263" class="LineNr">263 </span>      <span class="Comment"># push args</span>
+<span id="L262" class="LineNr">262 </span>    <span class="subxComment"># error(ed, err, &quot;get-num: too many digits in number&quot;)  # TODO: show full number</span>
+<span id="L263" class="LineNr">263 </span>      <span class="subxComment"># push args</span>
 <span id="L264" class="LineNr">264 </span>  68/push  <span class="Constant">&quot;get-num: too many digits in number&quot;</span>/imm32
-<span id="L265" class="LineNr">265 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L266" class="LineNr">266 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x14/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+20)</span>
-<span id="L267" class="LineNr">267 </span>      <span class="Comment"># call</span>
-<span id="L268" class="LineNr">268 </span>  e8/call  error/disp32  <span class="Comment"># never returns</span>
-<span id="L269" class="LineNr">269 </span>      <span class="Comment"># discard args</span>
-<span id="L270" class="LineNr">270 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L265" class="LineNr">265 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L266" class="LineNr">266 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L267" class="LineNr">267 </span>      <span class="subxComment"># call</span>
+<span id="L268" class="LineNr">268 </span>  e8/call  error/disp32  <span class="subxComment"># never returns</span>
+<span id="L269" class="LineNr">269 </span>      <span class="subxComment"># discard args</span>
+<span id="L270" class="LineNr">270 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L271" class="LineNr">271 </span>$get-num:loop-stage2:
-<span id="L272" class="LineNr">272 </span>  <span class="Comment"># out-&gt;data[out-&gt;write] = LSB(Look)</span>
-<span id="L273" class="LineNr">273 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy EDI+ECX+12 to EBX</span>
-<span id="L274" class="LineNr">274 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy *Look to EAX</span>
-<span id="L275" class="LineNr">275 </span>  88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/AL   <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at AL to *EBX</span>
-<span id="L276" class="LineNr">276 </span>  <span class="Comment"># ++out-&gt;write</span>
+<span id="L272" class="LineNr">272 </span>  <span class="subxComment"># out-&gt;data[out-&gt;write] = LSB(Look)</span>
+<span id="L273" class="LineNr">273 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
+<span id="L274" class="LineNr">274 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *Look to EAX</span>
+<span id="L275" class="LineNr">275 </span>  88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/AL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at AL to *EBX</span>
+<span id="L276" class="LineNr">276 </span>  <span class="subxComment"># ++out-&gt;write</span>
 <span id="L277" class="LineNr">277 </span>  41/increment-ECX
-<span id="L278" class="LineNr">278 </span>  <span class="Comment"># Look = get-char(in)</span>
-<span id="L279" class="LineNr">279 </span>    <span class="Comment"># push args</span>
+<span id="L278" class="LineNr">278 </span>  <span class="subxComment"># Look = get-char(in)</span>
+<span id="L279" class="LineNr">279 </span>    <span class="subxComment"># push args</span>
 <span id="L280" class="LineNr">280 </span>  56/push-ESI
-<span id="L281" class="LineNr">281 </span>    <span class="Comment"># call</span>
+<span id="L281" class="LineNr">281 </span>    <span class="subxComment"># call</span>
 <span id="L282" class="LineNr">282 </span>  e8/call  get-char/disp32
-<span id="L283" class="LineNr">283 </span>    <span class="Comment"># discard args</span>
-<span id="L284" class="LineNr">284 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Comment"># EAX = is-digit?(Look)</span>
-<span id="L286" class="LineNr">286 </span>    <span class="Comment"># push args</span>
-<span id="L287" class="LineNr">287 </span>  ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># push *Look</span>
-<span id="L288" class="LineNr">288 </span>    <span class="Comment"># call</span>
+<span id="L283" class="LineNr">283 </span>    <span class="subxComment"># discard args</span>
+<span id="L284" class="LineNr">284 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L285" class="LineNr">285 </span>  <span class="subxComment"># EAX = is-digit?(Look)</span>
+<span id="L286" class="LineNr">286 </span>    <span class="subxComment"># push args</span>
+<span id="L287" class="LineNr">287 </span>  ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># push *Look</span>
+<span id="L288" class="LineNr">288 </span>    <span class="subxComment"># call</span>
 <span id="L289" class="LineNr">289 </span>  e8/call  is-digit?/disp32
-<span id="L290" class="LineNr">290 </span>    <span class="Comment"># discard args</span>
-<span id="L291" class="LineNr">291 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L292" class="LineNr">292 </span>  <span class="Comment"># if EAX loop</span>
+<span id="L290" class="LineNr">290 </span>    <span class="subxComment"># discard args</span>
+<span id="L291" class="LineNr">291 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L292" class="LineNr">292 </span>  <span class="subxComment"># if EAX loop</span>
 <span id="L293" class="LineNr">293 </span>  3d/compare-EAX  0/imm32
 <span id="L294" class="LineNr">294 </span>  0f 85/jump-if-not-equal  $get-num:loop/disp32
 <span id="L295" class="LineNr">295 </span>$get-num:loop-end:
-<span id="L296" class="LineNr">296 </span>  <span class="Comment"># persist necessary variables from registers</span>
-<span id="L297" class="LineNr">297 </span>  89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ECX to *EDI</span>
-<span id="L298" class="LineNr">298 </span>  <span class="Comment"># restore registers</span>
+<span id="L296" class="LineNr">296 </span>  <span class="subxComment"># persist necessary variables from registers</span>
+<span id="L297" class="LineNr">297 </span>  89/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX to *EDI</span>
+<span id="L298" class="LineNr">298 </span>  <span class="subxComment"># restore registers</span>
 <span id="L299" class="LineNr">299 </span>  5f/pop-to-EDI
 <span id="L300" class="LineNr">300 </span>  5e/pop-to-ESI
 <span id="L301" class="LineNr">301 </span>  5b/pop-to-EBX
 <span id="L302" class="LineNr">302 </span>  5a/pop-to-EDX
 <span id="L303" class="LineNr">303 </span>  59/pop-to-ECX
 <span id="L304" class="LineNr">304 </span>  58/pop-to-EAX
-<span id="L305" class="LineNr">305 </span>  <span class="Comment"># epilog</span>
-<span id="L306" class="LineNr">306 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L305" class="LineNr">305 </span>  <span class="subxComment"># epilog</span>
+<span id="L306" class="LineNr">306 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L307" class="LineNr">307 </span>  5d/pop-to-EBP
 <span id="L308" class="LineNr">308 </span>  c3/return
 <span id="L309" class="LineNr">309 </span>
 <span id="L310" class="LineNr">310 </span>test-get-num-reads-single-digit:
-<span id="L311" class="LineNr">311 </span>  <span class="SalientComment">## check that get-num returns first character if it's a digit</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Comment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
+<span id="L311" class="LineNr">311 </span>  <span class="subxComment">## check that get-num returns first character if it's a digit</span>
+<span id="L312" class="LineNr">312 </span>  <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L313" class="LineNr">313 </span>  55/push-EBP
-<span id="L314" class="LineNr">314 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L315" class="LineNr">315 </span>  <span class="SalientComment">## clear all streams</span>
-<span id="L316" class="LineNr">316 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L317" class="LineNr">317 </span>    <span class="Comment"># push args</span>
+<span id="L314" class="LineNr">314 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L315" class="LineNr">315 </span>  <span class="subxComment">## clear all streams</span>
+<span id="L316" class="LineNr">316 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L317" class="LineNr">317 </span>    <span class="subxComment"># push args</span>
 <span id="L318" class="LineNr">318 </span>  68/push  _test-stream/imm32
-<span id="L319" class="LineNr">319 </span>    <span class="Comment"># call</span>
+<span id="L319" class="LineNr">319 </span>    <span class="subxComment"># call</span>
 <span id="L320" class="LineNr">320 </span>  e8/call  clear-stream/disp32
-<span id="L321" class="LineNr">321 </span>    <span class="Comment"># discard args</span>
-<span id="L322" class="LineNr">322 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L324" class="LineNr">324 </span>    <span class="Comment"># push args</span>
+<span id="L321" class="LineNr">321 </span>    <span class="subxComment"># discard args</span>
+<span id="L322" class="LineNr">322 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L323" class="LineNr">323 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L324" class="LineNr">324 </span>    <span class="subxComment"># push args</span>
 <span id="L325" class="LineNr">325 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L326" class="LineNr">326 </span>  05/add-to-EAX  4/imm32
 <span id="L327" class="LineNr">327 </span>  50/push-EAX
-<span id="L328" class="LineNr">328 </span>    <span class="Comment"># call</span>
+<span id="L328" class="LineNr">328 </span>    <span class="subxComment"># call</span>
 <span id="L329" class="LineNr">329 </span>  e8/call  clear-stream/disp32
-<span id="L330" class="LineNr">330 </span>    <span class="Comment"># discard args</span>
-<span id="L331" class="LineNr">331 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Comment"># clear-stream(_test-output-stream)</span>
-<span id="L333" class="LineNr">333 </span>    <span class="Comment"># push args</span>
+<span id="L330" class="LineNr">330 </span>    <span class="subxComment"># discard args</span>
+<span id="L331" class="LineNr">331 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L332" class="LineNr">332 </span>  <span class="subxComment"># clear-stream(_test-output-stream)</span>
+<span id="L333" class="LineNr">333 </span>    <span class="subxComment"># push args</span>
 <span id="L334" class="LineNr">334 </span>  68/push  _test-output-stream/imm32
-<span id="L335" class="LineNr">335 </span>    <span class="Comment"># call</span>
+<span id="L335" class="LineNr">335 </span>    <span class="subxComment"># call</span>
 <span id="L336" class="LineNr">336 </span>  e8/call  clear-stream/disp32
-<span id="L337" class="LineNr">337 </span>    <span class="Comment"># discard args</span>
-<span id="L338" class="LineNr">338 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L339" class="LineNr">339 </span>  <span class="Comment"># clear-stream(_test-error-stream)</span>
-<span id="L340" class="LineNr">340 </span>    <span class="Comment"># push args</span>
+<span id="L337" class="LineNr">337 </span>    <span class="subxComment"># discard args</span>
+<span id="L338" class="LineNr">338 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L339" class="LineNr">339 </span>  <span class="subxComment"># clear-stream(_test-error-stream)</span>
+<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># push args</span>
 <span id="L341" class="LineNr">341 </span>  68/push  _test-error-stream/imm32
-<span id="L342" class="LineNr">342 </span>    <span class="Comment"># call</span>
+<span id="L342" class="LineNr">342 </span>    <span class="subxComment"># call</span>
 <span id="L343" class="LineNr">343 </span>  e8/call  clear-stream/disp32
-<span id="L344" class="LineNr">344 </span>    <span class="Comment"># discard args</span>
-<span id="L345" class="LineNr">345 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L346" class="LineNr">346 </span>  <span class="SalientComment">## initialize 'in'</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Comment"># write(_test-stream, &quot;3&quot;)</span>
-<span id="L348" class="LineNr">348 </span>    <span class="Comment"># push args</span>
+<span id="L344" class="LineNr">344 </span>    <span class="subxComment"># discard args</span>
+<span id="L345" class="LineNr">345 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L346" class="LineNr">346 </span>  <span class="subxComment">## initialize 'in'</span>
+<span id="L347" class="LineNr">347 </span>  <span class="subxComment"># write(_test-stream, &quot;3&quot;)</span>
+<span id="L348" class="LineNr">348 </span>    <span class="subxComment"># push args</span>
 <span id="L349" class="LineNr">349 </span>  68/push  <span class="Constant">&quot;3&quot;</span>/imm32
 <span id="L350" class="LineNr">350 </span>  68/push  _test-stream/imm32
-<span id="L351" class="LineNr">351 </span>    <span class="Comment"># call</span>
+<span id="L351" class="LineNr">351 </span>    <span class="subxComment"># call</span>
 <span id="L352" class="LineNr">352 </span>  e8/call  write/disp32
-<span id="L353" class="LineNr">353 </span>    <span class="Comment"># discard args</span>
-<span id="L354" class="LineNr">354 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L355" class="LineNr">355 </span>  <span class="SalientComment">## initialize exit-descriptor 'ed'</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Comment"># allocate on stack</span>
-<span id="L357" class="LineNr">357 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L358" class="LineNr">358 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L359" class="LineNr">359 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Comment"># size the exit-descriptor for the call to get-num below</span>
-<span id="L361" class="LineNr">361 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 16)</span>
-<span id="L362" class="LineNr">362 </span>    <span class="Comment"># push args</span>
+<span id="L353" class="LineNr">353 </span>    <span class="subxComment"># discard args</span>
+<span id="L354" class="LineNr">354 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L355" class="LineNr">355 </span>  <span class="subxComment">## initialize exit-descriptor 'ed'</span>
+<span id="L356" class="LineNr">356 </span>  <span class="subxComment"># allocate on stack</span>
+<span id="L357" class="LineNr">357 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L358" class="LineNr">358 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L359" class="LineNr">359 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L360" class="LineNr">360 </span>  <span class="subxComment"># size the exit-descriptor for the call to get-num below</span>
+<span id="L361" class="LineNr">361 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 16)</span>
+<span id="L362" class="LineNr">362 </span>    <span class="subxComment"># push args</span>
 <span id="L363" class="LineNr">363 </span>  68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L364" class="LineNr">364 </span>  50/push-EAX/ed
-<span id="L365" class="LineNr">365 </span>    <span class="Comment"># call</span>
+<span id="L365" class="LineNr">365 </span>    <span class="subxComment"># call</span>
 <span id="L366" class="LineNr">366 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L367" class="LineNr">367 </span>    <span class="Comment"># discard args</span>
-<span id="L368" class="LineNr">368 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L369" class="LineNr">369 </span>  <span class="SalientComment">## prime the pump</span>
-<span id="L370" class="LineNr">370 </span>  <span class="Comment"># get-char(_test-buffered-file)</span>
-<span id="L371" class="LineNr">371 </span>    <span class="Comment"># push args</span>
+<span id="L367" class="LineNr">367 </span>    <span class="subxComment"># discard args</span>
+<span id="L368" class="LineNr">368 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L369" class="LineNr">369 </span>  <span class="subxComment">## prime the pump</span>
+<span id="L370" class="LineNr">370 </span>  <span class="subxComment"># get-char(_test-buffered-file)</span>
+<span id="L371" class="LineNr">371 </span>    <span class="subxComment"># push args</span>
 <span id="L372" class="LineNr">372 </span>  68/push  _test-buffered-file/imm32
-<span id="L373" class="LineNr">373 </span>    <span class="Comment"># call</span>
+<span id="L373" class="LineNr">373 </span>    <span class="subxComment"># call</span>
 <span id="L374" class="LineNr">374 </span>  e8/call  get-char/disp32
-<span id="L375" class="LineNr">375 </span>    <span class="Comment"># discard args</span>
-<span id="L376" class="LineNr">376 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L377" class="LineNr">377 </span>  <span class="SalientComment">## get-num(in, out, err, ed)</span>
-<span id="L378" class="LineNr">378 </span>    <span class="Comment"># push args</span>
+<span id="L375" class="LineNr">375 </span>    <span class="subxComment"># discard args</span>
+<span id="L376" class="LineNr">376 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L377" class="LineNr">377 </span>  <span class="subxComment">## get-num(in, out, err, ed)</span>
+<span id="L378" class="LineNr">378 </span>    <span class="subxComment"># push args</span>
 <span id="L379" class="LineNr">379 </span>  50/push-EAX/ed
 <span id="L380" class="LineNr">380 </span>  68/push  _test-error-stream/imm32
 <span id="L381" class="LineNr">381 </span>  68/push  _test-output-stream/imm32
 <span id="L382" class="LineNr">382 </span>  68/push  _test-buffered-file/imm32
-<span id="L383" class="LineNr">383 </span>    <span class="Comment"># call</span>
+<span id="L383" class="LineNr">383 </span>    <span class="subxComment"># call</span>
 <span id="L384" class="LineNr">384 </span>  e8/call  get-num/disp32
-<span id="L385" class="LineNr">385 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L386" class="LineNr">386 </span>    <span class="Comment"># discard args</span>
-<span id="L387" class="LineNr">387 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Comment"># check-ints-equal(*_test-output-stream.data, '3')</span>
-<span id="L389" class="LineNr">389 </span>    <span class="Comment"># push args</span>
+<span id="L385" class="LineNr">385 </span>  <span class="subxComment">## registers except ESP may be clobbered at this point</span>
+<span id="L386" class="LineNr">386 </span>    <span class="subxComment"># discard args</span>
+<span id="L387" class="LineNr">387 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L388" class="LineNr">388 </span>  <span class="subxComment"># check-ints-equal(*_test-output-stream.data, '3')</span>
+<span id="L389" class="LineNr">389 </span>    <span class="subxComment"># push args</span>
 <span id="L390" class="LineNr">390 </span>  68/push  <span class="Constant">&quot;F - test-get-num-reads-single-digit&quot;</span>/imm32
 <span id="L391" class="LineNr">391 </span>  68/push  0x33/imm32
 <span id="L392" class="LineNr">392 </span>  b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L393" class="LineNr">393 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L394" class="LineNr">394 </span>    <span class="Comment"># call</span>
+<span id="L393" class="LineNr">393 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L394" class="LineNr">394 </span>    <span class="subxComment"># call</span>
 <span id="L395" class="LineNr">395 </span>  e8/call  check-ints-equal/disp32
-<span id="L396" class="LineNr">396 </span>    <span class="Comment"># discard args</span>
-<span id="L397" class="LineNr">397 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L398" class="LineNr">398 </span>  <span class="Comment"># reclaim locals</span>
-<span id="L399" class="LineNr">399 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L396" class="LineNr">396 </span>    <span class="subxComment"># discard args</span>
+<span id="L397" class="LineNr">397 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L398" class="LineNr">398 </span>  <span class="subxComment"># reclaim locals</span>
+<span id="L399" class="LineNr">399 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L400" class="LineNr">400 </span>  5d/pop-to-EBP
 <span id="L401" class="LineNr">401 </span>  c3/return
 <span id="L402" class="LineNr">402 </span>
 <span id="L403" class="LineNr">403 </span>test-get-num-aborts-on-non-digit-in-Look:
-<span id="L404" class="LineNr">404 </span>  <span class="SalientComment">## check that get-num returns first character if it's a digit</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Comment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
+<span id="L404" class="LineNr">404 </span>  <span class="subxComment">## check that get-num returns first character if it's a digit</span>
+<span id="L405" class="LineNr">405 </span>  <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L406" class="LineNr">406 </span>  55/push-EBP
-<span id="L407" class="LineNr">407 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L408" class="LineNr">408 </span>  <span class="SalientComment">## clear all streams</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L410" class="LineNr">410 </span>    <span class="Comment"># push args</span>
+<span id="L407" class="LineNr">407 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L408" class="LineNr">408 </span>  <span class="subxComment">## clear all streams</span>
+<span id="L409" class="LineNr">409 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L410" class="LineNr">410 </span>    <span class="subxComment"># push args</span>
 <span id="L411" class="LineNr">411 </span>  68/push  _test-stream/imm32
-<span id="L412" class="LineNr">412 </span>    <span class="Comment"># call</span>
+<span id="L412" class="LineNr">412 </span>    <span class="subxComment"># call</span>
 <span id="L413" class="LineNr">413 </span>  e8/call  clear-stream/disp32
-<span id="L414" class="LineNr">414 </span>    <span class="Comment"># discard args</span>
-<span id="L415" class="LineNr">415 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L416" class="LineNr">416 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L417" class="LineNr">417 </span>    <span class="Comment"># push args</span>
+<span id="L414" class="LineNr">414 </span>    <span class="subxComment"># discard args</span>
+<span id="L415" class="LineNr">415 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L416" class="LineNr">416 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L417" class="LineNr">417 </span>    <span class="subxComment"># push args</span>
 <span id="L418" class="LineNr">418 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L419" class="LineNr">419 </span>  05/add-to-EAX  4/imm32
 <span id="L420" class="LineNr">420 </span>  50/push-EAX
-<span id="L421" class="LineNr">421 </span>    <span class="Comment"># call</span>
+<span id="L421" class="LineNr">421 </span>    <span class="subxComment"># call</span>
 <span id="L422" class="LineNr">422 </span>  e8/call  clear-stream/disp32
-<span id="L423" class="LineNr">423 </span>    <span class="Comment"># discard args</span>
-<span id="L424" class="LineNr">424 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L425" class="LineNr">425 </span>  <span class="Comment"># clear-stream(_test-output-stream)</span>
-<span id="L426" class="LineNr">426 </span>    <span class="Comment"># push args</span>
+<span id="L423" class="LineNr">423 </span>    <span class="subxComment"># discard args</span>
+<span id="L424" class="LineNr">424 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L425" class="LineNr">425 </span>  <span class="subxComment"># clear-stream(_test-output-stream)</span>
+<span id="L426" class="LineNr">426 </span>    <span class="subxComment"># push args</span>
 <span id="L427" class="LineNr">427 </span>  68/push  _test-output-stream/imm32
-<span id="L428" class="LineNr">428 </span>    <span class="Comment"># call</span>
+<span id="L428" class="LineNr">428 </span>    <span class="subxComment"># call</span>
 <span id="L429" class="LineNr">429 </span>  e8/call  clear-stream/disp32
-<span id="L430" class="LineNr">430 </span>    <span class="Comment"># discard args</span>
-<span id="L431" class="LineNr">431 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L432" class="LineNr">432 </span>  <span class="Comment"># clear-stream(_test-error-stream)</span>
-<span id="L433" class="LineNr">433 </span>    <span class="Comment"># push args</span>
+<span id="L430" class="LineNr">430 </span>    <span class="subxComment"># discard args</span>
+<span id="L431" class="LineNr">431 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L432" class="LineNr">432 </span>  <span class="subxComment"># clear-stream(_test-error-stream)</span>
+<span id="L433" class="LineNr">433 </span>    <span class="subxComment"># push args</span>
 <span id="L434" class="LineNr">434 </span>  68/push  _test-error-stream/imm32
-<span id="L435" class="LineNr">435 </span>    <span class="Comment"># call</span>
+<span id="L435" class="LineNr">435 </span>    <span class="subxComment"># call</span>
 <span id="L436" class="LineNr">436 </span>  e8/call  clear-stream/disp32
-<span id="L437" class="LineNr">437 </span>    <span class="Comment"># discard args</span>
-<span id="L438" class="LineNr">438 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L439" class="LineNr">439 </span>  <span class="SalientComment">## initialize 'in'</span>
-<span id="L440" class="LineNr">440 </span>  <span class="Comment"># write(_test-stream, &quot;3&quot;)</span>
-<span id="L441" class="LineNr">441 </span>    <span class="Comment"># push args</span>
+<span id="L437" class="LineNr">437 </span>    <span class="subxComment"># discard args</span>
+<span id="L438" class="LineNr">438 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L439" class="LineNr">439 </span>  <span class="subxComment">## initialize 'in'</span>
+<span id="L440" class="LineNr">440 </span>  <span class="subxComment"># write(_test-stream, &quot;3&quot;)</span>
+<span id="L441" class="LineNr">441 </span>    <span class="subxComment"># push args</span>
 <span id="L442" class="LineNr">442 </span>  68/push  <span class="Constant">&quot;3&quot;</span>/imm32
 <span id="L443" class="LineNr">443 </span>  68/push  _test-stream/imm32
-<span id="L444" class="LineNr">444 </span>    <span class="Comment"># call</span>
+<span id="L444" class="LineNr">444 </span>    <span class="subxComment"># call</span>
 <span id="L445" class="LineNr">445 </span>  e8/call  write/disp32
-<span id="L446" class="LineNr">446 </span>    <span class="Comment"># discard args</span>
-<span id="L447" class="LineNr">447 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L448" class="LineNr">448 </span>  <span class="SalientComment">## initialize exit-descriptor 'ed'</span>
-<span id="L449" class="LineNr">449 </span>  <span class="Comment"># allocate on stack</span>
-<span id="L450" class="LineNr">450 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L451" class="LineNr">451 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L452" class="LineNr">452 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L453" class="LineNr">453 </span>  <span class="Comment"># size the exit-descriptor for the call to get-num below</span>
-<span id="L454" class="LineNr">454 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 16)</span>
-<span id="L455" class="LineNr">455 </span>    <span class="Comment"># push args</span>
+<span id="L446" class="LineNr">446 </span>    <span class="subxComment"># discard args</span>
+<span id="L447" class="LineNr">447 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L448" class="LineNr">448 </span>  <span class="subxComment">## initialize exit-descriptor 'ed'</span>
+<span id="L449" class="LineNr">449 </span>  <span class="subxComment"># allocate on stack</span>
+<span id="L450" class="LineNr">450 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L451" class="LineNr">451 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L452" class="LineNr">452 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L453" class="LineNr">453 </span>  <span class="subxComment"># size the exit-descriptor for the call to get-num below</span>
+<span id="L454" class="LineNr">454 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 16)</span>
+<span id="L455" class="LineNr">455 </span>    <span class="subxComment"># push args</span>
 <span id="L456" class="LineNr">456 </span>  68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L457" class="LineNr">457 </span>  50/push-EAX/ed
-<span id="L458" class="LineNr">458 </span>    <span class="Comment"># call</span>
+<span id="L458" class="LineNr">458 </span>    <span class="subxComment"># call</span>
 <span id="L459" class="LineNr">459 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L460" class="LineNr">460 </span>    <span class="Comment"># discard args</span>
-<span id="L461" class="LineNr">461 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L462" class="LineNr">462 </span>  <span class="SalientComment">## don't initialize Look</span>
-<span id="L463" class="LineNr">463 </span>  <span class="SalientComment">## get-num(in, out, err, ed)</span>
-<span id="L464" class="LineNr">464 </span>    <span class="Comment"># push args</span>
+<span id="L460" class="LineNr">460 </span>    <span class="subxComment"># discard args</span>
+<span id="L461" class="LineNr">461 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L462" class="LineNr">462 </span>  <span class="subxComment">## don't initialize Look</span>
+<span id="L463" class="LineNr">463 </span>  <span class="subxComment">## get-num(in, out, err, ed)</span>
+<span id="L464" class="LineNr">464 </span>    <span class="subxComment"># push args</span>
 <span id="L465" class="LineNr">465 </span>  50/push-EAX/ed
 <span id="L466" class="LineNr">466 </span>  68/push  _test-error-stream/imm32
 <span id="L467" class="LineNr">467 </span>  68/push  _test-output-stream/imm32
 <span id="L468" class="LineNr">468 </span>  68/push  _test-buffered-file/imm32
-<span id="L469" class="LineNr">469 </span>    <span class="Comment"># call</span>
+<span id="L469" class="LineNr">469 </span>    <span class="subxComment"># call</span>
 <span id="L470" class="LineNr">470 </span>  e8/call  get-num/disp32
-<span id="L471" class="LineNr">471 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L472" class="LineNr">472 </span>    <span class="Comment"># discard args</span>
-<span id="L473" class="LineNr">473 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L474" class="LineNr">474 </span>  <span class="SalientComment">## check that get-num tried to call exit(1)</span>
-<span id="L475" class="LineNr">475 </span>  <span class="Comment"># check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
-<span id="L476" class="LineNr">476 </span>    <span class="Comment"># push args</span>
+<span id="L471" class="LineNr">471 </span>  <span class="subxComment">## registers except ESP may be clobbered at this point</span>
+<span id="L472" class="LineNr">472 </span>    <span class="subxComment"># discard args</span>
+<span id="L473" class="LineNr">473 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L474" class="LineNr">474 </span>  <span class="subxComment">## check that get-num tried to call exit(1)</span>
+<span id="L475" class="LineNr">475 </span>  <span class="subxComment"># check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
+<span id="L476" class="LineNr">476 </span>    <span class="subxComment"># push args</span>
 <span id="L477" class="LineNr">477 </span>  68/push  <span class="Constant">&quot;F - test-get-num-aborts-on-non-digit-in-Look&quot;</span>/imm32
 <span id="L478" class="LineNr">478 </span>  68/push  2/imm32
-<span id="L479" class="LineNr">479 </span>    <span class="Comment"># push ed-&gt;value</span>
-<span id="L480" class="LineNr">480 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+4)</span>
-<span id="L481" class="LineNr">481 </span>    <span class="Comment"># call</span>
+<span id="L479" class="LineNr">479 </span>    <span class="subxComment"># push ed-&gt;value</span>
+<span id="L480" class="LineNr">480 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L481" class="LineNr">481 </span>    <span class="subxComment"># call</span>
 <span id="L482" class="LineNr">482 </span>  e8/call  check-ints-equal/disp32
-<span id="L483" class="LineNr">483 </span>    <span class="Comment"># discard args</span>
-<span id="L484" class="LineNr">484 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L485" class="LineNr">485 </span>  <span class="Comment"># reclaim locals</span>
-<span id="L486" class="LineNr">486 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L483" class="LineNr">483 </span>    <span class="subxComment"># discard args</span>
+<span id="L484" class="LineNr">484 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L485" class="LineNr">485 </span>  <span class="subxComment"># reclaim locals</span>
+<span id="L486" class="LineNr">486 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L487" class="LineNr">487 </span>  5d/pop-to-EBP
 <span id="L488" class="LineNr">488 </span>  c3/return
 <span id="L489" class="LineNr">489 </span>
 <span id="L490" class="LineNr">490 </span>test-get-num-reads-multiple-digits:
-<span id="L491" class="LineNr">491 </span>  <span class="SalientComment">## check that get-num returns all initial digits until it encounters a non-digit</span>
-<span id="L492" class="LineNr">492 </span>  <span class="Comment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
+<span id="L491" class="LineNr">491 </span>  <span class="subxComment">## check that get-num returns all initial digits until it encounters a non-digit</span>
+<span id="L492" class="LineNr">492 </span>  <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L493" class="LineNr">493 </span>  55/push-EBP
-<span id="L494" class="LineNr">494 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L495" class="LineNr">495 </span>  <span class="SalientComment">## clear all streams</span>
-<span id="L496" class="LineNr">496 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L497" class="LineNr">497 </span>    <span class="Comment"># push args</span>
+<span id="L494" class="LineNr">494 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L495" class="LineNr">495 </span>  <span class="subxComment">## clear all streams</span>
+<span id="L496" class="LineNr">496 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L497" class="LineNr">497 </span>    <span class="subxComment"># push args</span>
 <span id="L498" class="LineNr">498 </span>  68/push  _test-stream/imm32
-<span id="L499" class="LineNr">499 </span>    <span class="Comment"># call</span>
+<span id="L499" class="LineNr">499 </span>    <span class="subxComment"># call</span>
 <span id="L500" class="LineNr">500 </span>  e8/call  clear-stream/disp32
-<span id="L501" class="LineNr">501 </span>    <span class="Comment"># discard args</span>
-<span id="L502" class="LineNr">502 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L503" class="LineNr">503 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L504" class="LineNr">504 </span>    <span class="Comment"># push args</span>
+<span id="L501" class="LineNr">501 </span>    <span class="subxComment"># discard args</span>
+<span id="L502" class="LineNr">502 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L503" class="LineNr">503 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L504" class="LineNr">504 </span>    <span class="subxComment"># push args</span>
 <span id="L505" class="LineNr">505 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L506" class="LineNr">506 </span>  05/add-to-EAX  4/imm32
 <span id="L507" class="LineNr">507 </span>  50/push-EAX
-<span id="L508" class="LineNr">508 </span>    <span class="Comment"># call</span>
+<span id="L508" class="LineNr">508 </span>    <span class="subxComment"># call</span>
 <span id="L509" class="LineNr">509 </span>  e8/call  clear-stream/disp32
-<span id="L510" class="LineNr">510 </span>    <span class="Comment"># discard args</span>
-<span id="L511" class="LineNr">511 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L512" class="LineNr">512 </span>  <span class="Comment"># clear-stream(_test-output-stream)</span>
-<span id="L513" class="LineNr">513 </span>    <span class="Comment"># push args</span>
+<span id="L510" class="LineNr">510 </span>    <span class="subxComment"># discard args</span>
+<span id="L511" class="LineNr">511 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L512" class="LineNr">512 </span>  <span class="subxComment"># clear-stream(_test-output-stream)</span>
+<span id="L513" class="LineNr">513 </span>    <span class="subxComment"># push args</span>
 <span id="L514" class="LineNr">514 </span>  68/push  _test-output-stream/imm32
-<span id="L515" class="LineNr">515 </span>    <span class="Comment"># call</span>
+<span id="L515" class="LineNr">515 </span>    <span class="subxComment"># call</span>
 <span id="L516" class="LineNr">516 </span>  e8/call  clear-stream/disp32
-<span id="L517" class="LineNr">517 </span>    <span class="Comment"># discard args</span>
-<span id="L518" class="LineNr">518 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L519" class="LineNr">519 </span>  <span class="Comment"># clear-stream(_test-error-stream)</span>
-<span id="L520" class="LineNr">520 </span>    <span class="Comment"># push args</span>
+<span id="L517" class="LineNr">517 </span>    <span class="subxComment"># discard args</span>
+<span id="L518" class="LineNr">518 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L519" class="LineNr">519 </span>  <span class="subxComment"># clear-stream(_test-error-stream)</span>
+<span id="L520" class="LineNr">520 </span>    <span class="subxComment"># push args</span>
 <span id="L521" class="LineNr">521 </span>  68/push  _test-error-stream/imm32
-<span id="L522" class="LineNr">522 </span>    <span class="Comment"># call</span>
+<span id="L522" class="LineNr">522 </span>    <span class="subxComment"># call</span>
 <span id="L523" class="LineNr">523 </span>  e8/call  clear-stream/disp32
-<span id="L524" class="LineNr">524 </span>    <span class="Comment"># discard args</span>
-<span id="L525" class="LineNr">525 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L526" class="LineNr">526 </span>  <span class="SalientComment">## initialize 'in'</span>
-<span id="L527" class="LineNr">527 </span>  <span class="Comment"># write(_test-stream, &quot;3456 x&quot;)</span>
-<span id="L528" class="LineNr">528 </span>    <span class="Comment"># push args</span>
+<span id="L524" class="LineNr">524 </span>    <span class="subxComment"># discard args</span>
+<span id="L525" class="LineNr">525 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L526" class="LineNr">526 </span>  <span class="subxComment">## initialize 'in'</span>
+<span id="L527" class="LineNr">527 </span>  <span class="subxComment"># write(_test-stream, &quot;3456 x&quot;)</span>
+<span id="L528" class="LineNr">528 </span>    <span class="subxComment"># push args</span>
 <span id="L529" class="LineNr">529 </span>  68/push  <span class="Constant">&quot;3456&quot;</span>/imm32
 <span id="L530" class="LineNr">530 </span>  68/push  _test-stream/imm32
-<span id="L531" class="LineNr">531 </span>    <span class="Comment"># call</span>
+<span id="L531" class="LineNr">531 </span>    <span class="subxComment"># call</span>
 <span id="L532" class="LineNr">532 </span>  e8/call  write/disp32
-<span id="L533" class="LineNr">533 </span>    <span class="Comment"># discard args</span>
-<span id="L534" class="LineNr">534 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L535" class="LineNr">535 </span>  <span class="SalientComment">## initialize exit-descriptor 'ed'</span>
-<span id="L536" class="LineNr">536 </span>  <span class="Comment"># allocate on stack</span>
-<span id="L537" class="LineNr">537 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L538" class="LineNr">538 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L539" class="LineNr">539 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L540" class="LineNr">540 </span>  <span class="Comment"># size the exit-descriptor for the call to get-num below</span>
-<span id="L541" class="LineNr">541 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 16)</span>
-<span id="L542" class="LineNr">542 </span>    <span class="Comment"># push args</span>
+<span id="L533" class="LineNr">533 </span>    <span class="subxComment"># discard args</span>
+<span id="L534" class="LineNr">534 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L535" class="LineNr">535 </span>  <span class="subxComment">## initialize exit-descriptor 'ed'</span>
+<span id="L536" class="LineNr">536 </span>  <span class="subxComment"># allocate on stack</span>
+<span id="L537" class="LineNr">537 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L538" class="LineNr">538 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L539" class="LineNr">539 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L540" class="LineNr">540 </span>  <span class="subxComment"># size the exit-descriptor for the call to get-num below</span>
+<span id="L541" class="LineNr">541 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 16)</span>
+<span id="L542" class="LineNr">542 </span>    <span class="subxComment"># push args</span>
 <span id="L543" class="LineNr">543 </span>  68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L544" class="LineNr">544 </span>  50/push-EAX/ed
-<span id="L545" class="LineNr">545 </span>    <span class="Comment"># call</span>
+<span id="L545" class="LineNr">545 </span>    <span class="subxComment"># call</span>
 <span id="L546" class="LineNr">546 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L547" class="LineNr">547 </span>    <span class="Comment"># discard args</span>
-<span id="L548" class="LineNr">548 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L549" class="LineNr">549 </span>  <span class="SalientComment">## prime the pump</span>
-<span id="L550" class="LineNr">550 </span>  <span class="Comment"># get-char(_test-buffered-file)</span>
-<span id="L551" class="LineNr">551 </span>    <span class="Comment"># push args</span>
+<span id="L547" class="LineNr">547 </span>    <span class="subxComment"># discard args</span>
+<span id="L548" class="LineNr">548 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L549" class="LineNr">549 </span>  <span class="subxComment">## prime the pump</span>
+<span id="L550" class="LineNr">550 </span>  <span class="subxComment"># get-char(_test-buffered-file)</span>
+<span id="L551" class="LineNr">551 </span>    <span class="subxComment"># push args</span>
 <span id="L552" class="LineNr">552 </span>  68/push  _test-buffered-file/imm32
-<span id="L553" class="LineNr">553 </span>    <span class="Comment"># call</span>
+<span id="L553" class="LineNr">553 </span>    <span class="subxComment"># call</span>
 <span id="L554" class="LineNr">554 </span>  e8/call  get-char/disp32
-<span id="L555" class="LineNr">555 </span>    <span class="Comment"># discard args</span>
-<span id="L556" class="LineNr">556 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L557" class="LineNr">557 </span>  <span class="SalientComment">## get-num(in, out, err, ed)</span>
-<span id="L558" class="LineNr">558 </span>    <span class="Comment"># push args</span>
+<span id="L555" class="LineNr">555 </span>    <span class="subxComment"># discard args</span>
+<span id="L556" class="LineNr">556 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L557" class="LineNr">557 </span>  <span class="subxComment">## get-num(in, out, err, ed)</span>
+<span id="L558" class="LineNr">558 </span>    <span class="subxComment"># push args</span>
 <span id="L559" class="LineNr">559 </span>  50/push-EAX/ed
 <span id="L560" class="LineNr">560 </span>  68/push  _test-error-stream/imm32
 <span id="L561" class="LineNr">561 </span>  68/push  _test-output-stream/imm32
 <span id="L562" class="LineNr">562 </span>  68/push  _test-buffered-file/imm32
-<span id="L563" class="LineNr">563 </span>    <span class="Comment"># call</span>
+<span id="L563" class="LineNr">563 </span>    <span class="subxComment"># call</span>
 <span id="L564" class="LineNr">564 </span>  e8/call  get-num/disp32
-<span id="L565" class="LineNr">565 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L566" class="LineNr">566 </span>    <span class="Comment"># discard args</span>
-<span id="L567" class="LineNr">567 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L568" class="LineNr">568 </span>  <span class="Comment"># check-ints-equal(*_test-output-stream.data, '3456')</span>
-<span id="L569" class="LineNr">569 </span>    <span class="Comment"># push args</span>
+<span id="L565" class="LineNr">565 </span>  <span class="subxComment">## registers except ESP may be clobbered at this point</span>
+<span id="L566" class="LineNr">566 </span>    <span class="subxComment"># discard args</span>
+<span id="L567" class="LineNr">567 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L568" class="LineNr">568 </span>  <span class="subxComment"># check-ints-equal(*_test-output-stream.data, '3456')</span>
+<span id="L569" class="LineNr">569 </span>    <span class="subxComment"># push args</span>
 <span id="L570" class="LineNr">570 </span>  68/push  <span class="Constant">&quot;F - test-get-num-reads-multiple-digits&quot;</span>/imm32
 <span id="L571" class="LineNr">571 </span>  68/push  0x36353433/imm32
 <span id="L572" class="LineNr">572 </span>  b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L573" class="LineNr">573 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L574" class="LineNr">574 </span>    <span class="Comment"># call</span>
+<span id="L573" class="LineNr">573 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L574" class="LineNr">574 </span>    <span class="subxComment"># call</span>
 <span id="L575" class="LineNr">575 </span>  e8/call  check-ints-equal/disp32
-<span id="L576" class="LineNr">576 </span>    <span class="Comment"># discard args</span>
-<span id="L577" class="LineNr">577 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L578" class="LineNr">578 </span>  <span class="Comment"># reclaim locals</span>
-<span id="L579" class="LineNr">579 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L576" class="LineNr">576 </span>    <span class="subxComment"># discard args</span>
+<span id="L577" class="LineNr">577 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L578" class="LineNr">578 </span>  <span class="subxComment"># reclaim locals</span>
+<span id="L579" class="LineNr">579 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L580" class="LineNr">580 </span>  5d/pop-to-EBP
 <span id="L581" class="LineNr">581 </span>  c3/return
 <span id="L582" class="LineNr">582 </span>
 <span id="L583" class="LineNr">583 </span>test-get-num-reads-multiple-digits-followed-by-nondigit:
-<span id="L584" class="LineNr">584 </span>  <span class="SalientComment">## check that get-num returns all initial digits until it encounters a non-digit</span>
-<span id="L585" class="LineNr">585 </span>  <span class="Comment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
+<span id="L584" class="LineNr">584 </span>  <span class="subxComment">## check that get-num returns all initial digits until it encounters a non-digit</span>
+<span id="L585" class="LineNr">585 </span>  <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L586" class="LineNr">586 </span>  55/push-EBP
-<span id="L587" class="LineNr">587 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L588" class="LineNr">588 </span>  <span class="SalientComment">## clear all streams</span>
-<span id="L589" class="LineNr">589 </span>  <span class="Comment"># clear-stream(_test-stream)</span>
-<span id="L590" class="LineNr">590 </span>    <span class="Comment"># push args</span>
+<span id="L587" class="LineNr">587 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L588" class="LineNr">588 </span>  <span class="subxComment">## clear all streams</span>
+<span id="L589" class="LineNr">589 </span>  <span class="subxComment"># clear-stream(_test-stream)</span>
+<span id="L590" class="LineNr">590 </span>    <span class="subxComment"># push args</span>
 <span id="L591" class="LineNr">591 </span>  68/push  _test-stream/imm32
-<span id="L592" class="LineNr">592 </span>    <span class="Comment"># call</span>
+<span id="L592" class="LineNr">592 </span>    <span class="subxComment"># call</span>
 <span id="L593" class="LineNr">593 </span>  e8/call  clear-stream/disp32
-<span id="L594" class="LineNr">594 </span>    <span class="Comment"># discard args</span>
-<span id="L595" class="LineNr">595 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L596" class="LineNr">596 </span>  <span class="Comment"># clear-stream(_test-buffered-file+4)</span>
-<span id="L597" class="LineNr">597 </span>    <span class="Comment"># push args</span>
+<span id="L594" class="LineNr">594 </span>    <span class="subxComment"># discard args</span>
+<span id="L595" class="LineNr">595 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L596" class="LineNr">596 </span>  <span class="subxComment"># clear-stream(_test-buffered-file+4)</span>
+<span id="L597" class="LineNr">597 </span>    <span class="subxComment"># push args</span>
 <span id="L598" class="LineNr">598 </span>  b8/copy-to-EAX  _test-buffered-file/imm32
 <span id="L599" class="LineNr">599 </span>  05/add-to-EAX  4/imm32
 <span id="L600" class="LineNr">600 </span>  50/push-EAX
-<span id="L601" class="LineNr">601 </span>    <span class="Comment"># call</span>
+<span id="L601" class="LineNr">601 </span>    <span class="subxComment"># call</span>
 <span id="L602" class="LineNr">602 </span>  e8/call  clear-stream/disp32
-<span id="L603" class="LineNr">603 </span>    <span class="Comment"># discard args</span>
-<span id="L604" class="LineNr">604 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L605" class="LineNr">605 </span>  <span class="Comment"># clear-stream(_test-output-stream)</span>
-<span id="L606" class="LineNr">606 </span>    <span class="Comment"># push args</span>
+<span id="L603" class="LineNr">603 </span>    <span class="subxComment"># discard args</span>
+<span id="L604" class="LineNr">604 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L605" class="LineNr">605 </span>  <span class="subxComment"># clear-stream(_test-output-stream)</span>
+<span id="L606" class="LineNr">606 </span>    <span class="subxComment"># push args</span>
 <span id="L607" class="LineNr">607 </span>  68/push  _test-output-stream/imm32
-<span id="L608" class="LineNr">608 </span>    <span class="Comment"># call</span>
+<span id="L608" class="LineNr">608 </span>    <span class="subxComment"># call</span>
 <span id="L609" class="LineNr">609 </span>  e8/call  clear-stream/disp32
-<span id="L610" class="LineNr">610 </span>    <span class="Comment"># discard args</span>
-<span id="L611" class="LineNr">611 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L612" class="LineNr">612 </span>  <span class="Comment"># clear-stream(_test-error-stream)</span>
-<span id="L613" class="LineNr">613 </span>    <span class="Comment"># push args</span>
+<span id="L610" class="LineNr">610 </span>    <span class="subxComment"># discard args</span>
+<span id="L611" class="LineNr">611 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L612" class="LineNr">612 </span>  <span class="subxComment"># clear-stream(_test-error-stream)</span>
+<span id="L613" class="LineNr">613 </span>    <span class="subxComment"># push args</span>
 <span id="L614" class="LineNr">614 </span>  68/push  _test-error-stream/imm32
-<span id="L615" class="LineNr">615 </span>    <span class="Comment"># call</span>
+<span id="L615" class="LineNr">615 </span>    <span class="subxComment"># call</span>
 <span id="L616" class="LineNr">616 </span>  e8/call  clear-stream/disp32
-<span id="L617" class="LineNr">617 </span>    <span class="Comment"># discard args</span>
-<span id="L618" class="LineNr">618 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L619" class="LineNr">619 </span>  <span class="SalientComment">## initialize 'in'</span>
-<span id="L620" class="LineNr">620 </span>  <span class="Comment"># write(_test-stream, &quot;3456 x&quot;)</span>
-<span id="L621" class="LineNr">621 </span>    <span class="Comment"># push args</span>
+<span id="L617" class="LineNr">617 </span>    <span class="subxComment"># discard args</span>
+<span id="L618" class="LineNr">618 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L619" class="LineNr">619 </span>  <span class="subxComment">## initialize 'in'</span>
+<span id="L620" class="LineNr">620 </span>  <span class="subxComment"># write(_test-stream, &quot;3456 x&quot;)</span>
+<span id="L621" class="LineNr">621 </span>    <span class="subxComment"># push args</span>
 <span id="L622" class="LineNr">622 </span>  68/push  <span class="Constant">&quot;3456 x&quot;</span>/imm32
 <span id="L623" class="LineNr">623 </span>  68/push  _test-stream/imm32
-<span id="L624" class="LineNr">624 </span>    <span class="Comment"># call</span>
+<span id="L624" class="LineNr">624 </span>    <span class="subxComment"># call</span>
 <span id="L625" class="LineNr">625 </span>  e8/call  write/disp32
-<span id="L626" class="LineNr">626 </span>    <span class="Comment"># discard args</span>
-<span id="L627" class="LineNr">627 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L628" class="LineNr">628 </span>  <span class="SalientComment">## initialize exit-descriptor 'ed'</span>
-<span id="L629" class="LineNr">629 </span>  <span class="Comment"># allocate on stack</span>
-<span id="L630" class="LineNr">630 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L631" class="LineNr">631 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
-<span id="L632" class="LineNr">632 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
-<span id="L633" class="LineNr">633 </span>  <span class="Comment"># size the exit-descriptor for the call to get-num below</span>
-<span id="L634" class="LineNr">634 </span>  <span class="Comment"># tailor-exit-descriptor(ed, 16)</span>
-<span id="L635" class="LineNr">635 </span>    <span class="Comment"># push args</span>
+<span id="L626" class="LineNr">626 </span>    <span class="subxComment"># discard args</span>
+<span id="L627" class="LineNr">627 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L628" class="LineNr">628 </span>  <span class="subxComment">## initialize exit-descriptor 'ed'</span>
+<span id="L629" class="LineNr">629 </span>  <span class="subxComment"># allocate on stack</span>
+<span id="L630" class="LineNr">630 </span>  <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L631" class="LineNr">631 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L632" class="LineNr">632 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L633" class="LineNr">633 </span>  <span class="subxComment"># size the exit-descriptor for the call to get-num below</span>
+<span id="L634" class="LineNr">634 </span>  <span class="subxComment"># tailor-exit-descriptor(ed, 16)</span>
+<span id="L635" class="LineNr">635 </span>    <span class="subxComment"># push args</span>
 <span id="L636" class="LineNr">636 </span>  68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L637" class="LineNr">637 </span>  50/push-EAX/ed
-<span id="L638" class="LineNr">638 </span>    <span class="Comment"># call</span>
+<span id="L638" class="LineNr">638 </span>    <span class="subxComment"># call</span>
 <span id="L639" class="LineNr">639 </span>  e8/call  tailor-exit-descriptor/disp32
-<span id="L640" class="LineNr">640 </span>    <span class="Comment"># discard args</span>
-<span id="L641" class="LineNr">641 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L642" class="LineNr">642 </span>  <span class="SalientComment">## prime the pump</span>
-<span id="L643" class="LineNr">643 </span>  <span class="Comment"># get-char(_test-buffered-file)</span>
-<span id="L644" class="LineNr">644 </span>    <span class="Comment"># push args</span>
+<span id="L640" class="LineNr">640 </span>    <span class="subxComment"># discard args</span>
+<span id="L641" class="LineNr">641 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L642" class="LineNr">642 </span>  <span class="subxComment">## prime the pump</span>
+<span id="L643" class="LineNr">643 </span>  <span class="subxComment"># get-char(_test-buffered-file)</span>
+<span id="L644" class="LineNr">644 </span>    <span class="subxComment"># push args</span>
 <span id="L645" class="LineNr">645 </span>  68/push  _test-buffered-file/imm32
-<span id="L646" class="LineNr">646 </span>    <span class="Comment"># call</span>
+<span id="L646" class="LineNr">646 </span>    <span class="subxComment"># call</span>
 <span id="L647" class="LineNr">647 </span>  e8/call  get-char/disp32
-<span id="L648" class="LineNr">648 </span>    <span class="Comment"># discard args</span>
-<span id="L649" class="LineNr">649 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L650" class="LineNr">650 </span>  <span class="SalientComment">## get-num(in, out, err, ed)</span>
-<span id="L651" class="LineNr">651 </span>    <span class="Comment"># push args</span>
+<span id="L648" class="LineNr">648 </span>    <span class="subxComment"># discard args</span>
+<span id="L649" class="LineNr">649 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L650" class="LineNr">650 </span>  <span class="subxComment">## get-num(in, out, err, ed)</span>
+<span id="L651" class="LineNr">651 </span>    <span class="subxComment"># push args</span>
 <span id="L652" class="LineNr">652 </span>  50/push-EAX/ed
 <span id="L653" class="LineNr">653 </span>  68/push  _test-error-stream/imm32
 <span id="L654" class="LineNr">654 </span>  68/push  _test-output-stream/imm32
 <span id="L655" class="LineNr">655 </span>  68/push  _test-buffered-file/imm32
-<span id="L656" class="LineNr">656 </span>    <span class="Comment"># call</span>
+<span id="L656" class="LineNr">656 </span>    <span class="subxComment"># call</span>
 <span id="L657" class="LineNr">657 </span>  e8/call  get-num/disp32
-<span id="L658" class="LineNr">658 </span>  <span class="SalientComment">## registers except ESP may be clobbered at this point</span>
-<span id="L659" class="LineNr">659 </span>    <span class="Comment"># discard args</span>
-<span id="L660" class="LineNr">660 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x10/imm32        <span class="Comment"># add to ESP</span>
-<span id="L661" class="LineNr">661 </span>  <span class="Comment"># check-ints-equal(*_test-output-stream.data, '3456')</span>
-<span id="L662" class="LineNr">662 </span>    <span class="Comment"># push args</span>
+<span id="L658" class="LineNr">658 </span>  <span class="subxComment">## registers except ESP may be clobbered at this point</span>
+<span id="L659" class="LineNr">659 </span>    <span class="subxComment"># discard args</span>
+<span id="L660" class="LineNr">660 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L661" class="LineNr">661 </span>  <span class="subxComment"># check-ints-equal(*_test-output-stream.data, '3456')</span>
+<span id="L662" class="LineNr">662 </span>    <span class="subxComment"># push args</span>
 <span id="L663" class="LineNr">663 </span>  68/push  <span class="Constant">&quot;F - test-get-num-reads-multiple-digits-followed-by-nondigit&quot;</span>/imm32
 <span id="L664" class="LineNr">664 </span>  68/push  0x36353433/imm32
 <span id="L665" class="LineNr">665 </span>  b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L666" class="LineNr">666 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EAX+12)</span>
-<span id="L667" class="LineNr">667 </span>    <span class="Comment"># call</span>
+<span id="L666" class="LineNr">666 </span>  ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L667" class="LineNr">667 </span>    <span class="subxComment"># call</span>
 <span id="L668" class="LineNr">668 </span>  e8/call  check-ints-equal/disp32
-<span id="L669" class="LineNr">669 </span>    <span class="Comment"># discard args</span>
-<span id="L670" class="LineNr">670 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L671" class="LineNr">671 </span>  <span class="Comment"># reclaim locals</span>
-<span id="L672" class="LineNr">672 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L669" class="LineNr">669 </span>    <span class="subxComment"># discard args</span>
+<span id="L670" class="LineNr">670 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L671" class="LineNr">671 </span>  <span class="subxComment"># reclaim locals</span>
+<span id="L672" class="LineNr">672 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L673" class="LineNr">673 </span>  5d/pop-to-EBP
 <span id="L674" class="LineNr">674 </span>  c3/return
 <span id="L675" class="LineNr">675 </span>
-<span id="L676" class="LineNr">676 </span><span class="SalientComment">## helpers</span>
+<span id="L676" class="LineNr">676 </span><span class="subxComment">## helpers</span>
 <span id="L677" class="LineNr">677 </span>
-<span id="L678" class="LineNr">678 </span><span class="Comment"># write(f, &quot;Error: &quot;+s+&quot; expected\n&quot;) then stop(ed, 1)</span>
-<span id="L679" class="LineNr">679 </span>expected:  <span class="Comment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L680" class="LineNr">680 </span>  <span class="Comment"># prolog</span>
+<span id="L678" class="LineNr">678 </span><span class="subxComment"># write(f, &quot;Error: &quot;+s+&quot; expected\n&quot;) then stop(ed, 1)</span>
+<span id="L679" class="LineNr">679 </span>expected:  <span class="subxComment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L680" class="LineNr">680 </span>  <span class="subxComment"># prolog</span>
 <span id="L681" class="LineNr">681 </span>  55/push-EBP
-<span id="L682" class="LineNr">682 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L683" class="LineNr">683 </span>  <span class="Comment"># write(f, &quot;Error: &quot;)</span>
-<span id="L684" class="LineNr">684 </span>    <span class="Comment"># push args</span>
+<span id="L682" class="LineNr">682 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L683" class="LineNr">683 </span>  <span class="subxComment"># write(f, &quot;Error: &quot;)</span>
+<span id="L684" class="LineNr">684 </span>    <span class="subxComment"># push args</span>
 <span id="L685" class="LineNr">685 </span>  68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L686" class="LineNr">686 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L687" class="LineNr">687 </span>    <span class="Comment"># call</span>
+<span id="L686" class="LineNr">686 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L687" class="LineNr">687 </span>    <span class="subxComment"># call</span>
 <span id="L688" class="LineNr">688 </span>  e8/call  write/disp32
-<span id="L689" class="LineNr">689 </span>    <span class="Comment"># discard args</span>
-<span id="L690" class="LineNr">690 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L691" class="LineNr">691 </span>  <span class="Comment"># write(f, s)</span>
-<span id="L692" class="LineNr">692 </span>    <span class="Comment"># push args</span>
-<span id="L693" class="LineNr">693 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L694" class="LineNr">694 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L695" class="LineNr">695 </span>    <span class="Comment"># call</span>
+<span id="L689" class="LineNr">689 </span>    <span class="subxComment"># discard args</span>
+<span id="L690" class="LineNr">690 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L691" class="LineNr">691 </span>  <span class="subxComment"># write(f, s)</span>
+<span id="L692" class="LineNr">692 </span>    <span class="subxComment"># push args</span>
+<span id="L693" class="LineNr">693 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L694" class="LineNr">694 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L695" class="LineNr">695 </span>    <span class="subxComment"># call</span>
 <span id="L696" class="LineNr">696 </span>  e8/call  write/disp32
-<span id="L697" class="LineNr">697 </span>    <span class="Comment"># discard args</span>
-<span id="L698" class="LineNr">698 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L699" class="LineNr">699 </span>  <span class="Comment"># write(f, &quot; expected&quot;)</span>
-<span id="L700" class="LineNr">700 </span>    <span class="Comment"># push args</span>
+<span id="L697" class="LineNr">697 </span>    <span class="subxComment"># discard args</span>
+<span id="L698" class="LineNr">698 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L699" class="LineNr">699 </span>  <span class="subxComment"># write(f, &quot; expected&quot;)</span>
+<span id="L700" class="LineNr">700 </span>    <span class="subxComment"># push args</span>
 <span id="L701" class="LineNr">701 </span>  68/push  <span class="Constant">&quot; expected&quot;</span>/imm32
-<span id="L702" class="LineNr">702 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L703" class="LineNr">703 </span>    <span class="Comment"># call</span>
+<span id="L702" class="LineNr">702 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L703" class="LineNr">703 </span>    <span class="subxComment"># call</span>
 <span id="L704" class="LineNr">704 </span>  e8/call  write/disp32
-<span id="L705" class="LineNr">705 </span>    <span class="Comment"># discard args</span>
-<span id="L706" class="LineNr">706 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L707" class="LineNr">707 </span>  <span class="Comment"># write(f, Newline)</span>
-<span id="L708" class="LineNr">708 </span>    <span class="Comment"># push args</span>
+<span id="L705" class="LineNr">705 </span>    <span class="subxComment"># discard args</span>
+<span id="L706" class="LineNr">706 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L707" class="LineNr">707 </span>  <span class="subxComment"># write(f, Newline)</span>
+<span id="L708" class="LineNr">708 </span>    <span class="subxComment"># push args</span>
 <span id="L709" class="LineNr">709 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L710" class="LineNr">710 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L711" class="LineNr">711 </span>    <span class="Comment"># call</span>
+<span id="L710" class="LineNr">710 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L711" class="LineNr">711 </span>    <span class="subxComment"># call</span>
 <span id="L712" class="LineNr">712 </span>  e8/call  write/disp32
-<span id="L713" class="LineNr">713 </span>    <span class="Comment"># discard args</span>
-<span id="L714" class="LineNr">714 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L715" class="LineNr">715 </span>  <span class="Comment"># stop(ed, 1)</span>
-<span id="L716" class="LineNr">716 </span>    <span class="Comment"># push args</span>
+<span id="L713" class="LineNr">713 </span>    <span class="subxComment"># discard args</span>
+<span id="L714" class="LineNr">714 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L715" class="LineNr">715 </span>  <span class="subxComment"># stop(ed, 1)</span>
+<span id="L716" class="LineNr">716 </span>    <span class="subxComment"># push args</span>
 <span id="L717" class="LineNr">717 </span>  68/push  1/imm32
-<span id="L718" class="LineNr">718 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L719" class="LineNr">719 </span>    <span class="Comment"># call</span>
+<span id="L718" class="LineNr">718 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L719" class="LineNr">719 </span>    <span class="subxComment"># call</span>
 <span id="L720" class="LineNr">720 </span>  e8/call  stop/disp32
-<span id="L721" class="LineNr">721 </span>  <span class="SalientComment">## should never get past this point</span>
-<span id="L722" class="LineNr">722 </span>  <span class="Comment"># epilog</span>
-<span id="L723" class="LineNr">723 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L721" class="LineNr">721 </span>  <span class="subxComment">## should never get past this point</span>
+<span id="L722" class="LineNr">722 </span>  <span class="subxComment"># epilog</span>
+<span id="L723" class="LineNr">723 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L724" class="LineNr">724 </span>  5d/pop-to-EBP
 <span id="L725" class="LineNr">725 </span>  c3/return
 <span id="L726" class="LineNr">726 </span>
-<span id="L727" class="LineNr">727 </span><span class="Comment"># write(f, &quot;Error: &quot;+s+&quot;\n&quot;) then stop(ed, 1)</span>
-<span id="L728" class="LineNr">728 </span>error:  <span class="Comment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L729" class="LineNr">729 </span>  <span class="Comment"># prolog</span>
+<span id="L727" class="LineNr">727 </span><span class="subxComment"># write(f, &quot;Error: &quot;+s+&quot;\n&quot;) then stop(ed, 1)</span>
+<span id="L728" class="LineNr">728 </span>error:  <span class="subxComment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L729" class="LineNr">729 </span>  <span class="subxComment"># prolog</span>
 <span id="L730" class="LineNr">730 </span>  55/push-EBP
-<span id="L731" class="LineNr">731 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L732" class="LineNr">732 </span>  <span class="Comment"># write(f, &quot;Error: &quot;)</span>
-<span id="L733" class="LineNr">733 </span>    <span class="Comment"># push args</span>
+<span id="L731" class="LineNr">731 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L732" class="LineNr">732 </span>  <span class="subxComment"># write(f, &quot;Error: &quot;)</span>
+<span id="L733" class="LineNr">733 </span>    <span class="subxComment"># push args</span>
 <span id="L734" class="LineNr">734 </span>  68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L735" class="LineNr">735 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L736" class="LineNr">736 </span>    <span class="Comment"># call</span>
+<span id="L735" class="LineNr">735 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L736" class="LineNr">736 </span>    <span class="subxComment"># call</span>
 <span id="L737" class="LineNr">737 </span>  e8/call  write/disp32
-<span id="L738" class="LineNr">738 </span>    <span class="Comment"># discard args</span>
-<span id="L739" class="LineNr">739 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L740" class="LineNr">740 </span>  <span class="Comment"># write(f, s)</span>
-<span id="L741" class="LineNr">741 </span>    <span class="Comment"># push args</span>
-<span id="L742" class="LineNr">742 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
-<span id="L743" class="LineNr">743 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L744" class="LineNr">744 </span>    <span class="Comment"># call</span>
+<span id="L738" class="LineNr">738 </span>    <span class="subxComment"># discard args</span>
+<span id="L739" class="LineNr">739 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L740" class="LineNr">740 </span>  <span class="subxComment"># write(f, s)</span>
+<span id="L741" class="LineNr">741 </span>    <span class="subxComment"># push args</span>
+<span id="L742" class="LineNr">742 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L743" class="LineNr">743 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L744" class="LineNr">744 </span>    <span class="subxComment"># call</span>
 <span id="L745" class="LineNr">745 </span>  e8/call  write/disp32
-<span id="L746" class="LineNr">746 </span>    <span class="Comment"># discard args</span>
-<span id="L747" class="LineNr">747 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L748" class="LineNr">748 </span>  <span class="Comment"># write(f, Newline)</span>
-<span id="L749" class="LineNr">749 </span>    <span class="Comment"># push args</span>
+<span id="L746" class="LineNr">746 </span>    <span class="subxComment"># discard args</span>
+<span id="L747" class="LineNr">747 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L748" class="LineNr">748 </span>  <span class="subxComment"># write(f, Newline)</span>
+<span id="L749" class="LineNr">749 </span>    <span class="subxComment"># push args</span>
 <span id="L750" class="LineNr">750 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L751" class="LineNr">751 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L752" class="LineNr">752 </span>    <span class="Comment"># call</span>
+<span id="L751" class="LineNr">751 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L752" class="LineNr">752 </span>    <span class="subxComment"># call</span>
 <span id="L753" class="LineNr">753 </span>  e8/call  write/disp32
-<span id="L754" class="LineNr">754 </span>    <span class="Comment"># discard args</span>
-<span id="L755" class="LineNr">755 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L756" class="LineNr">756 </span>  <span class="Comment"># stop(ed, 1)</span>
-<span id="L757" class="LineNr">757 </span>    <span class="Comment"># push args</span>
+<span id="L754" class="LineNr">754 </span>    <span class="subxComment"># discard args</span>
+<span id="L755" class="LineNr">755 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L756" class="LineNr">756 </span>  <span class="subxComment"># stop(ed, 1)</span>
+<span id="L757" class="LineNr">757 </span>    <span class="subxComment"># push args</span>
 <span id="L758" class="LineNr">758 </span>  68/push  1/imm32
-<span id="L759" class="LineNr">759 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L760" class="LineNr">760 </span>    <span class="Comment"># call</span>
+<span id="L759" class="LineNr">759 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L760" class="LineNr">760 </span>    <span class="subxComment"># call</span>
 <span id="L761" class="LineNr">761 </span>  e8/call  stop/disp32
-<span id="L762" class="LineNr">762 </span>  <span class="SalientComment">## should never get past this point</span>
-<span id="L763" class="LineNr">763 </span>  <span class="Comment"># epilog</span>
-<span id="L764" class="LineNr">764 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L762" class="LineNr">762 </span>  <span class="subxComment">## should never get past this point</span>
+<span id="L763" class="LineNr">763 </span>  <span class="subxComment"># epilog</span>
+<span id="L764" class="LineNr">764 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L765" class="LineNr">765 </span>  5d/pop-to-EBP
 <span id="L766" class="LineNr">766 </span>  c3/return
 <span id="L767" class="LineNr">767 </span>
-<span id="L768" class="LineNr">768 </span><span class="Comment"># read a byte from 'f', and store it in 'Look'</span>
-<span id="L769" class="LineNr">769 </span>get-char:  <span class="Comment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
-<span id="L770" class="LineNr">770 </span>  <span class="Comment"># prolog</span>
+<span id="L768" class="LineNr">768 </span><span class="subxComment"># read a byte from 'f', and store it in 'Look'</span>
+<span id="L769" class="LineNr">769 </span>get-char:  <span class="subxComment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L770" class="LineNr">770 </span>  <span class="subxComment"># prolog</span>
 <span id="L771" class="LineNr">771 </span>  55/push-EBP
-<span id="L772" class="LineNr">772 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L773" class="LineNr">773 </span>  <span class="Comment"># save registers</span>
+<span id="L772" class="LineNr">772 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L773" class="LineNr">773 </span>  <span class="subxComment"># save registers</span>
 <span id="L774" class="LineNr">774 </span>  50/push-EAX
-<span id="L775" class="LineNr">775 </span>  <span class="Comment"># read-byte(f)</span>
-<span id="L776" class="LineNr">776 </span>    <span class="Comment"># push args</span>
-<span id="L777" class="LineNr">777 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L778" class="LineNr">778 </span>    <span class="Comment"># call</span>
+<span id="L775" class="LineNr">775 </span>  <span class="subxComment"># read-byte(f)</span>
+<span id="L776" class="LineNr">776 </span>    <span class="subxComment"># push args</span>
+<span id="L777" class="LineNr">777 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L778" class="LineNr">778 </span>    <span class="subxComment"># call</span>
 <span id="L779" class="LineNr">779 </span>  e8/call  read-byte/disp32
-<span id="L780" class="LineNr">780 </span>    <span class="Comment"># discard args</span>
-<span id="L781" class="LineNr">781 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L782" class="LineNr">782 </span>  <span class="Comment"># save EAX to Look</span>
-<span id="L783" class="LineNr">783 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to *Look</span>
-<span id="L784" class="LineNr">784 </span>  <span class="Comment"># restore registers</span>
+<span id="L780" class="LineNr">780 </span>    <span class="subxComment"># discard args</span>
+<span id="L781" class="LineNr">781 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L782" class="LineNr">782 </span>  <span class="subxComment"># save EAX to Look</span>
+<span id="L783" class="LineNr">783 </span>  89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="Special">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *Look</span>
+<span id="L784" class="LineNr">784 </span>  <span class="subxComment"># restore registers</span>
 <span id="L785" class="LineNr">785 </span>  58/pop-to-EAX
-<span id="L786" class="LineNr">786 </span>  <span class="Comment"># epilog</span>
-<span id="L787" class="LineNr">787 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L786" class="LineNr">786 </span>  <span class="subxComment"># epilog</span>
+<span id="L787" class="LineNr">787 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L788" class="LineNr">788 </span>  5d/pop-to-EBP
 <span id="L789" class="LineNr">789 </span>  c3/return
 <span id="L790" class="LineNr">790 </span>
-<span id="L791" class="LineNr">791 </span>is-digit?:  <span class="Comment"># c : int -&gt; bool/EAX</span>
-<span id="L792" class="LineNr">792 </span>  <span class="Comment"># prolog</span>
+<span id="L791" class="LineNr">791 </span>is-digit?:  <span class="subxComment"># c : int -&gt; bool/EAX</span>
+<span id="L792" class="LineNr">792 </span>  <span class="subxComment"># prolog</span>
 <span id="L793" class="LineNr">793 </span>  55/push-EBP
-<span id="L794" class="LineNr">794 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L795" class="LineNr">795 </span>  <span class="Comment"># EAX = false</span>
+<span id="L794" class="LineNr">794 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L795" class="LineNr">795 </span>  <span class="subxComment"># EAX = false</span>
 <span id="L796" class="LineNr">796 </span>  b8/copy-to-EAX  0/imm32
-<span id="L797" class="LineNr">797 </span>  <span class="Comment"># if c &lt; '0' return false</span>
-<span id="L798" class="LineNr">798 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8       0x30/imm32        <span class="Comment"># compare *(EBP+8)</span>
+<span id="L797" class="LineNr">797 </span>  <span class="subxComment"># if c &lt; '0' return false</span>
+<span id="L798" class="LineNr">798 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8       0x30/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L799" class="LineNr">799 </span>  7c/jump-if-lesser  $is-digit?:end/disp8
-<span id="L800" class="LineNr">800 </span>  <span class="Comment"># if c &gt; '9' return false</span>
-<span id="L801" class="LineNr">801 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8       0x39/imm32        <span class="Comment"># compare *(EBP+8)</span>
+<span id="L800" class="LineNr">800 </span>  <span class="subxComment"># if c &gt; '9' return false</span>
+<span id="L801" class="LineNr">801 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8       0x39/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L802" class="LineNr">802 </span>  7f/jump-if-greater  $is-digit?:end/disp8
-<span id="L803" class="LineNr">803 </span>  <span class="Comment"># otherwise return true</span>
+<span id="L803" class="LineNr">803 </span>  <span class="subxComment"># otherwise return true</span>
 <span id="L804" class="LineNr">804 </span>  b8/copy-to-EAX  1/imm32
 <span id="L805" class="LineNr">805 </span>$is-digit?:end:
-<span id="L806" class="LineNr">806 </span>  <span class="Comment"># epilog</span>
-<span id="L807" class="LineNr">807 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L806" class="LineNr">806 </span>  <span class="subxComment"># epilog</span>
+<span id="L807" class="LineNr">807 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L808" class="LineNr">808 </span>  5d/pop-to-EBP
 <span id="L809" class="LineNr">809 </span>  c3/return
 <span id="L810" class="LineNr">810 </span>
@@ -873,26 +870,26 @@ if ('onhashchange' in window) {
 <span id="L814" class="LineNr">814 </span>  00 00 00 00
 <span id="L815" class="LineNr">815 </span>
 <span id="L816" class="LineNr">816 </span>_test-output-stream:
-<span id="L817" class="LineNr">817 </span>  <span class="Comment"># current write index</span>
+<span id="L817" class="LineNr">817 </span>  <span class="subxComment"># current write index</span>
 <span id="L818" class="LineNr">818 </span>  00 00 00 00
-<span id="L819" class="LineNr">819 </span>  <span class="Comment"># current read index</span>
+<span id="L819" class="LineNr">819 </span>  <span class="subxComment"># current read index</span>
 <span id="L820" class="LineNr">820 </span>  00 00 00 00
-<span id="L821" class="LineNr">821 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L821" class="LineNr">821 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L822" class="LineNr">822 </span>  08 00 00 00
-<span id="L823" class="LineNr">823 </span>  <span class="Comment"># data</span>
-<span id="L824" class="LineNr">824 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L823" class="LineNr">823 </span>  <span class="subxComment"># data</span>
+<span id="L824" class="LineNr">824 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L825" class="LineNr">825 </span>
 <span id="L826" class="LineNr">826 </span>_test-error-stream:
-<span id="L827" class="LineNr">827 </span>  <span class="Comment"># current write index</span>
+<span id="L827" class="LineNr">827 </span>  <span class="subxComment"># current write index</span>
 <span id="L828" class="LineNr">828 </span>  00 00 00 00
-<span id="L829" class="LineNr">829 </span>  <span class="Comment"># current read index</span>
+<span id="L829" class="LineNr">829 </span>  <span class="subxComment"># current read index</span>
 <span id="L830" class="LineNr">830 </span>  00 00 00 00
-<span id="L831" class="LineNr">831 </span>  <span class="Comment"># length (= 8)</span>
+<span id="L831" class="LineNr">831 </span>  <span class="subxComment"># length (= 8)</span>
 <span id="L832" class="LineNr">832 </span>  08 00 00 00
-<span id="L833" class="LineNr">833 </span>  <span class="Comment"># data</span>
-<span id="L834" class="LineNr">834 </span>  00 00 00 00 00 00 00 00  <span class="Comment"># 8 bytes</span>
+<span id="L833" class="LineNr">833 </span>  <span class="subxComment"># data</span>
+<span id="L834" class="LineNr">834 </span>  00 00 00 00 00 00 00 00  <span class="subxComment"># 8 bytes</span>
 <span id="L835" class="LineNr">835 </span>
-<span id="L836" class="LineNr">836 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L836" class="LineNr">836 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index ea499438..7dd82030 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -56,114 +54,114 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## compute the factorial of 5, and return the result in the exit code</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment">#   $ subx translate apps/factorial.subx -o apps/factorial</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">#   $ subx run apps/factorial</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># Expected result:</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">#   $ echo $?</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">#   120</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment"># You can also run the automated test suite:</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   $ subx run apps/factorial test</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment"># Expected output:</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment">#   ........</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment"># When running tests the exit status doesn't mean anything. Yet.</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment">## compute the factorial of 5, and return the result in the exit code</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment">#   $ subx translate apps/factorial.subx -o apps/factorial</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment">#   $ subx run apps/factorial</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># Expected result:</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#   120</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment"># You can also run the automated test suite:</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   $ subx run apps/factorial test</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment"># Expected output:</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment">#   ........</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># When running tests the exit status doesn't mean anything. Yet.</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span>== code
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment"># main:</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Comment"># prolog</span>
-<span id="L24" class="LineNr"> 24 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># if (argc &gt; 1)</span>
-<span id="L26" class="LineNr"> 26 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0/disp8         1/imm32           <span class="Comment"># compare *EBP</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="subxComment"># prolog</span>
+<span id="L24" class="LineNr"> 24 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="subxComment"># if (argc &gt; 1)</span>
+<span id="L26" class="LineNr"> 26 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L27" class="LineNr"> 27 </span>  7e/jump-if-lesser-or-equal  $run-main/disp8
-<span id="L28" class="LineNr"> 28 </span>  <span class="Comment"># and if (argv[1] == &quot;test&quot;)</span>
-<span id="L29" class="LineNr"> 29 </span>    <span class="Comment"># push args</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="subxComment"># and if (argv[1] == &quot;test&quot;)</span>
+<span id="L29" class="LineNr"> 29 </span>    <span class="subxComment"># push args</span>
 <span id="L30" class="LineNr"> 30 </span>  68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L31" class="LineNr"> 31 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="Comment"># call</span>
+<span id="L31" class="LineNr"> 31 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># call</span>
 <span id="L33" class="LineNr"> 33 </span>  e8/call  kernel-string-equal/disp32
-<span id="L34" class="LineNr"> 34 </span>    <span class="Comment"># discard args</span>
-<span id="L35" class="LineNr"> 35 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L36" class="LineNr"> 36 </span>    <span class="Comment"># check result</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment"># discard args</span>
+<span id="L35" class="LineNr"> 35 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L36" class="LineNr"> 36 </span>    <span class="subxComment"># check result</span>
 <span id="L37" class="LineNr"> 37 </span>  3d/compare-EAX  1/imm32
 <span id="L38" class="LineNr"> 38 </span>  75/jump-if-not-equal  $run-main/disp8
-<span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># then return run-tests()</span>
+<span id="L39" class="LineNr"> 39 </span>  <span class="subxComment"># then return run-tests()</span>
 <span id="L40" class="LineNr"> 40 </span>  e8/call  run-tests/disp32
-<span id="L41" class="LineNr"> 41 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   <span class="Special">Num-test-failures</span>/disp32          <span class="Comment"># copy *Num-test-failures to EAX</span>
-<span id="L42" class="LineNr"> 42 </span>  eb/jump  $main:end/disp8  <span class="Comment"># where EAX will get copied to EBX</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Comment"># else EAX = factorial(5)</span>
+<span id="L41" class="LineNr"> 41 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="Special">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EAX</span>
+<span id="L42" class="LineNr"> 42 </span>  eb/jump  $main:end/disp8  <span class="subxComment"># where EAX will get copied to EBX</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="subxComment"># else EAX = factorial(5)</span>
 <span id="L44" class="LineNr"> 44 </span>$run-main:
-<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># push args</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># push args</span>
 <span id="L46" class="LineNr"> 46 </span>  68/push  5/imm32
-<span id="L47" class="LineNr"> 47 </span>    <span class="Comment"># call</span>
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># call</span>
 <span id="L48" class="LineNr"> 48 </span>  e8/call  factorial/disp32
-<span id="L49" class="LineNr"> 49 </span>    <span class="Comment"># discard args</span>
-<span id="L50" class="LineNr"> 50 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L49" class="LineNr"> 49 </span>    <span class="subxComment"># discard args</span>
+<span id="L50" class="LineNr"> 50 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L51" class="LineNr"> 51 </span>$main:end:
-<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L53" class="LineNr"> 53 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="subxComment"># exit(EAX)</span>
+<span id="L53" class="LineNr"> 53 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L54" class="LineNr"> 54 </span>  b8/copy-to-EAX  1/imm32
 <span id="L55" class="LineNr"> 55 </span>  cd/syscall  0x80/imm8
 <span id="L56" class="LineNr"> 56 </span>
-<span id="L57" class="LineNr"> 57 </span><span class="Comment"># factorial(n)</span>
+<span id="L57" class="LineNr"> 57 </span><span class="subxComment"># factorial(n)</span>
 <span id="L58" class="LineNr"> 58 </span>factorial:
-<span id="L59" class="LineNr"> 59 </span>  <span class="Comment"># prolog</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="subxComment"># prolog</span>
 <span id="L60" class="LineNr"> 60 </span>  55/push-EBP
-<span id="L61" class="LineNr"> 61 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L61" class="LineNr"> 61 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L62" class="LineNr"> 62 </span>  53/push-EBX
-<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="subxComment"># initialize EAX to 1 (base case)</span>
 <span id="L64" class="LineNr"> 64 </span>  b8/copy-to-EAX  1/imm32
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
-<span id="L66" class="LineNr"> 66 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8         1/imm32           <span class="Comment"># compare *(EBP+8)</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="subxComment"># if (n &lt;= 1) jump exit</span>
+<span id="L66" class="LineNr"> 66 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         1/imm32           <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L67" class="LineNr"> 67 </span>  7e/jump-if-&lt;=  $factorial:end/disp8
-<span id="L68" class="LineNr"> 68 </span>  <span class="Comment"># EBX = n-1</span>
-<span id="L69" class="LineNr"> 69 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
-<span id="L70" class="LineNr"> 70 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract from EBX</span>
-<span id="L71" class="LineNr"> 71 </span>  <span class="Comment"># EAX = factorial(n-1)</span>
-<span id="L72" class="LineNr"> 72 </span>    <span class="Comment"># push args</span>
+<span id="L68" class="LineNr"> 68 </span>  <span class="subxComment"># EBX = n-1</span>
+<span id="L69" class="LineNr"> 69 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L70" class="LineNr"> 70 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              1/imm32           <span class="subxComment"># subtract from EBX</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="subxComment"># EAX = factorial(n-1)</span>
+<span id="L72" class="LineNr"> 72 </span>    <span class="subxComment"># push args</span>
 <span id="L73" class="LineNr"> 73 </span>  53/push-EBX
-<span id="L74" class="LineNr"> 74 </span>    <span class="Comment"># call</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="subxComment"># call</span>
 <span id="L75" class="LineNr"> 75 </span>  e8/call  factorial/disp32
-<span id="L76" class="LineNr"> 76 </span>    <span class="Comment"># discard args</span>
-<span id="L77" class="LineNr"> 77 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L79" class="LineNr"> 79 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(EBP+8) into EAX</span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="subxComment"># discard args</span>
+<span id="L77" class="LineNr"> 77 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="subxComment"># return n * factorial(n-1)</span>
+<span id="L79" class="LineNr"> 79 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># multiply *(EBP+8) into EAX</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="subxComment"># TODO: check for overflow</span>
 <span id="L81" class="LineNr"> 81 </span>$factorial:end:
-<span id="L82" class="LineNr"> 82 </span>  <span class="Comment"># epilog</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="subxComment"># epilog</span>
 <span id="L83" class="LineNr"> 83 </span>  5b/pop-to-EBX
-<span id="L84" class="LineNr"> 84 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L84" class="LineNr"> 84 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L85" class="LineNr"> 85 </span>  5d/pop-to-EBP
 <span id="L86" class="LineNr"> 86 </span>  c3/return
 <span id="L87" class="LineNr"> 87 </span>
 <span id="L88" class="LineNr"> 88 </span>test-factorial:
-<span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># factorial(5)</span>
-<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># push args</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="subxComment"># factorial(5)</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># push args</span>
 <span id="L91" class="LineNr"> 91 </span>  68/push  5/imm32
-<span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># call</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="subxComment"># call</span>
 <span id="L93" class="LineNr"> 93 </span>  e8/call  factorial/disp32
-<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># discard args</span>
-<span id="L95" class="LineNr"> 95 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># check-ints-equal(EAX, 120, failure message)</span>
-<span id="L97" class="LineNr"> 97 </span>    <span class="Comment"># push args</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxComment"># discard args</span>
+<span id="L95" class="LineNr"> 95 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="subxComment"># check-ints-equal(EAX, 120, failure message)</span>
+<span id="L97" class="LineNr"> 97 </span>    <span class="subxComment"># push args</span>
 <span id="L98" class="LineNr"> 98 </span>  68/push  <span class="Constant">&quot;F - test-factorial&quot;</span>/imm32
 <span id="L99" class="LineNr"> 99 </span>  68/push  0x78/imm32/expected-120
 <span id="L100" class="LineNr">100 </span>  50/push-EAX
-<span id="L101" class="LineNr">101 </span>    <span class="Comment"># call</span>
+<span id="L101" class="LineNr">101 </span>    <span class="subxComment"># call</span>
 <span id="L102" class="LineNr">102 </span>  e8/call  check-ints-equal/disp32
-<span id="L103" class="LineNr">103 </span>    <span class="Comment"># discard args</span>
-<span id="L104" class="LineNr">104 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Comment"># end</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxComment"># discard args</span>
+<span id="L104" class="LineNr">104 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L105" class="LineNr">105 </span>  <span class="subxComment"># end</span>
 <span id="L106" class="LineNr">106 </span>  c3/return
 <span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L108" class="LineNr">108 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex1.subx.html b/html/subx/examples/ex1.subx.html
index 3f11f2b5..495dd840 100644
--- a/html/subx/examples/ex1.subx.html
+++ b/html/subx/examples/ex1.subx.html
@@ -15,10 +15,8 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -53,24 +51,24 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## first program: same as <a href="https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html">https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html</a></span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment"># Just return 42.</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx translate examples/ex1.2.subx -o examples/ex1</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ subx run examples/ex1</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected result:</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## first program: same as <a href="https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html">https://www.muppetlabs.com/~breadbox/software/tiny/teensy.html</a></span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment"># Just return 42.</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx translate examples/ex1.2.subx -o examples/ex1</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   $ subx run examples/ex1</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment"># Expected result:</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
 <span id="L11" class="LineNr">11 </span>== code
 <span id="L12" class="LineNr">12 </span>
-<span id="L13" class="LineNr">13 </span>bb/copy-to-EBX  2a/imm32
-<span id="L14" class="LineNr">14 </span><span class="Comment"># exit(EBX)</span>
-<span id="L15" class="LineNr">15 </span>b8/copy-to-EAX  1/imm32
+<span id="L13" class="LineNr">13 </span>bb/copy-to-EBX  2a/imm32  <span class="subxComment"># 42 in hex</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment"># exit(EBX)</span>
+<span id="L15" class="LineNr">15 </span>b8/copy-to-EAX  1/imm32/exit
 <span id="L16" class="LineNr">16 </span>cd/syscall  0x80/imm8
 <span id="L17" class="LineNr">17 </span>
-<span id="L18" class="LineNr">18 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L18" class="LineNr">18 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index ed2d959b..5ab0f2a5 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -15,11 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -54,78 +52,78 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## String comparison: return 1 iff the two args passed in at the commandline are equal.</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex10.subx -o examples/ex10</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex10 abc abd</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   0  # false</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## String comparison: return 1 iff the two args passed in at the commandline are equal.</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex10.subx -o examples/ex10</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex10 abc abd</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   0  # false</span>
 <span id="L9" class="LineNr"> 9 </span>
 <span id="L10" class="LineNr">10 </span>== code
-<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L14" class="LineNr">14 </span>
-<span id="L15" class="LineNr">15 </span><span class="Comment"># main: return argv-equal(argv[1], argv[2])</span>
-<span id="L16" class="LineNr">16 </span><span class="Comment">#       At the start of a SubX program:</span>
-<span id="L17" class="LineNr">17 </span><span class="Comment">#         argc: *ESP</span>
-<span id="L18" class="LineNr">18 </span><span class="Comment">#         argv[0]: *(ESP+4)</span>
-<span id="L19" class="LineNr">19 </span><span class="Comment">#         argv[1]: *(ESP+8)</span>
-<span id="L20" class="LineNr">20 </span><span class="Comment">#         ...</span>
-<span id="L21" class="LineNr">21 </span>  <span class="Comment"># prolog</span>
-<span id="L22" class="LineNr">22 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call argv-equal(argv[1], argv[2])</span>
-<span id="L24" class="LineNr">24 </span>    <span class="Comment"># push argv[2]</span>
-<span id="L25" class="LineNr">25 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L26" class="LineNr">26 </span>    <span class="Comment"># push argv[1]</span>
-<span id="L27" class="LineNr">27 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L28" class="LineNr">28 </span>    <span class="Comment"># call</span>
+<span id="L15" class="LineNr">15 </span><span class="subxComment"># main: return argv-equal(argv[1], argv[2])</span>
+<span id="L16" class="LineNr">16 </span><span class="subxComment">#       At the start of a SubX program:</span>
+<span id="L17" class="LineNr">17 </span><span class="subxComment">#         argc: *ESP</span>
+<span id="L18" class="LineNr">18 </span><span class="subxComment">#         argv[0]: *(ESP+4)</span>
+<span id="L19" class="LineNr">19 </span><span class="subxComment">#         argv[1]: *(ESP+8)</span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment">#         ...</span>
+<span id="L21" class="LineNr">21 </span>  <span class="subxComment"># prolog</span>
+<span id="L22" class="LineNr">22 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L23" class="LineNr">23 </span>  <span class="subxComment"># call argv-equal(argv[1], argv[2])</span>
+<span id="L24" class="LineNr">24 </span>    <span class="subxComment"># push argv[2]</span>
+<span id="L25" class="LineNr">25 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L26" class="LineNr">26 </span>    <span class="subxComment"># push argv[1]</span>
+<span id="L27" class="LineNr">27 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L28" class="LineNr">28 </span>    <span class="subxComment"># call</span>
 <span id="L29" class="LineNr">29 </span>  e8/call argv-equal/disp32
-<span id="L30" class="LineNr">30 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L30" class="LineNr">30 </span>  <span class="subxComment"># exit(EAX)</span>
 <span id="L31" class="LineNr">31 </span>$exit:
-<span id="L32" class="LineNr">32 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L32" class="LineNr">32 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L33" class="LineNr">33 </span>  b8/copy-to-EAX  1/imm32
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
 <span id="L35" class="LineNr">35 </span>
-<span id="L36" class="LineNr">36 </span><span class="Comment"># compare two null-terminated ascii strings</span>
-<span id="L37" class="LineNr">37 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L38" class="LineNr">38 </span>argv-equal:  <span class="Comment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Comment"># initialize s1 (ECX) and s2 (EDX)</span>
-<span id="L40" class="LineNr">40 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
-<span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EDX</span>
-<span id="L42" class="LineNr">42 </span>  <span class="Comment"># while (true)</span>
+<span id="L36" class="LineNr">36 </span><span class="subxComment"># compare two null-terminated ascii strings</span>
+<span id="L37" class="LineNr">37 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
+<span id="L38" class="LineNr">38 </span>argv-equal:  <span class="subxComment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
+<span id="L39" class="LineNr">39 </span>  <span class="subxComment"># initialize s1 (ECX) and s2 (EDX)</span>
+<span id="L40" class="LineNr">40 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to ECX</span>
+<span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to EDX</span>
+<span id="L42" class="LineNr">42 </span>  <span class="subxComment"># while (true)</span>
 <span id="L43" class="LineNr">43 </span>$argv-equal:loop:
-<span id="L44" class="LineNr">44 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s1, *s2</span>
+<span id="L44" class="LineNr">44 </span>    <span class="subxComment"># c1/EAX, c2/EBX = *s1, *s2</span>
 <span id="L45" class="LineNr">45 </span>  b8/copy-to-EAX  0/imm32
-<span id="L46" class="LineNr">46 </span>  8a/copy                         0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ECX to lower byte of EAX</span>
+<span id="L46" class="LineNr">46 </span>  8a/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ECX to lower byte of EAX</span>
 <span id="L47" class="LineNr">47 </span>  bb/copy-to-EBX  0/imm32
-<span id="L48" class="LineNr">48 </span>  8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDX to lower byte of EBX</span>
-<span id="L49" class="LineNr">49 </span>    <span class="Comment"># if (c1 == 0) break</span>
+<span id="L48" class="LineNr">48 </span>  8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of EBX</span>
+<span id="L49" class="LineNr">49 </span>    <span class="subxComment"># if (c1 == 0) break</span>
 <span id="L50" class="LineNr">50 </span>  3d/compare-EAX  0/imm32
 <span id="L51" class="LineNr">51 </span>  74/jump-if-equal  $argv-equal:break/disp8
-<span id="L52" class="LineNr">52 </span>    <span class="Comment"># if (c1 != c2) return false</span>
-<span id="L53" class="LineNr">53 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
+<span id="L52" class="LineNr">52 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
+<span id="L53" class="LineNr">53 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <span id="L54" class="LineNr">54 </span>  75/jump-if-not-equal  $argv-equal:false/disp8
-<span id="L55" class="LineNr">55 </span>    <span class="Comment"># ++s1, ++s2</span>
+<span id="L55" class="LineNr">55 </span>    <span class="subxComment"># ++s1, ++s2</span>
 <span id="L56" class="LineNr">56 </span>  41/inc-ECX
 <span id="L57" class="LineNr">57 </span>  42/inc-EDX
-<span id="L58" class="LineNr">58 </span>  <span class="Comment"># end while</span>
+<span id="L58" class="LineNr">58 </span>  <span class="subxComment"># end while</span>
 <span id="L59" class="LineNr">59 </span>  eb/jump  $argv-equal:loop/disp8
 <span id="L60" class="LineNr">60 </span>$argv-equal:break:
-<span id="L61" class="LineNr">61 </span>  <span class="Comment"># if (c2 == 0) return true</span>
-<span id="L62" class="LineNr">62 </span>  81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EBX</span>
+<span id="L61" class="LineNr">61 </span>  <span class="subxComment"># if (c2 == 0) return true</span>
+<span id="L62" class="LineNr">62 </span>  81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EBX</span>
 <span id="L63" class="LineNr">63 </span>  75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L64" class="LineNr">64 </span>$argv-equal:success:
 <span id="L65" class="LineNr">65 </span>  b8/copy-to-EAX  1/imm32
 <span id="L66" class="LineNr">66 </span>  c3/return
-<span id="L67" class="LineNr">67 </span>  <span class="Comment"># return false</span>
+<span id="L67" class="LineNr">67 </span>  <span class="subxComment"># return false</span>
 <span id="L68" class="LineNr">68 </span>$argv-equal:false:
 <span id="L69" class="LineNr">69 </span>  b8/copy-to-EAX  0/imm32
 <span id="L70" class="LineNr">70 </span>  c3/return
 <span id="L71" class="LineNr">71 </span>
-<span id="L72" class="LineNr">72 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L72" class="LineNr">72 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index 0c4da4c4..43d59d12 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -15,13 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
+.CommentedCode { color: #6c6c6c; }
 .Constant { color: #00a0a0; }
-.Delimiter { color: #800080; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -56,356 +54,356 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## Null-terminated vs length-prefixed ascii strings.</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># By default we create strings with a 4-byte length prefix rather than a null suffix.</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># However we still need null-prefixed strings when interacting with the Linux</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment"># kernel in a few places. This layer implements a function for comparing</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># a null-terminated 'kernel string' with a length-prefixed 'SubX string'.</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">#</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment">#   $ subx translate examples/ex11.subx -o examples/ex11</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   $ subx run examples/ex11  # runs a series of tests</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   ......  # all tests pass</span>
-<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
-<span id="L13" class="LineNr"> 13 </span><span class="Comment"># (We can't yet run the tests when given a &quot;test&quot; commandline argument,</span>
-<span id="L14" class="LineNr"> 14 </span><span class="Comment"># because checking for it would require the function being tested! Breakage</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment"># would cause tests to not run, rather than to fail as we'd like.)</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment">## Null-terminated vs length-prefixed ascii strings.</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># By default we create strings with a 4-byte length prefix rather than a null suffix.</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># However we still need null-prefixed strings when interacting with the Linux</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># kernel in a few places. This layer implements a function for comparing</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># a null-terminated 'kernel string' with a length-prefixed 'SubX string'.</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#   $ subx translate examples/ex11.subx -o examples/ex11</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#   $ subx run examples/ex11  # runs a series of tests</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   ......  # all tests pass</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># (We can't yet run the tests when given a &quot;test&quot; commandline argument,</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># because checking for it would require the function being tested! Breakage</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># would cause tests to not run, rather than to fail as we'd like.)</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span>== code
-<span id="L18" class="LineNr"> 18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L19" class="LineNr"> 19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L20" class="LineNr"> 20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr"> 19 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="Comment"># main:</span>
-<span id="L23" class="LineNr"> 23 </span>  e8/call  run-tests/disp32  <span class="Comment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># syscall(exit, EAX)</span>
-<span id="L25" class="LineNr"> 25 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
+<span id="L23" class="LineNr"> 23 </span>  e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="subxComment"># syscall(exit, EAX)</span>
+<span id="L25" class="LineNr"> 25 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L26" class="LineNr"> 26 </span>  b8/copy-to-EAX  1/imm32
 <span id="L27" class="LineNr"> 27 </span>  cd/syscall  0x80/imm8
 <span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
-<span id="L30" class="LineNr"> 30 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L31" class="LineNr"> 31 </span>kernel-string-equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
-<span id="L32" class="LineNr"> 32 </span>  <span class="Comment"># prolog</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxComment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
+<span id="L31" class="LineNr"> 31 </span>kernel-string-equal:  <span class="subxComment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L32" class="LineNr"> 32 </span>  <span class="subxComment"># prolog</span>
 <span id="L33" class="LineNr"> 33 </span>  55/push-EBP
-<span id="L34" class="LineNr"> 34 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Comment"># save registers</span>
+<span id="L34" class="LineNr"> 34 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L35" class="LineNr"> 35 </span>  <span class="subxComment"># save registers</span>
 <span id="L36" class="LineNr"> 36 </span>  51/push-ECX
 <span id="L37" class="LineNr"> 37 </span>  52/push-EDX
 <span id="L38" class="LineNr"> 38 </span>  53/push-EBX
 <span id="L39" class="LineNr"> 39 </span>  56/push-ESI
 <span id="L40" class="LineNr"> 40 </span>  57/push-EDI
 <span id="L41" class="LineNr"> 41 </span>
-<span id="L42" class="LineNr"> 42 </span>  <span class="Comment"># pseudocode:</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Comment">#   initialize n = b.length</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Comment">#   initialize s1 = s</span>
-<span id="L45" class="LineNr"> 45 </span>  <span class="Comment">#   initialize s2 = b.data</span>
-<span id="L46" class="LineNr"> 46 </span>  <span class="Comment">#   i = 0</span>
-<span id="L47" class="LineNr"> 47 </span>  <span class="Comment">#   for (i = 0; i &lt; n; ++n)</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Comment">#     c1 = *s1</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Comment">#     c2 = *s2</span>
-<span id="L50" class="LineNr"> 50 </span>  <span class="Comment">#     if c1 == 0</span>
-<span id="L51" class="LineNr"> 51 </span>  <span class="Comment">#       return false</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Comment">#     if c1 != c2</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Comment">#       return false</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Comment">#   return *s1 == 0</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Comment"># initialize s into EDI</span>
-<span id="L56" class="LineNr"> 56 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          7/r32/EDI   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDI</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Comment"># initialize benchmark length n into EDX</span>
-<span id="L58" class="LineNr"> 58 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EDX</span>
-<span id="L59" class="LineNr"> 59 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L60" class="LineNr"> 60 </span>  <span class="Comment"># initialize benchmark data into ESI</span>
-<span id="L61" class="LineNr"> 61 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
-<span id="L62" class="LineNr"> 62 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESI</span>
-<span id="L63" class="LineNr"> 63 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="subxComment"># pseudocode:</span>
+<span id="L43" class="LineNr"> 43 </span>  <span class="subxComment">#   initialize n = b.length</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="subxComment">#   initialize s1 = s</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="subxComment">#   initialize s2 = b.data</span>
+<span id="L46" class="LineNr"> 46 </span>  <span class="subxComment">#   i = 0</span>
+<span id="L47" class="LineNr"> 47 </span>  <span class="subxComment">#   for (i = 0; i &lt; n; ++n)</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="subxComment">#     c1 = *s1</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="subxComment">#     c2 = *s2</span>
+<span id="L50" class="LineNr"> 50 </span>  <span class="subxComment">#     if c1 == 0</span>
+<span id="L51" class="LineNr"> 51 </span>  <span class="subxComment">#       return false</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="subxComment">#     if c1 != c2</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="subxComment">#       return false</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="subxComment">#   return *s1 == 0</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="subxComment"># initialize s into EDI</span>
+<span id="L56" class="LineNr"> 56 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L57" class="LineNr"> 57 </span>  <span class="subxComment"># initialize benchmark length n into EDX</span>
+<span id="L58" class="LineNr"> 58 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L59" class="LineNr"> 59 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L60" class="LineNr"> 60 </span>  <span class="subxComment"># initialize benchmark data into ESI</span>
+<span id="L61" class="LineNr"> 61 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L62" class="LineNr"> 62 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="subxComment"># initialize loop counter i into ECX</span>
 <span id="L64" class="LineNr"> 64 </span>  b9/copy-to-ECX  0/imm32/exit
-<span id="L65" class="LineNr"> 65 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
+<span id="L65" class="LineNr"> 65 </span>  <span class="subxComment"># while (i/ECX &lt; n/EDX)</span>
 <span id="L66" class="LineNr"> 66 </span>$kernel-string-equal:loop:
-<span id="L67" class="LineNr"> 67 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
+<span id="L67" class="LineNr"> 67 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
 <span id="L68" class="LineNr"> 68 </span>  74/jump-if-equal  $kernel-string-equal:break/disp8
-<span id="L69" class="LineNr"> 69 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># c1/EAX, c2/EBX = *s, *benchmark</span>
 <span id="L70" class="LineNr"> 70 </span>  b8/copy-to-EAX  0/imm32
-<span id="L71" class="LineNr"> 71 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L71" class="LineNr"> 71 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
 <span id="L72" class="LineNr"> 72 </span>  bb/copy-to-EBX  0/imm32
-<span id="L73" class="LineNr"> 73 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
-<span id="L74" class="LineNr"> 74 </span>    <span class="Comment"># if (c1 == 0) return false</span>
+<span id="L73" class="LineNr"> 73 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to lower byte of EBX</span>
+<span id="L74" class="LineNr"> 74 </span>    <span class="subxComment"># if (c1 == 0) return false</span>
 <span id="L75" class="LineNr"> 75 </span>  3d/compare-EAX  0/imm32
 <span id="L76" class="LineNr"> 76 </span>  74/jump-if-equal  $kernel-string-equal:false/disp8
-<span id="L77" class="LineNr"> 77 </span>    <span class="Comment"># if (c1 != c2) return false</span>
-<span id="L78" class="LineNr"> 78 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
+<span id="L77" class="LineNr"> 77 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
+<span id="L78" class="LineNr"> 78 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <span id="L79" class="LineNr"> 79 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
-<span id="L80" class="LineNr"> 80 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># ++s1, ++s2, ++i</span>
 <span id="L81" class="LineNr"> 81 </span>  41/inc-ECX
 <span id="L82" class="LineNr"> 82 </span>  46/inc-ESI
 <span id="L83" class="LineNr"> 83 </span>  47/inc-EDI
-<span id="L84" class="LineNr"> 84 </span>  <span class="Comment"># end while</span>
+<span id="L84" class="LineNr"> 84 </span>  <span class="subxComment"># end while</span>
 <span id="L85" class="LineNr"> 85 </span>  eb/jump  $kernel-string-equal:loop/disp8
 <span id="L86" class="LineNr"> 86 </span>$kernel-string-equal:break:
-<span id="L87" class="LineNr"> 87 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
+<span id="L87" class="LineNr"> 87 </span>  <span class="subxComment"># if (*s/EDI == 0) return true</span>
 <span id="L88" class="LineNr"> 88 </span>  b8/copy-to-EAX  0/imm32
-<span id="L89" class="LineNr"> 89 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDI to lower byte of EAX</span>
-<span id="L90" class="LineNr"> 90 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare EAX</span>
+<span id="L89" class="LineNr"> 89 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L90" class="LineNr"> 90 </span>  81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
 <span id="L91" class="LineNr"> 91 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L92" class="LineNr"> 92 </span>  b8/copy-to-EAX  1/imm32
 <span id="L93" class="LineNr"> 93 </span>$kernel-string-equal:true:
 <span id="L94" class="LineNr"> 94 </span>  eb/jump  $kernel-string-equal:end/disp8
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># return false</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="subxComment"># return false</span>
 <span id="L96" class="LineNr"> 96 </span>$kernel-string-equal:false:
 <span id="L97" class="LineNr"> 97 </span>  b8/copy-to-EAX  0/imm32
 <span id="L98" class="LineNr"> 98 </span>
 <span id="L99" class="LineNr"> 99 </span>$kernel-string-equal:end:
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># restore registers</span>
+<span id="L100" class="LineNr">100 </span>  <span class="subxComment"># restore registers</span>
 <span id="L101" class="LineNr">101 </span>  5f/pop-to-EDI
 <span id="L102" class="LineNr">102 </span>  5e/pop-to-ESI
 <span id="L103" class="LineNr">103 </span>  5b/pop-to-EBX
 <span id="L104" class="LineNr">104 </span>  5a/pop-to-EDX
 <span id="L105" class="LineNr">105 </span>  59/pop-to-ECX
-<span id="L106" class="LineNr">106 </span>  <span class="Comment"># end</span>
-<span id="L107" class="LineNr">107 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L106" class="LineNr">106 </span>  <span class="subxComment"># end</span>
+<span id="L107" class="LineNr">107 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L108" class="LineNr">108 </span>  5d/pop-to-EBP
 <span id="L109" class="LineNr">109 </span>  c3/return
 <span id="L110" class="LineNr">110 </span>
-<span id="L111" class="LineNr">111 </span><span class="SalientComment">## tests</span>
+<span id="L111" class="LineNr">111 </span><span class="subxComment">## tests</span>
 <span id="L112" class="LineNr">112 </span>
 <span id="L113" class="LineNr">113 </span>test-compare-null-kernel-string-with-empty-array:
-<span id="L114" class="LineNr">114 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># push args</span>
+<span id="L114" class="LineNr">114 </span>  <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
+<span id="L115" class="LineNr">115 </span>    <span class="subxComment"># push args</span>
 <span id="L116" class="LineNr">116 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L117" class="LineNr">117 </span>  68/push  <span class="Special">Null-kernel-string</span>/imm32
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># call</span>
+<span id="L118" class="LineNr">118 </span>    <span class="subxComment"># call</span>
 <span id="L119" class="LineNr">119 </span>  e8/call  kernel-string-equal/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="Comment"># discard args</span>
-<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L122" class="LineNr">122 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># push args</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># discard args</span>
+<span id="L121" class="LineNr">121 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L122" class="LineNr">122 </span>  <span class="subxComment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L123" class="LineNr">123 </span>    <span class="subxComment"># push args</span>
 <span id="L124" class="LineNr">124 </span>  68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-empty-array&quot;</span>/imm32
 <span id="L125" class="LineNr">125 </span>  68/push  1/imm32/true
 <span id="L126" class="LineNr">126 </span>  50/push-EAX
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># call</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxComment"># call</span>
 <span id="L128" class="LineNr">128 </span>  e8/call  check-ints-equal/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="Comment"># discard args</span>
-<span id="L130" class="LineNr">130 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L129" class="LineNr">129 </span>    <span class="subxComment"># discard args</span>
+<span id="L130" class="LineNr">130 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L131" class="LineNr">131 </span>  c3/return
 <span id="L132" class="LineNr">132 </span>
 <span id="L133" class="LineNr">133 </span>test-compare-null-kernel-string-with-non-empty-array:
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># push args</span>
+<span id="L134" class="LineNr">134 </span>  <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
+<span id="L135" class="LineNr">135 </span>    <span class="subxComment"># push args</span>
 <span id="L136" class="LineNr">136 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L137" class="LineNr">137 </span>  68/push  <span class="Special">Null-kernel-string</span>/imm32
-<span id="L138" class="LineNr">138 </span>    <span class="Comment"># call</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxComment"># call</span>
 <span id="L139" class="LineNr">139 </span>  e8/call  kernel-string-equal/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># discard args</span>
-<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># push args</span>
+<span id="L140" class="LineNr">140 </span>    <span class="subxComment"># discard args</span>
+<span id="L141" class="LineNr">141 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L142" class="LineNr">142 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxComment"># push args</span>
 <span id="L144" class="LineNr">144 </span>  68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;</span>/imm32
 <span id="L145" class="LineNr">145 </span>  68/push  0/imm32/false
 <span id="L146" class="LineNr">146 </span>  50/push-EAX
-<span id="L147" class="LineNr">147 </span>    <span class="Comment"># call</span>
+<span id="L147" class="LineNr">147 </span>    <span class="subxComment"># call</span>
 <span id="L148" class="LineNr">148 </span>  e8/call  check-ints-equal/disp32
-<span id="L149" class="LineNr">149 </span>    <span class="Comment"># discard args</span>
-<span id="L150" class="LineNr">150 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L149" class="LineNr">149 </span>    <span class="subxComment"># discard args</span>
+<span id="L150" class="LineNr">150 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L151" class="LineNr">151 </span>  c3/return
 <span id="L152" class="LineNr">152 </span>
 <span id="L153" class="LineNr">153 </span>test-compare-kernel-string-with-equal-array:
-<span id="L154" class="LineNr">154 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># push args</span>
+<span id="L154" class="LineNr">154 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
+<span id="L155" class="LineNr">155 </span>    <span class="subxComment"># push args</span>
 <span id="L156" class="LineNr">156 </span>  68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L157" class="LineNr">157 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L158" class="LineNr">158 </span>    <span class="Comment"># call</span>
+<span id="L158" class="LineNr">158 </span>    <span class="subxComment"># call</span>
 <span id="L159" class="LineNr">159 </span>  e8/call  kernel-string-equal/disp32
-<span id="L160" class="LineNr">160 </span>    <span class="Comment"># discard args</span>
-<span id="L161" class="LineNr">161 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># push args</span>
+<span id="L160" class="LineNr">160 </span>    <span class="subxComment"># discard args</span>
+<span id="L161" class="LineNr">161 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L162" class="LineNr">162 </span>  <span class="subxComment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxComment"># push args</span>
 <span id="L164" class="LineNr">164 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
 <span id="L165" class="LineNr">165 </span>  68/push  1/imm32/true
 <span id="L166" class="LineNr">166 </span>  50/push-EAX
-<span id="L167" class="LineNr">167 </span>    <span class="Comment"># call</span>
+<span id="L167" class="LineNr">167 </span>    <span class="subxComment"># call</span>
 <span id="L168" class="LineNr">168 </span>  e8/call  check-ints-equal/disp32
-<span id="L169" class="LineNr">169 </span>    <span class="Comment"># discard args</span>
-<span id="L170" class="LineNr">170 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxComment"># discard args</span>
+<span id="L170" class="LineNr">170 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L171" class="LineNr">171 </span>  c3/return
 <span id="L172" class="LineNr">172 </span>
 <span id="L173" class="LineNr">173 </span>test-compare-kernel-string-with-inequal-array:
-<span id="L174" class="LineNr">174 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># push args</span>
+<span id="L174" class="LineNr">174 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
+<span id="L175" class="LineNr">175 </span>    <span class="subxComment"># push args</span>
 <span id="L176" class="LineNr">176 </span>  68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
 <span id="L177" class="LineNr">177 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L178" class="LineNr">178 </span>    <span class="Comment"># call</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxComment"># call</span>
 <span id="L179" class="LineNr">179 </span>  e8/call  kernel-string-equal/disp32
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># discard args</span>
-<span id="L181" class="LineNr">181 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
-<span id="L183" class="LineNr">183 </span>    <span class="Comment"># push args</span>
+<span id="L180" class="LineNr">180 </span>    <span class="subxComment"># discard args</span>
+<span id="L181" class="LineNr">181 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L182" class="LineNr">182 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L183" class="LineNr">183 </span>    <span class="subxComment"># push args</span>
 <span id="L184" class="LineNr">184 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
 <span id="L185" class="LineNr">185 </span>  68/push  0/imm32/false
 <span id="L186" class="LineNr">186 </span>  50/push-EAX
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># call</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxComment"># call</span>
 <span id="L188" class="LineNr">188 </span>  e8/call  check-ints-equal/disp32
-<span id="L189" class="LineNr">189 </span>    <span class="Comment"># discard args</span>
-<span id="L190" class="LineNr">190 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L189" class="LineNr">189 </span>    <span class="subxComment"># discard args</span>
+<span id="L190" class="LineNr">190 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L191" class="LineNr">191 </span>  c3/return
 <span id="L192" class="LineNr">192 </span>
 <span id="L193" class="LineNr">193 </span>test-compare-kernel-string-with-empty-array:
-<span id="L194" class="LineNr">194 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
-<span id="L195" class="LineNr">195 </span>    <span class="Comment"># push args</span>
+<span id="L194" class="LineNr">194 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
+<span id="L195" class="LineNr">195 </span>    <span class="subxComment"># push args</span>
 <span id="L196" class="LineNr">196 </span>  68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L197" class="LineNr">197 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L198" class="LineNr">198 </span>    <span class="Comment"># call</span>
+<span id="L198" class="LineNr">198 </span>    <span class="subxComment"># call</span>
 <span id="L199" class="LineNr">199 </span>  e8/call  kernel-string-equal/disp32
-<span id="L200" class="LineNr">200 </span>    <span class="Comment"># discard args</span>
-<span id="L201" class="LineNr">201 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Comment"># push args</span>
+<span id="L200" class="LineNr">200 </span>    <span class="subxComment"># discard args</span>
+<span id="L201" class="LineNr">201 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L202" class="LineNr">202 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0)</span>
+<span id="L203" class="LineNr">203 </span>    <span class="subxComment"># push args</span>
 <span id="L204" class="LineNr">204 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
 <span id="L205" class="LineNr">205 </span>  68/push  0/imm32/false
 <span id="L206" class="LineNr">206 </span>  50/push-EAX
-<span id="L207" class="LineNr">207 </span>    <span class="Comment"># call</span>
+<span id="L207" class="LineNr">207 </span>    <span class="subxComment"># call</span>
 <span id="L208" class="LineNr">208 </span>  e8/call  check-ints-equal/disp32
-<span id="L209" class="LineNr">209 </span>    <span class="Comment"># discard args</span>
-<span id="L210" class="LineNr">210 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L209" class="LineNr">209 </span>    <span class="subxComment"># discard args</span>
+<span id="L210" class="LineNr">210 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L211" class="LineNr">211 </span>  c3/return
 <span id="L212" class="LineNr">212 </span>
 <span id="L213" class="LineNr">213 </span>test-compare-kernel-string-with-shorter-array:
-<span id="L214" class="LineNr">214 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Comment"># push args</span>
+<span id="L214" class="LineNr">214 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
+<span id="L215" class="LineNr">215 </span>    <span class="subxComment"># push args</span>
 <span id="L216" class="LineNr">216 </span>  68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
 <span id="L217" class="LineNr">217 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L218" class="LineNr">218 </span>    <span class="Comment"># call</span>
+<span id="L218" class="LineNr">218 </span>    <span class="subxComment"># call</span>
 <span id="L219" class="LineNr">219 </span>  e8/call  kernel-string-equal/disp32
-<span id="L220" class="LineNr">220 </span>    <span class="Comment"># discard args</span>
-<span id="L221" class="LineNr">221 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L222" class="LineNr">222 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Comment"># push args</span>
+<span id="L220" class="LineNr">220 </span>    <span class="subxComment"># discard args</span>
+<span id="L221" class="LineNr">221 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L222" class="LineNr">222 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0)</span>
+<span id="L223" class="LineNr">223 </span>    <span class="subxComment"># push args</span>
 <span id="L224" class="LineNr">224 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-shorter-array&quot;</span>/imm32
 <span id="L225" class="LineNr">225 </span>  68/push  0/imm32/false
 <span id="L226" class="LineNr">226 </span>  50/push-EAX
-<span id="L227" class="LineNr">227 </span>    <span class="Comment"># call</span>
+<span id="L227" class="LineNr">227 </span>    <span class="subxComment"># call</span>
 <span id="L228" class="LineNr">228 </span>  e8/call  check-ints-equal/disp32
-<span id="L229" class="LineNr">229 </span>    <span class="Comment"># discard args</span>
-<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L229" class="LineNr">229 </span>    <span class="subxComment"># discard args</span>
+<span id="L230" class="LineNr">230 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L231" class="LineNr">231 </span>  c3/return
 <span id="L232" class="LineNr">232 </span>
 <span id="L233" class="LineNr">233 </span>test-compare-kernel-string-with-longer-array:
-<span id="L234" class="LineNr">234 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
-<span id="L235" class="LineNr">235 </span>    <span class="Comment"># push args</span>
+<span id="L234" class="LineNr">234 </span>  <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
+<span id="L235" class="LineNr">235 </span>    <span class="subxComment"># push args</span>
 <span id="L236" class="LineNr">236 </span>  68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
 <span id="L237" class="LineNr">237 </span>  68/push  <span class="Special">Abc-kernel-string</span>/imm32
-<span id="L238" class="LineNr">238 </span>    <span class="Comment"># call</span>
+<span id="L238" class="LineNr">238 </span>    <span class="subxComment"># call</span>
 <span id="L239" class="LineNr">239 </span>  e8/call  kernel-string-equal/disp32
-<span id="L240" class="LineNr">240 </span>    <span class="Comment"># discard args</span>
-<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L242" class="LineNr">242 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
-<span id="L243" class="LineNr">243 </span>    <span class="Comment"># push args</span>
+<span id="L240" class="LineNr">240 </span>    <span class="subxComment"># discard args</span>
+<span id="L241" class="LineNr">241 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L242" class="LineNr">242 </span>  <span class="subxComment"># call check-ints-equal(EAX, 0)</span>
+<span id="L243" class="LineNr">243 </span>    <span class="subxComment"># push args</span>
 <span id="L244" class="LineNr">244 </span>  68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-longer-array&quot;</span>/imm32
 <span id="L245" class="LineNr">245 </span>  68/push  0/imm32/false
 <span id="L246" class="LineNr">246 </span>  50/push-EAX
-<span id="L247" class="LineNr">247 </span>    <span class="Comment"># call</span>
+<span id="L247" class="LineNr">247 </span>    <span class="subxComment"># call</span>
 <span id="L248" class="LineNr">248 </span>  e8/call  check-ints-equal/disp32
-<span id="L249" class="LineNr">249 </span>    <span class="Comment"># discard args</span>
-<span id="L250" class="LineNr">250 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxComment"># discard args</span>
+<span id="L250" class="LineNr">250 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L251" class="LineNr">251 </span>  c3/return
 <span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="SalientComment">## helpers</span>
+<span id="L253" class="LineNr">253 </span><span class="subxComment">## helpers</span>
 <span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L256" class="LineNr">256 </span>check-ints-equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Comment"># prolog</span>
+<span id="L255" class="LineNr">255 </span><span class="subxComment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L256" class="LineNr">256 </span>check-ints-equal:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L257" class="LineNr">257 </span>  <span class="subxComment"># prolog</span>
 <span id="L258" class="LineNr">258 </span>  55/push-EBP
-<span id="L259" class="LineNr">259 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Comment"># save registers</span>
+<span id="L259" class="LineNr">259 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L260" class="LineNr">260 </span>  <span class="subxComment"># save registers</span>
 <span id="L261" class="LineNr">261 </span>  51/push-ECX
 <span id="L262" class="LineNr">262 </span>  53/push-EBX
-<span id="L263" class="LineNr">263 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
-<span id="L264" class="LineNr">264 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L265" class="LineNr">265 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Comment"># if EAX == b/EBX</span>
-<span id="L267" class="LineNr">267 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L263" class="LineNr">263 </span>  <span class="subxComment"># load args into EAX, EBX and ECX</span>
+<span id="L264" class="LineNr">264 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L265" class="LineNr">265 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L266" class="LineNr">266 </span>  <span class="subxComment"># if EAX == b/EBX</span>
+<span id="L267" class="LineNr">267 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L268" class="LineNr">268 </span>  75/jump-if-unequal  $check-ints-equal:else/disp8
-<span id="L269" class="LineNr">269 </span>    <span class="Comment"># print('.')</span>
-<span id="L270" class="LineNr">270 </span>      <span class="Comment"># push args</span>
+<span id="L269" class="LineNr">269 </span>    <span class="subxComment"># print('.')</span>
+<span id="L270" class="LineNr">270 </span>      <span class="subxComment"># push args</span>
 <span id="L271" class="LineNr">271 </span>  68/push  <span class="Constant">&quot;.&quot;</span>/imm32
-<span id="L272" class="LineNr">272 </span>      <span class="Comment"># call</span>
+<span id="L272" class="LineNr">272 </span>      <span class="subxComment"># call</span>
 <span id="L273" class="LineNr">273 </span>  e8/call  write-stderr/disp32
-<span id="L274" class="LineNr">274 </span>      <span class="Comment"># discard args</span>
-<span id="L275" class="LineNr">275 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L276" class="LineNr">276 </span>    <span class="Comment"># return</span>
+<span id="L274" class="LineNr">274 </span>      <span class="subxComment"># discard args</span>
+<span id="L275" class="LineNr">275 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L276" class="LineNr">276 </span>    <span class="subxComment"># return</span>
 <span id="L277" class="LineNr">277 </span>  eb/jump  $check-ints-equal:end/disp8
-<span id="L278" class="LineNr">278 </span>  <span class="Comment"># else:</span>
+<span id="L278" class="LineNr">278 </span>  <span class="subxComment"># else:</span>
 <span id="L279" class="LineNr">279 </span>$check-ints-equal:else:
-<span id="L280" class="LineNr">280 </span>  <span class="Comment"># copy msg into ECX</span>
-<span id="L281" class="LineNr">281 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
-<span id="L282" class="LineNr">282 </span>    <span class="Comment"># print(ECX)</span>
-<span id="L283" class="LineNr">283 </span>      <span class="Comment"># push args</span>
+<span id="L280" class="LineNr">280 </span>  <span class="subxComment"># copy msg into ECX</span>
+<span id="L281" class="LineNr">281 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x10/disp8      <span class="CommentedCode"> . </span>               <span class="subxComment"># copy *(EBP+16) to ECX</span>
+<span id="L282" class="LineNr">282 </span>    <span class="subxComment"># print(ECX)</span>
+<span id="L283" class="LineNr">283 </span>      <span class="subxComment"># push args</span>
 <span id="L284" class="LineNr">284 </span>  51/push-ECX
-<span id="L285" class="LineNr">285 </span>      <span class="Comment"># call</span>
+<span id="L285" class="LineNr">285 </span>      <span class="subxComment"># call</span>
 <span id="L286" class="LineNr">286 </span>  e8/call  write-stderr/disp32
-<span id="L287" class="LineNr">287 </span>      <span class="Comment"># discard args</span>
-<span id="L288" class="LineNr">288 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L289" class="LineNr">289 </span>    <span class="Comment"># print newline</span>
-<span id="L290" class="LineNr">290 </span>      <span class="Comment"># push args</span>
+<span id="L287" class="LineNr">287 </span>      <span class="subxComment"># discard args</span>
+<span id="L288" class="LineNr">288 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L289" class="LineNr">289 </span>    <span class="subxComment"># print newline</span>
+<span id="L290" class="LineNr">290 </span>      <span class="subxComment"># push args</span>
 <span id="L291" class="LineNr">291 </span>  68/push  <span class="Special">Newline</span>/imm32
-<span id="L292" class="LineNr">292 </span>      <span class="Comment"># call</span>
+<span id="L292" class="LineNr">292 </span>      <span class="subxComment"># call</span>
 <span id="L293" class="LineNr">293 </span>  e8/call  write-stderr/disp32
-<span id="L294" class="LineNr">294 </span>      <span class="Comment"># discard args</span>
-<span id="L295" class="LineNr">295 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L294" class="LineNr">294 </span>      <span class="subxComment"># discard args</span>
+<span id="L295" class="LineNr">295 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L296" class="LineNr">296 </span>$check-ints-equal:end:
-<span id="L297" class="LineNr">297 </span>  <span class="Comment"># restore registers</span>
+<span id="L297" class="LineNr">297 </span>  <span class="subxComment"># restore registers</span>
 <span id="L298" class="LineNr">298 </span>  5b/pop-to-EBX
 <span id="L299" class="LineNr">299 </span>  59/pop-to-ECX
-<span id="L300" class="LineNr">300 </span>  <span class="Comment"># end</span>
-<span id="L301" class="LineNr">301 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L300" class="LineNr">300 </span>  <span class="subxComment"># end</span>
+<span id="L301" class="LineNr">301 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L302" class="LineNr">302 </span>  5d/pop-to-EBP
 <span id="L303" class="LineNr">303 </span>  c3/return
 <span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span>write-stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Comment"># prolog</span>
+<span id="L305" class="LineNr">305 </span>write-stderr:  <span class="subxComment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L306" class="LineNr">306 </span>  <span class="subxComment"># prolog</span>
 <span id="L307" class="LineNr">307 </span>  55/push-EBP
-<span id="L308" class="LineNr">308 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L309" class="LineNr">309 </span>  <span class="Comment"># save registers</span>
+<span id="L308" class="LineNr">308 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L309" class="LineNr">309 </span>  <span class="subxComment"># save registers</span>
 <span id="L310" class="LineNr">310 </span>  50/push-EAX
 <span id="L311" class="LineNr">311 </span>  51/push-ECX
 <span id="L312" class="LineNr">312 </span>  52/push-EDX
 <span id="L313" class="LineNr">313 </span>  53/push-EBX
-<span id="L314" class="LineNr">314 </span>  <span class="Comment"># syscall(write, 2/stderr, (data) s+4, (size) *s)</span>
-<span id="L315" class="LineNr">315 </span>    <span class="Comment"># fd = 2 (stderr)</span>
+<span id="L314" class="LineNr">314 </span>  <span class="subxComment"># syscall(write, 2/stderr, (data) s+4, (size) *s)</span>
+<span id="L315" class="LineNr">315 </span>    <span class="subxComment"># fd = 2 (stderr)</span>
 <span id="L316" class="LineNr">316 </span>  bb/copy-to-EBX  2/imm32
-<span id="L317" class="LineNr">317 </span>    <span class="Comment"># x = s+4</span>
-<span id="L318" class="LineNr">318 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
-<span id="L319" class="LineNr">319 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ECX</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Comment"># size = *s</span>
-<span id="L321" class="LineNr">321 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDX</span>
-<span id="L322" class="LineNr">322 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L323" class="LineNr">323 </span>    <span class="Comment"># syscall</span>
+<span id="L317" class="LineNr">317 </span>    <span class="subxComment"># x = s+4</span>
+<span id="L318" class="LineNr">318 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L319" class="LineNr">319 </span>  81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
+<span id="L320" class="LineNr">320 </span>    <span class="subxComment"># size = *s</span>
+<span id="L321" class="LineNr">321 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDX</span>
+<span id="L322" class="LineNr">322 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L323" class="LineNr">323 </span>    <span class="subxComment"># syscall</span>
 <span id="L324" class="LineNr">324 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L325" class="LineNr">325 </span>  cd/syscall  0x80/imm8
-<span id="L326" class="LineNr">326 </span>  <span class="Comment"># restore registers</span>
+<span id="L326" class="LineNr">326 </span>  <span class="subxComment"># restore registers</span>
 <span id="L327" class="LineNr">327 </span>  5b/pop-to-EBX
 <span id="L328" class="LineNr">328 </span>  5a/pop-to-EDX
 <span id="L329" class="LineNr">329 </span>  59/pop-to-ECX
 <span id="L330" class="LineNr">330 </span>  58/pop-to-EAX
-<span id="L331" class="LineNr">331 </span>  <span class="Comment"># end</span>
-<span id="L332" class="LineNr">332 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L331" class="LineNr">331 </span>  <span class="subxComment"># end</span>
+<span id="L332" class="LineNr">332 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L333" class="LineNr">333 </span>  5d/pop-to-EBP
 <span id="L334" class="LineNr">334 </span>  c3/return
 <span id="L335" class="LineNr">335 </span>
 <span id="L336" class="LineNr">336 </span>== data
 <span id="L337" class="LineNr">337 </span>
 <span id="L338" class="LineNr">338 </span><span class="Special">Newline</span>:
-<span id="L339" class="LineNr">339 </span>  <span class="Comment"># size</span>
+<span id="L339" class="LineNr">339 </span>  <span class="subxComment"># size</span>
 <span id="L340" class="LineNr">340 </span>  01 00 00 00
-<span id="L341" class="LineNr">341 </span>  <span class="Comment"># data</span>
+<span id="L341" class="LineNr">341 </span>  <span class="subxComment"># data</span>
 <span id="L342" class="LineNr">342 </span>  0a/newline
 <span id="L343" class="LineNr">343 </span>
-<span id="L344" class="LineNr">344 </span><span class="Comment"># for kernel-string-equal tests</span>
+<span id="L344" class="LineNr">344 </span><span class="subxComment"># for kernel-string-equal tests</span>
 <span id="L345" class="LineNr">345 </span><span class="Special">Null-kernel-string</span>:
 <span id="L346" class="LineNr">346 </span>  00/null
 <span id="L347" class="LineNr">347 </span><span class="Special">Abc-kernel-string</span>:
 <span id="L348" class="LineNr">348 </span>  41/<span class="Special">A</span> 62/b 63/c 00/null
 <span id="L349" class="LineNr">349 </span>
-<span id="L350" class="LineNr">350 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L350" class="LineNr">350 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex12.subx.html b/html/subx/examples/ex12.subx.html
index ac02a719..daa343eb 100644
--- a/html/subx/examples/ex12.subx.html
+++ b/html/subx/examples/ex12.subx.html
@@ -15,12 +15,11 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.subxH2Comment { color: #00afff; }
 -->
 </style>
 
@@ -55,50 +54,50 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## example showing mmap syscall</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment"># Create a new segment using mmap, save the address, write to it.</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx translate examples/ex12.subx -o examples/ex12</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ subx run examples/ex12</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment"># You shouldn't get a segmentation fault.</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## example showing mmap syscall</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment"># Create a new segment using mmap, save the address, write to it.</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx translate examples/ex12.subx -o examples/ex12</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   $ subx run examples/ex12</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment"># You shouldn't get a segmentation fault.</span>
 <span id="L8" class="LineNr"> 8 </span>
 <span id="L9" class="LineNr"> 9 </span>== code
-<span id="L10" class="LineNr">10 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L11" class="LineNr">11 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L13" class="LineNr">13 </span>
-<span id="L14" class="LineNr">14 </span>  <span class="Comment"># syscall(mmap, 0x1000)</span>
+<span id="L14" class="LineNr">14 </span>  <span class="subxComment"># syscall(mmap, 0x1000)</span>
 <span id="L15" class="LineNr">15 </span>  bb/copy-to-EBX  <span class="Special">Mmap-new-segment</span>/imm32
 <span id="L16" class="LineNr">16 </span>  b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L17" class="LineNr">17 </span>  cd/syscall  0x80/imm8
 <span id="L18" class="LineNr">18 </span>
-<span id="L19" class="LineNr">19 </span>  <span class="Comment"># store to *EAX</span>
-<span id="L20" class="LineNr">20 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x34/imm32              <span class="Comment"># copy to *EAX</span>
+<span id="L19" class="LineNr">19 </span>  <span class="subxComment"># store to *EAX</span>
+<span id="L20" class="LineNr">20 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x34/imm32              <span class="subxComment"># copy to *EAX</span>
 <span id="L21" class="LineNr">21 </span>
-<span id="L22" class="LineNr">22 </span>  <span class="Comment"># syscall(exit, EAX)</span>
-<span id="L23" class="LineNr">23 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
+<span id="L22" class="LineNr">22 </span>  <span class="subxComment"># syscall(exit, EAX)</span>
+<span id="L23" class="LineNr">23 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EAX to EBX</span>
 <span id="L24" class="LineNr">24 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
 <span id="L26" class="LineNr">26 </span>
 <span id="L27" class="LineNr">27 </span>== data
 <span id="L28" class="LineNr">28 </span>
-<span id="L29" class="LineNr">29 </span><span class="Comment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L30" class="LineNr">30 </span><span class="Special">Mmap-new-segment</span>:  <span class="Comment"># type mmap_arg_struct</span>
-<span id="L31" class="LineNr">31 </span>  <span class="Comment"># addr</span>
-<span id="L32" class="LineNr">32 </span>  00 00 00 00  <span class="Comment"># null</span>
-<span id="L33" class="LineNr">33 </span>  <span class="Comment"># len</span>
-<span id="L34" class="LineNr">34 </span>  00 01 00 00  <span class="Comment"># 0x1000</span>
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># protection flags</span>
-<span id="L36" class="LineNr">36 </span>  03 00 00 00  <span class="Comment"># PROT_READ | PROT_WRITE</span>
-<span id="L37" class="LineNr">37 </span>  <span class="Comment"># sharing flags</span>
-<span id="L38" class="LineNr">38 </span>  22 00 00 00  <span class="Comment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Comment"># fd</span>
-<span id="L40" class="LineNr">40 </span>  ff ff ff ff  <span class="Comment"># -1 since MAP_ANONYMOUS is specified</span>
-<span id="L41" class="LineNr">41 </span>  <span class="Comment"># offset</span>
-<span id="L42" class="LineNr">42 </span>  00 00 00 00  <span class="Comment"># 0 since MAP_ANONYMOUS is specified</span>
+<span id="L29" class="LineNr">29 </span><span class="subxComment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
+<span id="L30" class="LineNr">30 </span><span class="Special">Mmap-new-segment</span>:  <span class="subxComment"># type mmap_arg_struct</span>
+<span id="L31" class="LineNr">31 </span>  <span class="subxComment"># addr</span>
+<span id="L32" class="LineNr">32 </span>  00 00 00 00  <span class="subxComment"># null</span>
+<span id="L33" class="LineNr">33 </span>  <span class="subxComment"># len</span>
+<span id="L34" class="LineNr">34 </span>  00 01 00 00  <span class="subxComment"># 0x1000</span>
+<span id="L35" class="LineNr">35 </span>  <span class="subxComment"># protection flags</span>
+<span id="L36" class="LineNr">36 </span>  03 00 00 00  <span class="subxComment"># PROT_READ | PROT_WRITE</span>
+<span id="L37" class="LineNr">37 </span>  <span class="subxComment"># sharing flags</span>
+<span id="L38" class="LineNr">38 </span>  22 00 00 00  <span class="subxComment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
+<span id="L39" class="LineNr">39 </span>  <span class="subxComment"># fd</span>
+<span id="L40" class="LineNr">40 </span>  ff ff ff ff  <span class="subxH2Comment"># -1 since MAP_ANONYMOUS is specified</span>
+<span id="L41" class="LineNr">41 </span>  <span class="subxComment"># offset</span>
+<span id="L42" class="LineNr">42 </span>  00 00 00 00  <span class="subxComment"># 0 since MAP_ANONYMOUS is specified</span>
 <span id="L43" class="LineNr">43 </span>
-<span id="L44" class="LineNr">44 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L44" class="LineNr">44 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex2.subx.html b/html/subx/examples/ex2.subx.html
index bb45914d..1f7f3775 100644
--- a/html/subx/examples/ex2.subx.html
+++ b/html/subx/examples/ex2.subx.html
@@ -15,10 +15,8 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -53,24 +51,24 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## add 1 and 1, and return the result in the exit code</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex2.subx -o examples/ex2</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex2</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   2</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## add 1 and 1, and return the result in the exit code</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex2.subx -o examples/ex2</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex2</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   2</span>
 <span id="L9" class="LineNr"> 9 </span>
 <span id="L10" class="LineNr">10 </span>== code
 <span id="L11" class="LineNr">11 </span>
 <span id="L12" class="LineNr">12 </span>bb/copy-to-EBX  1/imm32
 <span id="L13" class="LineNr">13 </span>43/inc-EBX
-<span id="L14" class="LineNr">14 </span><span class="Comment"># exit(EBX)</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment"># exit(EBX)</span>
 <span id="L15" class="LineNr">15 </span>b8/copy-to-EAX  1/imm32
 <span id="L16" class="LineNr">16 </span>cd/syscall  0x80/imm8
 <span id="L17" class="LineNr">17 </span>
-<span id="L18" class="LineNr">18 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L18" class="LineNr">18 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex3.subx.html b/html/subx/examples/ex3.subx.html
index 8323af89..f60a8248 100644
--- a/html/subx/examples/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -15,11 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -54,42 +52,42 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## add the first 10 numbers, and return the result in the exit code</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex3.subx -o examples/ex3</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex3</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   55</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## add the first 10 numbers, and return the result in the exit code</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex3.subx -o examples/ex3</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex3</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   55</span>
 <span id="L9" class="LineNr"> 9 </span>
 <span id="L10" class="LineNr">10 </span>== code
-<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L14" class="LineNr">14 </span>
-<span id="L15" class="LineNr">15 </span>  <span class="Comment"># result: EBX = 0</span>
+<span id="L15" class="LineNr">15 </span>  <span class="subxComment"># result: EBX = 0</span>
 <span id="L16" class="LineNr">16 </span>  bb/copy-to-EBX  0/imm32
-<span id="L17" class="LineNr">17 </span>  <span class="Comment"># counter: ECX = 1</span>
+<span id="L17" class="LineNr">17 </span>  <span class="subxComment"># counter: ECX = 1</span>
 <span id="L18" class="LineNr">18 </span>  b9/copy-to-ECX  1/imm32
 <span id="L19" class="LineNr">19 </span>
 <span id="L20" class="LineNr">20 </span>$loop:
-<span id="L21" class="LineNr">21 </span>  <span class="Comment"># while (counter &lt;= 10)</span>
-<span id="L22" class="LineNr">22 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xa/imm32         <span class="Comment"># compare ECX</span>
+<span id="L21" class="LineNr">21 </span>  <span class="subxComment"># while (counter &lt;= 10)</span>
+<span id="L22" class="LineNr">22 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xa/imm32         <span class="subxComment"># compare ECX</span>
 <span id="L23" class="LineNr">23 </span>  7f/jump-if-greater  $exit/disp8
-<span id="L24" class="LineNr">24 </span>  <span class="Comment"># result += counter</span>
-<span id="L25" class="LineNr">25 </span>  01/add                          3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add ECX to EBX</span>
-<span id="L26" class="LineNr">26 </span>  <span class="Comment"># ++counter</span>
+<span id="L24" class="LineNr">24 </span>  <span class="subxComment"># result += counter</span>
+<span id="L25" class="LineNr">25 </span>  01/add                          3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add ECX to EBX</span>
+<span id="L26" class="LineNr">26 </span>  <span class="subxComment"># ++counter</span>
 <span id="L27" class="LineNr">27 </span>  41/inc-ECX
-<span id="L28" class="LineNr">28 </span>  <span class="Comment"># loop</span>
+<span id="L28" class="LineNr">28 </span>  <span class="subxComment"># loop</span>
 <span id="L29" class="LineNr">29 </span>  eb/jump  $loop/disp8
 <span id="L30" class="LineNr">30 </span>
 <span id="L31" class="LineNr">31 </span>$exit:
-<span id="L32" class="LineNr">32 </span>  <span class="Comment"># exit(EBX)</span>
+<span id="L32" class="LineNr">32 </span>  <span class="subxComment"># exit(EBX)</span>
 <span id="L33" class="LineNr">33 </span>  b8/copy-to-EAX  1/imm32
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
 <span id="L35" class="LineNr">35 </span>
-<span id="L36" class="LineNr">36 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L36" class="LineNr">36 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index 3db6e2ec..ed711834 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -15,11 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -54,46 +52,46 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## read a character from stdin, save it to a global, write it to stdout</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex4.subx -o examples/ex4</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex4</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## read a character from stdin, save it to a global, write it to stdout</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex4.subx -o examples/ex4</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex4</span>
 <span id="L6" class="LineNr"> 6 </span>
 <span id="L7" class="LineNr"> 7 </span>== code
 <span id="L8" class="LineNr"> 8 </span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment"># syscall(read, stdin, X, 1)</span>
-<span id="L10" class="LineNr">10 </span>  <span class="Comment"># fd = 0 (stdin)</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment"># syscall(read, stdin, X, 1)</span>
+<span id="L10" class="LineNr">10 </span>  <span class="subxComment"># fd = 0 (stdin)</span>
 <span id="L11" class="LineNr">11 </span>bb/copy-to-EBX  0/imm32
-<span id="L12" class="LineNr">12 </span>  <span class="Comment"># initialize X (location to write result to)</span>
+<span id="L12" class="LineNr">12 </span>  <span class="subxComment"># initialize X (location to write result to)</span>
 <span id="L13" class="LineNr">13 </span>b9/copy-to-ECX  <span class="Special">X</span>/imm32
-<span id="L14" class="LineNr">14 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L14" class="LineNr">14 </span>  <span class="subxComment"># size = 1 character</span>
 <span id="L15" class="LineNr">15 </span>ba/copy-to-EDX  1/imm32
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># syscall</span>
+<span id="L16" class="LineNr">16 </span>  <span class="subxComment"># syscall</span>
 <span id="L17" class="LineNr">17 </span>b8/copy-to-EAX  3/imm32/read
 <span id="L18" class="LineNr">18 </span>cd/syscall  0x80/imm8
 <span id="L19" class="LineNr">19 </span>
-<span id="L20" class="LineNr">20 </span><span class="Comment"># syscall(write, stdout, X, 1)</span>
-<span id="L21" class="LineNr">21 </span>  <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment"># syscall(write, stdout, X, 1)</span>
+<span id="L21" class="LineNr">21 </span>  <span class="subxComment"># fd = 1 (stdout)</span>
 <span id="L22" class="LineNr">22 </span>bb/copy-to-EBX  1/imm32
-<span id="L23" class="LineNr">23 </span>  <span class="Comment"># initialize X (location to read from)</span>
+<span id="L23" class="LineNr">23 </span>  <span class="subxComment"># initialize X (location to read from)</span>
 <span id="L24" class="LineNr">24 </span>b9/copy-to-ECX  <span class="Special">X</span>/imm32
-<span id="L25" class="LineNr">25 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L25" class="LineNr">25 </span>  <span class="subxComment"># size = 1 character</span>
 <span id="L26" class="LineNr">26 </span>ba/copy-to-EDX  1/imm32
-<span id="L27" class="LineNr">27 </span>  <span class="Comment"># syscall</span>
+<span id="L27" class="LineNr">27 </span>  <span class="subxComment"># syscall</span>
 <span id="L28" class="LineNr">28 </span>b8/copy-to-EAX  4/imm32/write
 <span id="L29" class="LineNr">29 </span>cd/syscall  0x80/imm8
 <span id="L30" class="LineNr">30 </span>
-<span id="L31" class="LineNr">31 </span><span class="Comment"># syscall(exit, EBX)</span>
+<span id="L31" class="LineNr">31 </span><span class="subxComment"># syscall(exit, EBX)</span>
 <span id="L32" class="LineNr">32 </span>b8/copy-to-EAX  1/imm32/exit
 <span id="L33" class="LineNr">33 </span>cd/syscall  0x80/imm8
 <span id="L34" class="LineNr">34 </span>
 <span id="L35" class="LineNr">35 </span>== data
 <span id="L36" class="LineNr">36 </span>
 <span id="L37" class="LineNr">37 </span><span class="Special">X</span>:
-<span id="L38" class="LineNr">38 </span>  00 00 00 00  <span class="Comment"># space for read() to write to</span>
+<span id="L38" class="LineNr">38 </span>  00 00 00 00  <span class="subxComment"># space for read() to write to</span>
 <span id="L39" class="LineNr">39 </span>
-<span id="L40" class="LineNr">40 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L40" class="LineNr">40 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index bc727faf..b40d911b 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -15,11 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -54,48 +52,48 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## read a character from stdin, save it to a local on the stack, write it to stdout</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex5.subx -o examples/ex5</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex5</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## read a character from stdin, save it to a local on the stack, write it to stdout</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex5.subx -o examples/ex5</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex5</span>
 <span id="L6" class="LineNr"> 6 </span>
 <span id="L7" class="LineNr"> 7 </span>== code
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L11" class="LineNr">11 </span>
-<span id="L12" class="LineNr">12 </span><span class="Comment"># main:</span>
-<span id="L13" class="LineNr">13 </span>  <span class="Comment"># allocate x on the stack</span>
-<span id="L14" class="LineNr">14 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># subtract from ESP</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment"># main:</span>
+<span id="L13" class="LineNr">13 </span>  <span class="subxComment"># allocate x on the stack</span>
+<span id="L14" class="LineNr">14 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># subtract from ESP</span>
 <span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># syscall(read, stdin, x, 1)</span>
-<span id="L17" class="LineNr">17 </span>    <span class="Comment"># fd = 0 (stdin)</span>
+<span id="L16" class="LineNr">16 </span>  <span class="subxComment"># syscall(read, stdin, x, 1)</span>
+<span id="L17" class="LineNr">17 </span>    <span class="subxComment"># fd = 0 (stdin)</span>
 <span id="L18" class="LineNr">18 </span>  bb/copy-to-EBX  0/imm32
-<span id="L19" class="LineNr">19 </span>    <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L20" class="LineNr">20 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
-<span id="L21" class="LineNr">21 </span>    <span class="Comment"># size = 1 character</span>
+<span id="L19" class="LineNr">19 </span>    <span class="subxComment"># initialize x (location to write result to)</span>
+<span id="L20" class="LineNr">20 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
+<span id="L21" class="LineNr">21 </span>    <span class="subxComment"># size = 1 character</span>
 <span id="L22" class="LineNr">22 </span>  ba/copy-to-EDX  1/imm32
-<span id="L23" class="LineNr">23 </span>    <span class="Comment"># syscall</span>
+<span id="L23" class="LineNr">23 </span>    <span class="subxComment"># syscall</span>
 <span id="L24" class="LineNr">24 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
 <span id="L26" class="LineNr">26 </span>
-<span id="L27" class="LineNr">27 </span>  <span class="Comment"># syscall(write, stdout, x, 1)</span>
-<span id="L28" class="LineNr">28 </span>    <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L27" class="LineNr">27 </span>  <span class="subxComment"># syscall(write, stdout, x, 1)</span>
+<span id="L28" class="LineNr">28 </span>    <span class="subxComment"># fd = 1 (stdout)</span>
 <span id="L29" class="LineNr">29 </span>  bb/copy-to-EBX  1/imm32
-<span id="L30" class="LineNr">30 </span>    <span class="Comment"># initialize x (location to read from)</span>
-<span id="L31" class="LineNr">31 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
-<span id="L32" class="LineNr">32 </span>    <span class="Comment"># size = 1 character</span>
+<span id="L30" class="LineNr">30 </span>    <span class="subxComment"># initialize x (location to read from)</span>
+<span id="L31" class="LineNr">31 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
+<span id="L32" class="LineNr">32 </span>    <span class="subxComment"># size = 1 character</span>
 <span id="L33" class="LineNr">33 </span>  ba/copy-to-EDX  1/imm32
-<span id="L34" class="LineNr">34 </span>    <span class="Comment"># syscall</span>
+<span id="L34" class="LineNr">34 </span>    <span class="subxComment"># syscall</span>
 <span id="L35" class="LineNr">35 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L36" class="LineNr">36 </span>  cd/syscall  0x80/imm8
 <span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>  <span class="Comment"># syscall(exit, EBX)</span>
+<span id="L38" class="LineNr">38 </span>  <span class="subxComment"># syscall(exit, EBX)</span>
 <span id="L39" class="LineNr">39 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L40" class="LineNr">40 </span>  cd/syscall  0x80/imm8
 <span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L42" class="LineNr">42 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index ccf6e032..b3c97faa 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -15,12 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -55,42 +53,42 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## print out a (global variable) string to stdout</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex6.subx -o examples/ex6</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex6</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   Hello, world!</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## print out a (global variable) string to stdout</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex6.subx -o examples/ex6</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex6</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   Hello, world!</span>
 <span id="L7" class="LineNr"> 7 </span>
 <span id="L8" class="LineNr"> 8 </span>== code
-<span id="L9" class="LineNr"> 9 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L11" class="LineNr">11 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L12" class="LineNr">12 </span>
-<span id="L13" class="LineNr">13 </span>  <span class="Comment"># syscall(write, stdout, X, size)</span>
-<span id="L14" class="LineNr">14 </span>    <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L13" class="LineNr">13 </span>  <span class="subxComment"># syscall(write, stdout, X, size)</span>
+<span id="L14" class="LineNr">14 </span>    <span class="subxComment"># fd = 1 (stdout)</span>
 <span id="L15" class="LineNr">15 </span>  bb/copy-to-EBX  1/imm32
-<span id="L16" class="LineNr">16 </span>    <span class="Comment"># initialize X (location to write result to)</span>
+<span id="L16" class="LineNr">16 </span>    <span class="subxComment"># initialize X (location to write result to)</span>
 <span id="L17" class="LineNr">17 </span>  b9/copy-to-ECX  <span class="Special">X</span>/imm32
-<span id="L18" class="LineNr">18 </span>    <span class="Comment"># initialize size</span>
-<span id="L19" class="LineNr">19 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   <span class="Special">Size</span>/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy *size to EDX</span>
-<span id="L20" class="LineNr">20 </span>    <span class="Comment"># syscall</span>
+<span id="L18" class="LineNr">18 </span>    <span class="subxComment"># initialize size</span>
+<span id="L19" class="LineNr">19 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   <span class="Special">Size</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *size to EDX</span>
+<span id="L20" class="LineNr">20 </span>    <span class="subxComment"># syscall</span>
 <span id="L21" class="LineNr">21 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L22" class="LineNr">22 </span>  cd/syscall  0x80/imm8
 <span id="L23" class="LineNr">23 </span>
-<span id="L24" class="LineNr">24 </span>  <span class="Comment"># syscall(exit, EBX)</span>
+<span id="L24" class="LineNr">24 </span>  <span class="subxComment"># syscall(exit, EBX)</span>
 <span id="L25" class="LineNr">25 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L26" class="LineNr">26 </span>  cd/syscall  0x80/imm8
 <span id="L27" class="LineNr">27 </span>
 <span id="L28" class="LineNr">28 </span>== data
 <span id="L29" class="LineNr">29 </span>
-<span id="L30" class="LineNr">30 </span><span class="Special">Size</span>:  <span class="Comment"># size of string</span>
-<span id="L31" class="LineNr">31 </span>  0e 00 00 00  <span class="Comment"># 14</span>
-<span id="L32" class="LineNr">32 </span><span class="Special">X</span>:  <span class="Comment"># string to print</span>
+<span id="L30" class="LineNr">30 </span><span class="Special">Size</span>:  <span class="subxComment"># size of string</span>
+<span id="L31" class="LineNr">31 </span>  0e 00 00 00  <span class="subxComment"># 14</span>
+<span id="L32" class="LineNr">32 </span><span class="Special">X</span>:  <span class="subxComment"># string to print</span>
 <span id="L33" class="LineNr">33 </span>  48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
-<span id="L34" class="LineNr">34 </span><span class="Comment"># H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
+<span id="L34" class="LineNr">34 </span><span class="subxComment"># H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
 <span id="L35" class="LineNr">35 </span>
-<span id="L36" class="LineNr">36 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L36" class="LineNr">36 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
index c41eccbf..fc0a4928 100644
--- a/html/subx/examples/ex7.subx.html
+++ b/html/subx/examples/ex7.subx.html
@@ -15,12 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
+.CommentedCode { color: #6c6c6c; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
 -->
 </style>
 
@@ -55,95 +53,95 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## example showing file syscalls</span>
-<span id="L2" class="LineNr">  2 </span><span class="Comment"># Create a file, open it for writing, write a character to it, close it, open</span>
-<span id="L3" class="LineNr">  3 </span><span class="Comment"># it for reading, read a character from it, close it, delete it, and return</span>
-<span id="L4" class="LineNr">  4 </span><span class="Comment"># the character read.</span>
-<span id="L5" class="LineNr">  5 </span><span class="Comment">#</span>
-<span id="L6" class="LineNr">  6 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L7" class="LineNr">  7 </span><span class="Comment">#   $ subx translate examples/ex7.subx -o examples/ex7</span>
-<span id="L8" class="LineNr">  8 </span><span class="Comment">#   $ subx run examples/ex7</span>
-<span id="L9" class="LineNr">  9 </span><span class="Comment"># Expected result:</span>
-<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   $ echo $?</span>
-<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   97</span>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment">## example showing file syscalls</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment"># Create a file, open it for writing, write a character to it, close it, open</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># it for reading, read a character from it, close it, delete it, and return</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># the character read.</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment">#</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#   $ subx translate examples/ex7.subx -o examples/ex7</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#   $ subx run examples/ex7</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment"># Expected result:</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment">#   97</span>
 <span id="L12" class="LineNr"> 12 </span>
 <span id="L13" class="LineNr"> 13 </span>== code
-<span id="L14" class="LineNr"> 14 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L15" class="LineNr"> 15 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L16" class="LineNr"> 16 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L17" class="LineNr"> 17 </span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Comment"># syscall(creat, Filename)</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="subxComment"># syscall(creat, Filename)</span>
 <span id="L19" class="LineNr"> 19 </span>  bb/copy-to-EBX  <span class="Special">Filename</span>/imm32
 <span id="L20" class="LineNr"> 20 </span>  b9/copy-to-ECX  0x180/imm32/fixed-perms
 <span id="L21" class="LineNr"> 21 </span>  b8/copy-to-EAX  8/imm32/creat
 <span id="L22" class="LineNr"> 22 </span>  cd/syscall  0x80/imm8
 <span id="L23" class="LineNr"> 23 </span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># stream = syscall(open, Filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="subxComment"># stream = syscall(open, Filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</span>
 <span id="L25" class="LineNr"> 25 </span>  bb/copy-to-EBX  <span class="Special">Filename</span>/imm32
 <span id="L26" class="LineNr"> 26 </span>  b9/copy-to-ECX  1/imm32/wronly
 <span id="L27" class="LineNr"> 27 </span>  ba/copy-to-EDX  0x180/imm32/fixed-perms
 <span id="L28" class="LineNr"> 28 </span>  b8/copy-to-EAX  5/imm32/open
 <span id="L29" class="LineNr"> 29 </span>  cd/syscall  0x80/imm8
-<span id="L30" class="LineNr"> 30 </span>    <span class="Comment"># save stream</span>
+<span id="L30" class="LineNr"> 30 </span>    <span class="subxComment"># save stream</span>
 <span id="L31" class="LineNr"> 31 </span>  bb/copy-to-EBX  <span class="Special">Stream</span>/imm32
-<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *EBX</span>
+<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EAX to *EBX</span>
 <span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># syscall(write, Stream, &quot;a&quot;, 1)</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="Comment"># load stream</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="subxComment"># syscall(write, Stream, &quot;a&quot;, 1)</span>
+<span id="L35" class="LineNr"> 35 </span>    <span class="subxComment"># load stream</span>
 <span id="L36" class="LineNr"> 36 </span>  bb/copy-to-EBX  <span class="Special">Stream</span>/imm32
-<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Comment">#</span>
+<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="subxComment">#</span>
 <span id="L39" class="LineNr"> 39 </span>  b9/copy-to-ECX  <span class="Special">A</span>/imm32
 <span id="L40" class="LineNr"> 40 </span>  ba/copy-to-EDX  1/imm32/size
 <span id="L41" class="LineNr"> 41 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L42" class="LineNr"> 42 </span>  cd/syscall  0x80/imm8
 <span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># syscall(close, Stream)</span>
-<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># load stream</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="subxComment"># syscall(close, Stream)</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># load stream</span>
 <span id="L46" class="LineNr"> 46 </span>  bb/copy-to-EBX  <span class="Special">Stream</span>/imm32
-<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
-<span id="L48" class="LineNr"> 48 </span>    <span class="Comment">#</span>
+<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L48" class="LineNr"> 48 </span>    <span class="subxComment">#</span>
 <span id="L49" class="LineNr"> 49 </span>  b8/copy-to-EAX  6/imm32/close
 <span id="L50" class="LineNr"> 50 </span>  cd/syscall  0x80/imm8
 <span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># stream = syscall(open, Filename, O_RDONLY, 0)</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="subxComment"># stream = syscall(open, Filename, O_RDONLY, 0)</span>
 <span id="L53" class="LineNr"> 53 </span>  bb/copy-to-EBX  <span class="Special">Filename</span>/imm32
 <span id="L54" class="LineNr"> 54 </span>  b9/copy-to-ECX  0/imm32/rdonly
 <span id="L55" class="LineNr"> 55 </span>  ba/copy-to-EDX  0x180/imm32/fixed-perms
 <span id="L56" class="LineNr"> 56 </span>  b8/copy-to-EAX  5/imm32/open
 <span id="L57" class="LineNr"> 57 </span>  cd/syscall  0x80/imm8
-<span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># save Stream</span>
+<span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># save Stream</span>
 <span id="L59" class="LineNr"> 59 </span>  bb/copy-to-EBX  <span class="Special">Stream</span>/imm32
-<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *EBX</span>
+<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy EAX to *EBX</span>
 <span id="L61" class="LineNr"> 61 </span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># syscall(read, Stream, B, 1)</span>
-<span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># load stream</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="subxComment"># syscall(read, Stream, B, 1)</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># load stream</span>
 <span id="L64" class="LineNr"> 64 </span>  bb/copy-to-EBX  <span class="Special">Stream</span>/imm32
-<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Comment">#</span>
+<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="subxComment">#</span>
 <span id="L67" class="LineNr"> 67 </span>  b9/copy-to-ECX  <span class="Special">B</span>/imm32
 <span id="L68" class="LineNr"> 68 </span>  ba/copy-to-EDX  1/imm32/size
 <span id="L69" class="LineNr"> 69 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L70" class="LineNr"> 70 </span>  cd/syscall  0x80/imm8
 <span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># syscall(close, Stream)</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># load stream</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="subxComment"># syscall(close, Stream)</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># load stream</span>
 <span id="L74" class="LineNr"> 74 </span>  bb/copy-to-EBX  <span class="Special">Stream</span>/imm32
-<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="Comment">#</span>
+<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="subxComment">#</span>
 <span id="L77" class="LineNr"> 77 </span>  b8/copy-to-EAX  6/imm32/close
 <span id="L78" class="LineNr"> 78 </span>  cd/syscall  0x80/imm8
 <span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># syscall(unlink, filename)</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="subxComment"># syscall(unlink, filename)</span>
 <span id="L81" class="LineNr"> 81 </span>  bb/copy-to-EBX  <span class="Special">Filename</span>/imm32
 <span id="L82" class="LineNr"> 82 </span>  b8/copy-to-EAX  0xa/imm32/unlink
 <span id="L83" class="LineNr"> 83 </span>  cd/syscall  0x80/imm8
 <span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># syscall(exit, b)</span>
-<span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># load b</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="subxComment"># syscall(exit, b)</span>
+<span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># load b</span>
 <span id="L87" class="LineNr"> 87 </span>  bb/copy-to-EBX  <span class="Special">B</span>/imm32
-<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
-<span id="L89" class="LineNr"> 89 </span>    <span class="Comment">#</span>
+<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                      <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxComment">#</span>
 <span id="L90" class="LineNr"> 90 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L91" class="LineNr"> 91 </span>  cd/syscall  0x80/imm8
 <span id="L92" class="LineNr"> 92 </span>
@@ -158,7 +156,7 @@ if ('onhashchange' in window) {
 <span id="L101" class="LineNr">101 </span><span class="Special">Filename</span>:
 <span id="L102" class="LineNr">102 </span>  2e 66 6f 6f 00 00 00 00
 <span id="L103" class="LineNr">103 </span>
-<span id="L104" class="LineNr">104 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L104" class="LineNr">104 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
index f1868a61..192670b5 100644
--- a/html/subx/examples/ex8.subx.html
+++ b/html/subx/examples/ex8.subx.html
@@ -15,11 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -54,64 +52,64 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## Example reading commandline arguments: compute length of first arg.</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate examples/ex8.subx -o examples/ex8</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex8 abc de fghi</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment"># Expected result:</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   3  # length of 'abc'</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment">#</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment"># At the start of a SubX program:</span>
-<span id="L11" class="LineNr">11 </span><span class="Comment">#   argc: *ESP</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment">#   argv[0]: *(ESP+4)</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment">#   argv[1]: *(ESP+8)</span>
-<span id="L14" class="LineNr">14 </span><span class="Comment">#   ...</span>
-<span id="L15" class="LineNr">15 </span><span class="Comment"># Locals start from ESP-4 downwards.</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## Example reading commandline arguments: compute length of first arg.</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ subx translate examples/ex8.subx -o examples/ex8</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ subx run examples/ex8 abc de fghi</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># Expected result:</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   3  # length of 'abc'</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># At the start of a SubX program:</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment">#   argc: *ESP</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment">#   argv[0]: *(ESP+4)</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment">#   argv[1]: *(ESP+8)</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment">#   ...</span>
+<span id="L15" class="LineNr">15 </span><span class="subxComment"># Locals start from ESP-4 downwards.</span>
 <span id="L16" class="LineNr">16 </span>
 <span id="L17" class="LineNr">17 </span>== code
-<span id="L18" class="LineNr">18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L19" class="LineNr">19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L20" class="LineNr">20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L18" class="LineNr">18 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L19" class="LineNr">19 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L21" class="LineNr">21 </span>
-<span id="L22" class="LineNr">22 </span>  <span class="Comment"># prolog</span>
-<span id="L23" class="LineNr">23 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L24" class="LineNr">24 </span>  <span class="Comment"># call ascii-length(argv[1])</span>
-<span id="L25" class="LineNr">25 </span>    <span class="Comment"># push args</span>
-<span id="L26" class="LineNr">26 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L27" class="LineNr">27 </span>    <span class="Comment"># call</span>
+<span id="L22" class="LineNr">22 </span>  <span class="subxComment"># prolog</span>
+<span id="L23" class="LineNr">23 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L24" class="LineNr">24 </span>  <span class="subxComment"># call ascii-length(argv[1])</span>
+<span id="L25" class="LineNr">25 </span>    <span class="subxComment"># push args</span>
+<span id="L26" class="LineNr">26 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L27" class="LineNr">27 </span>    <span class="subxComment"># call</span>
 <span id="L28" class="LineNr">28 </span>  e8/call  ascii-length/disp32
-<span id="L29" class="LineNr">29 </span>    <span class="Comment"># discard args</span>
-<span id="L30" class="LineNr">30 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L29" class="LineNr">29 </span>    <span class="subxComment"># discard args</span>
+<span id="L30" class="LineNr">30 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L31" class="LineNr">31 </span>
-<span id="L32" class="LineNr">32 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L33" class="LineNr">33 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L32" class="LineNr">32 </span>  <span class="subxComment"># exit(EAX)</span>
+<span id="L33" class="LineNr">33 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L34" class="LineNr">34 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L35" class="LineNr">35 </span>  cd/syscall  0x80/imm8
 <span id="L36" class="LineNr">36 </span>
-<span id="L37" class="LineNr">37 </span>ascii-length:  <span class="Comment"># (s)</span>
-<span id="L38" class="LineNr">38 </span>  <span class="Comment"># initialize s (EDX)</span>
-<span id="L39" class="LineNr">39 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L40" class="LineNr">40 </span>  <span class="Comment"># var result = 0 (EAX)</span>
+<span id="L37" class="LineNr">37 </span>ascii-length:  <span class="subxComment"># (s)</span>
+<span id="L38" class="LineNr">38 </span>  <span class="subxComment"># initialize s (EDX)</span>
+<span id="L39" class="LineNr">39 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EDX</span>
+<span id="L40" class="LineNr">40 </span>  <span class="subxComment"># var result = 0 (EAX)</span>
 <span id="L41" class="LineNr">41 </span>  b8/copy-to-EAX  0/imm32
 <span id="L42" class="LineNr">42 </span>$ascii-length-loop:
-<span id="L43" class="LineNr">43 </span>  <span class="Comment"># var c = *s (ECX)</span>
-<span id="L44" class="LineNr">44 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDX to lower byte of ECX</span>
-<span id="L45" class="LineNr">45 </span>  <span class="Comment"># if c == '\0' break</span>
-<span id="L46" class="LineNr">46 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># compare ECX</span>
+<span id="L43" class="LineNr">43 </span>  <span class="subxComment"># var c = *s (ECX)</span>
+<span id="L44" class="LineNr">44 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of ECX</span>
+<span id="L45" class="LineNr">45 </span>  <span class="subxComment"># if c == '\0' break</span>
+<span id="L46" class="LineNr">46 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare ECX</span>
 <span id="L47" class="LineNr">47 </span>  74/jump-if-equal  $ascii-length-ret/disp8
-<span id="L48" class="LineNr">48 </span>  <span class="Comment"># ++s</span>
-<span id="L49" class="LineNr">49 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># add to EDX</span>
-<span id="L50" class="LineNr">50 </span>  <span class="Comment"># ++result</span>
+<span id="L48" class="LineNr">48 </span>  <span class="subxComment"># ++s</span>
+<span id="L49" class="LineNr">49 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              1/imm32           <span class="subxComment"># add to EDX</span>
+<span id="L50" class="LineNr">50 </span>  <span class="subxComment"># ++result</span>
 <span id="L51" class="LineNr">51 </span>  40/inc-EAX
-<span id="L52" class="LineNr">52 </span>  <span class="Comment"># loop</span>
+<span id="L52" class="LineNr">52 </span>  <span class="subxComment"># loop</span>
 <span id="L53" class="LineNr">53 </span>  eb/jump  $ascii-length-loop/disp8
 <span id="L54" class="LineNr">54 </span>$ascii-length-ret:
-<span id="L55" class="LineNr">55 </span>  <span class="Comment"># return (result in EAX)</span>
+<span id="L55" class="LineNr">55 </span>  <span class="subxComment"># return (result in EAX)</span>
 <span id="L56" class="LineNr">56 </span>  c3/return
 <span id="L57" class="LineNr">57 </span>
-<span id="L58" class="LineNr">58 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L58" class="LineNr">58 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex9.subx.html b/html/subx/examples/ex9.subx.html
index f949f02a..0f683047 100644
--- a/html/subx/examples/ex9.subx.html
+++ b/html/subx/examples/ex9.subx.html
@@ -15,11 +15,9 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.subxComment { color: #005fff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
@@ -54,57 +52,57 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## Example showing arg order on the stack.</span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment"># Show difference between ascii codes of first letter of first arg and first</span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment"># letter of second arg.</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment">#</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ subx translate examples/ex9.subx -o examples/ex9</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ subx run examples/ex9 z x</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># Expected result:</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment">#   $ echo $?</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment">#   2</span>
-<span id="L11" class="LineNr">11 </span><span class="Comment">#</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment"># At the start of a SubX program:</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment">#   argc: *ESP</span>
-<span id="L14" class="LineNr">14 </span><span class="Comment">#   argv[0]: *(ESP+4)</span>
-<span id="L15" class="LineNr">15 </span><span class="Comment">#   argv[1]: *(ESP+8)</span>
-<span id="L16" class="LineNr">16 </span><span class="Comment">#   ...</span>
-<span id="L17" class="LineNr">17 </span><span class="Comment"># Locals start from ESP-4 downwards.</span>
+<span id="L1" class="LineNr"> 1 </span><span class="subxComment">## Example showing arg order on the stack.</span>
+<span id="L2" class="LineNr"> 2 </span><span class="subxComment"># Show difference between ascii codes of first letter of first arg and first</span>
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># letter of second arg.</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment"># To run (from the subx directory):</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#   $ subx translate examples/ex9.subx -o examples/ex9</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   $ subx run examples/ex9 z x</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment"># Expected result:</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment">#   2</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment">#</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment"># At the start of a SubX program:</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment">#   argc: *ESP</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment">#   argv[0]: *(ESP+4)</span>
+<span id="L15" class="LineNr">15 </span><span class="subxComment">#   argv[1]: *(ESP+8)</span>
+<span id="L16" class="LineNr">16 </span><span class="subxComment">#   ...</span>
+<span id="L17" class="LineNr">17 </span><span class="subxComment"># Locals start from ESP-4 downwards.</span>
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span>== code
-<span id="L20" class="LineNr">20 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L21" class="LineNr">21 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L22" class="LineNr">22 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L20" class="LineNr">20 </span><span class="subxComment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L21" class="LineNr">21 </span><span class="subxComment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L22" class="LineNr">22 </span><span class="subxComment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
 <span id="L23" class="LineNr">23 </span>
-<span id="L24" class="LineNr">24 </span>  <span class="Comment"># prolog</span>
-<span id="L25" class="LineNr">25 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L26" class="LineNr">26 </span>  <span class="Comment"># call ascii-difference(argv[1], argv[2])</span>
-<span id="L27" class="LineNr">27 </span>    <span class="Comment"># push argv[2]</span>
-<span id="L28" class="LineNr">28 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
-<span id="L29" class="LineNr">29 </span>    <span class="Comment"># push argv[1]</span>
-<span id="L30" class="LineNr">30 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
-<span id="L31" class="LineNr">31 </span>    <span class="Comment"># call</span>
+<span id="L24" class="LineNr">24 </span>  <span class="subxComment"># prolog</span>
+<span id="L25" class="LineNr">25 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L26" class="LineNr">26 </span>  <span class="subxComment"># call ascii-difference(argv[1], argv[2])</span>
+<span id="L27" class="LineNr">27 </span>    <span class="subxComment"># push argv[2]</span>
+<span id="L28" class="LineNr">28 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L29" class="LineNr">29 </span>    <span class="subxComment"># push argv[1]</span>
+<span id="L30" class="LineNr">30 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L31" class="LineNr">31 </span>    <span class="subxComment"># call</span>
 <span id="L32" class="LineNr">32 </span>  e8/call  ascii-difference/disp32
-<span id="L33" class="LineNr">33 </span>    <span class="Comment"># discard args</span>
-<span id="L34" class="LineNr">34 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># exit(EAX)</span>
-<span id="L36" class="LineNr">36 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
+<span id="L33" class="LineNr">33 </span>    <span class="subxComment"># discard args</span>
+<span id="L34" class="LineNr">34 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L35" class="LineNr">35 </span>  <span class="subxComment"># exit(EAX)</span>
+<span id="L36" class="LineNr">36 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L37" class="LineNr">37 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L38" class="LineNr">38 </span>  cd/syscall  0x80/imm8
 <span id="L39" class="LineNr">39 </span>
-<span id="L40" class="LineNr">40 </span>ascii-difference:  <span class="Comment"># (s1, s2) : null-terminated ascii strings</span>
-<span id="L41" class="LineNr">41 </span>  <span class="Comment"># a = first letter of s1 (ECX)</span>
-<span id="L42" class="LineNr">42 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EAX</span>
-<span id="L43" class="LineNr">43 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EAX to EAX</span>
-<span id="L44" class="LineNr">44 </span>  <span class="Comment"># b = first letter of s2 (EDX)</span>
-<span id="L45" class="LineNr">45 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   8/disp8                           <span class="Comment"># copy *(ESP+8) to ECX</span>
-<span id="L46" class="LineNr">46 </span>  8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *ECX to ECX</span>
-<span id="L47" class="LineNr">47 </span>  <span class="Comment"># a-b</span>
-<span id="L48" class="LineNr">48 </span>  29/subtract                     3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># subtract ECX from EAX</span>
+<span id="L40" class="LineNr">40 </span>ascii-difference:  <span class="subxComment"># (s1, s2) : null-terminated ascii strings</span>
+<span id="L41" class="LineNr">41 </span>  <span class="subxComment"># a = first letter of s1 (ECX)</span>
+<span id="L42" class="LineNr">42 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
+<span id="L43" class="LineNr">43 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to EAX</span>
+<span id="L44" class="LineNr">44 </span>  <span class="subxComment"># b = first letter of s2 (EDX)</span>
+<span id="L45" class="LineNr">45 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   8/disp8                           <span class="subxComment"># copy *(ESP+8) to ECX</span>
+<span id="L46" class="LineNr">46 </span>  8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ECX to ECX</span>
+<span id="L47" class="LineNr">47 </span>  <span class="subxComment"># a-b</span>
+<span id="L48" class="LineNr">48 </span>  29/subtract                     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract ECX from EAX</span>
 <span id="L49" class="LineNr">49 </span>  c3/return
 <span id="L50" class="LineNr">50 </span>
-<span id="L51" class="LineNr">51 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L51" class="LineNr">51 </span><span class="subxComment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/subx/apps/crenshaw2-1.subx b/subx/apps/crenshaw2-1.subx
index 62e2cb89..94eede9e 100644
--- a/subx/apps/crenshaw2-1.subx
+++ b/subx/apps/crenshaw2-1.subx
@@ -1,4 +1,4 @@
-## Port of https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas
+# Port of https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas
 # Corresponds to the section "single digits" in https://compilers.iecc.com/crenshaw/tutor2.txt
 #
 # To run (from the subx directory):
@@ -36,14 +36,14 @@
   81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0/disp8         1/imm32           # compare *EBP
   7e/jump-if-lesser-or-equal  $run-main/disp8
   # and if (argv[1] == "test")
-    # push args
+    # . push args
   68/push  "test"/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
-    # call
+    # . call
   e8/call  kernel-string-equal/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-    # check result
+    # . check result
   3d/compare-EAX  1/imm32
   75/jump-if-not-equal  $run-main/disp8
   # then return run-tests()
@@ -53,20 +53,20 @@
   eb/jump  $main:end/disp8
 $run-main:
   # allocate space for an exit-descriptor
-    # var ed/EAX : (address exit-descriptor)
+    # . var ed/EAX : (address exit-descriptor)
   81          5/subop/subtract    3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # subtract from ESP
   8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none  .           0/r32/EAX   .               .                 # copy ESP to EAX
-    # clear ed->target (so we really exit)
+    # . clear ed->target (so we really exit)
   c7/copy                         0/mod/direct    0/rm32/EAX    .           .             .           .           .               0/imm32           # copy to *EAX
   # compile(Stdin, 1/stdout, 2/stderr, ed)
-    # push args
+    # . push args
   50/push-EAX/ed
   68/push  2/imm32/stderr
   68/push  1/imm32/stdout
   68/push  Stdin/imm32
-    # call
+    # . call
   e8/call  compile/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
   # syscall(exit, 0)
   bb/copy-to-EBX  0/imm32
@@ -83,11 +83,11 @@ compile:  # in : fd or (address stream), out : fd or (address stream), err : fd
   50/push-EAX
   51/push-ECX
   # Look = get-char(in)
-    # push args
+    # . push args
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           8/disp8      .                    # push *(EBP+8)
-    # call
+    # . call
   e8/call  get-char/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # var num/ECX : (address stream) on the stack
   # Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.
@@ -98,85 +98,85 @@ compile:  # in : fd or (address stream), out : fd or (address stream), err : fd
   # num->length = 7
   c7/copy                         1/mod/*+disp8   1/rm32/ECX    .           .             .           .           8/disp8         7/imm32           # copy to *(ECX+8)
   # clear-stream(num)
-    # push args
+    # . push args
   51/push-ECX
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # get-num(in, num, err, ed)
-    # push args
+    # . push args
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x14/disp8      .                 # push *(EBP+20)
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x10/disp8      .                 # push *(EBP+16)
   51/push-ECX/num
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           8/disp8      .                    # push *(EBP+8)
-    # call
+    # . call
   e8/call  get-num/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
   # EAX = write(_test-stream, "Ab")
-    # push args
+    # . push args
   68/push  "Ab"/imm32
   68/push  _test-stream/imm32
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # EAX = write(out, "bb/copy-to-EBX  ")
-    # push args
+    # . push args
   68/push  "bb/copy-to-EBX  "/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write-stream(out, num)
-    # push args
+    # . push args
   51/push-ECX/num
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write(out, Newline)
-    # push args
+    # . push args
   68/push  Newline/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # EAX = write(out, "b8/copy-to-EAX  1/imm32/exit")
-    # push args
+    # . push args
   68/push  "b8/copy-to-EAX  1/imm32/exit"/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # EAX = write(out, Newline)
-    # push args
+    # . push args
   68/push  Newline/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # EAX = write(out, "cd/syscall  0x80/imm8")
-    # push args
+    # . push args
   68/push  "cd/syscall  0x80/imm8"/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # EAX = write(out, Newline)
-    # push args
+    # . push args
   68/push  Newline/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # restore registers
   59/pop-to-ECX
@@ -214,16 +214,16 @@ get-num:  # in : (address buffered-file), out : (address stream), err : fd or (a
   55/push-EBP
   89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
   # EAX = is-digit?(Look)
-    # push args
+    # . push args
   ff          6/subop/push        0/mod/indirect  5/rm32/.disp32            .             .           .           Look/disp32     .                 # push *Look
-    # call
+    # . call
   e8/call  is-digit?/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # if EAX == 0 error
   3d/compare-EAX  0/imm32
   75/jump-if-not-equal  $get-num:main/disp8
-    # expected(ed, err, "integer")
+    # . expected(ed, err, "integer")
       # push args
   68/push  "integer"/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x10/disp8      .                 # push *(EBP+16)
@@ -253,13 +253,13 @@ $get-num:main:
   3b/compare                      3/mod/direct    1/rm32/ECX    .           .             .           2/r32/EDX   .               .                 # compare EDX with ECX
   7d/jump-if-lesser  $get-num:stage2/disp8
     # error(ed, err, "get-num: too many digits in number")  # TODO: show full number
-      # push args
+      # . push args
   68/push  "get-num: too many digits in number"/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x10/disp8      .                 # push *(EBP+16)
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x14/disp8      .                 # push *(EBP+20)
-      # call
+      # . call
   e8/call  error/disp32  # never returns
-      # discard args
+      # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
 $get-num:stage2:
   # out->data[out->write] = LSB(Look)
@@ -269,11 +269,11 @@ $get-num:stage2:
   # ++out->write
   41/increment-ECX
   # Look = get-char(in)
-    # push args
+    # . push args
   56/push-ESI
-    # call
+    # . call
   e8/call  get-char/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
 $get-num:loop-end:
   # persist necessary variables from registers
@@ -291,92 +291,92 @@ $get-num:loop-end:
   c3/return
 
 test-get-num-reads-single-digit:
-  ## check that get-num returns first character if it's a digit
+  # - check that get-num returns first character if it's a digit
   # This test uses exit-descriptors. Use EBP for setting up local variables.
   55/push-EBP
   89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-  ## clear all streams
+  # - clear all streams
   # clear-stream(_test-stream)
-    # push args
+    # . push args
   68/push  _test-stream/imm32
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # clear-stream(_test-buffered-file+4)
-    # push args
+    # . push args
   b8/copy-to-EAX  _test-buffered-file/imm32
   05/add-to-EAX  4/imm32
   50/push-EAX
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # clear-stream(_test-output-stream)
-    # push args
+    # . push args
   68/push  _test-output-stream/imm32
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # clear-stream(_test-error-stream)
-    # push args
+    # . push args
   68/push  _test-error-stream/imm32
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-  ## initialize 'in'
+  # - initialize 'in'
   # write(_test-stream, "3")
-    # push args
+    # . push args
   68/push  "3"/imm32
   68/push  _test-stream/imm32
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  ## initialize exit-descriptor 'ed'
+  # - initialize exit-descriptor 'ed'
   # allocate on stack
   # var ed/EAX : (address exit-descriptor)
   81          5/subop/subtract    3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # subtract from ESP
   8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none  .           0/r32/EAX   .               .                 # copy ESP to EAX
   # size the exit-descriptor for the call to get-num below
   # tailor-exit-descriptor(ed, 16)
-    # push args
+    # . push args
   68/push  0x10/imm32/nbytes-of-args-for-get-num
   50/push-EAX/ed
-    # call
+    # . call
   e8/call  tailor-exit-descriptor/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  ## prime the pump
+  # - prime the pump
   # get-char(_test-buffered-file)
-    # push args
+    # . push args
   68/push  _test-buffered-file/imm32
-    # call
+    # . call
   e8/call  get-char/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   ## get-num(in, out, err, ed)
-    # push args
+    # . push args
   50/push-EAX/ed
   68/push  _test-error-stream/imm32
   68/push  _test-output-stream/imm32
   68/push  _test-buffered-file/imm32
-    # call
+    # . call
   e8/call  get-num/disp32
   ## registers except ESP may be clobbered at this point
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
   # check-ints-equal(*_test-output-stream.data, '3')
-    # push args
+    # . push args
   68/push  "F - test-get-num-reads-single-digit"/imm32
   68/push  0x33/imm32
   b8/copy-to-EAX  _test-output-stream/imm32
   ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX    .           .             .           .           0xc/disp8       .                 # push *(EAX+12)
-    # call
+    # . call
   e8/call  check-ints-equal/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
   # reclaim locals
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
@@ -384,86 +384,86 @@ test-get-num-reads-single-digit:
   c3/return
 
 test-get-num-aborts-on-non-digit-in-Look:
-  ## check that get-num returns first character if it's a digit
+  # - check that get-num returns first character if it's a digit
   # This test uses exit-descriptors. Use EBP for setting up local variables.
   55/push-EBP
   89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
-  ## clear all streams
+  # - clear all streams
   # clear-stream(_test-stream)
-    # push args
+    # . push args
   68/push  _test-stream/imm32
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # clear-stream(_test-buffered-file+4)
-    # push args
+    # . push args
   b8/copy-to-EAX  _test-buffered-file/imm32
   05/add-to-EAX  4/imm32
   50/push-EAX
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # clear-stream(_test-output-stream)
-    # push args
+    # . push args
   68/push  _test-output-stream/imm32
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # clear-stream(_test-error-stream)
-    # push args
+    # . push args
   68/push  _test-error-stream/imm32
-    # call
+    # . call
   e8/call  clear-stream/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
-  ## initialize 'in'
+  # - initialize 'in'
   # write(_test-stream, "3")
-    # push args
+    # . push args
   68/push  "3"/imm32
   68/push  _test-stream/imm32
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  ## initialize exit-descriptor 'ed'
+  # - initialize exit-descriptor 'ed'
   # allocate on stack
   # var ed/EAX : (address exit-descriptor)
   81          5/subop/subtract    3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # subtract from ESP
   8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none  .           0/r32/EAX   .               .                 # copy ESP to EAX
   # size the exit-descriptor for the call to get-num below
   # tailor-exit-descriptor(ed, 16)
-    # push args
+    # . push args
   68/push  0x10/imm32/nbytes-of-args-for-get-num
   50/push-EAX/ed
-    # call
+    # . call
   e8/call  tailor-exit-descriptor/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
-  ## don't initialize Look
-  ## get-num(in, out, err, ed)
-    # push args
+  # - don't initialize Look
+  # - get-num(in, out, err, ed)
+    # . push args
   50/push-EAX/ed
   68/push  _test-error-stream/imm32
   68/push  _test-output-stream/imm32
   68/push  _test-buffered-file/imm32
-    # call
+    # . call
   e8/call  get-num/disp32
-  ## registers except ESP may be clobbered at this point
-    # discard args
+  # registers except ESP may be clobbered at this point
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0x10/imm32        # add to ESP
-  ## check that get-num tried to call exit(1)
+  # - check that get-num tried to call exit(1)
   # check-ints-equal(ed->value, 2, msg)  # i.e. stop was called with value 1
-    # push args
+    # . push args
   68/push  "F - test-get-num-aborts-on-non-digit-in-Look"/imm32
   68/push  2/imm32
-    # push ed->value
+    # . push ed->value
   ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX    .           .             .           .           4/disp8         .                 # push *(EAX+4)
-    # call
+    # . call
   e8/call  check-ints-equal/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               0xc/imm32         # add to ESP
   # reclaim locals
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
@@ -478,42 +478,42 @@ expected:  # ed : (address exit-descriptor), f : fd or (address stream), s : (ad
   55/push-EBP
   89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
   # write(f, "Error: ")
-    # push args
+    # . push args
   68/push  "Error: "/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write(f, s)
-    # push args
+    # . push args
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x10/disp8      .                 # push *(EBP+16)
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write(f, " expected")
-    # push args
+    # . push args
   68/push  " expected"/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write(f, Newline)
-    # push args
+    # . push args
   68/push  Newline/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # stop(ed, 1)
-    # push args
+    # . push args
   68/push  1/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           8/disp8         .                 # push *(EBP+8)
-    # call
+    # . call
   e8/call  stop/disp32
   ## should never get past this point
   # epilog
@@ -527,34 +527,34 @@ error:  # ed : (address exit-descriptor), f : fd or (address stream), s : (addre
   55/push-EBP
   89/copy                         3/mod/direct    5/rm32/EBP    .           .             .           4/r32/ESP   .               .                 # copy ESP to EBP
   # write(f, "Error: ")
-    # push args
+    # . push args
   68/push  "Error: "/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write(f, s)
-    # push args
+    # . push args
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x10/disp8      .                 # push *(EBP+16)
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # write(f, Newline)
-    # push args
+    # . push args
   68/push  Newline/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0xc/disp8       .                 # push *(EBP+12)
-    # call
+    # . call
   e8/call  write/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               8/imm32           # add to ESP
   # stop(ed, 1)
-    # push args
+    # . push args
   68/push  1/imm32
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           8/disp8         .                 # push *(EBP+8)
-    # call
+    # . call
   e8/call  stop/disp32
   ## should never get past this point
   # epilog
@@ -570,11 +570,11 @@ get-char:  # f : (address buffered-file) -> <void>
   # save registers
   50/push-EAX
   # read-byte(f)
-    # push args
+    # . push args
   ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none  .           .           0x8/disp8       .                 # push *(EBP+8)
-    # call
+    # . call
   e8/call  read-byte/disp32
-    # discard args
+    # . discard args
   81          0/subop/add         3/mod/direct    4/rm32/ESP    .           .             .           .           .               4/imm32           # add to ESP
   # save EAX to Look
   89/copy                         0/mod/indirect  5/rm32/.disp32            .             .           0/r32/EAX   Look/disp32     .                 # copy EAX to *Look
diff --git a/subx/subx.vim b/subx/subx.vim
index 0ba55cd9..515c8cd6 100644
--- a/subx/subx.vim
+++ b/subx/subx.vim
@@ -17,15 +17,43 @@ setlocal formatoptions+=c  " but comments should still wrap
 
 setlocal iskeyword+=-
 
-syntax match subxComment /#.*$/  | highlight link subxComment Comment
-syntax match subxSalientComment /##.*$/  | highlight link subxSalientComment SalientComment
+"? syntax match subxH1Comment /^# ===== .*/ | highlight subxH1Comment ctermfg=14
+"? syntax match subxH2Comment /^# ==== .*/ | highlight subxH2Comment ctermfg=39
+"? syntax match subxH3Comment /^# === .*/ | highlight subxH3Comment ctermfg=33
+"? syntax match subxH4Comment /^# == .*/ | highlight subxH4Comment ctermfg=27
+"? syntax match subxH5Comment /^# = .*/ | highlight subxH5Comment ctermfg=21
+"? syntax match subxH6Comment /^# [^=].*/ | highlight subxH6Comment ctermfg=19
+
+"? syntax match subxH1Comment /^# === .*/ | highlight subxH1Comment ctermfg=14
+"? syntax match subxH2Comment /^# --- .*/ | highlight subxH2Comment ctermfg=39
+"? syntax match subxComment /^# [^=-\.].*/ | highlight subxComment ctermfg=33
+"? syntax match subxS1Comment /^# \. .*/ | highlight subxS1Comment ctermfg=27
+"? syntax match subxS2Comment /^# \. \. .*/ | highlight subxS2Comment ctermfg=21
+"? syntax match subxS3Comment /^# \. \. \. .*/ | highlight subxS3Comment ctermfg=19
+
+"? syntax match subxH1Comment /^# =.*/ | highlight subxH1Comment ctermfg=14
+"? syntax match subxH2Comment /^# -.*/ | highlight subxH2Comment ctermfg=39
+"? syntax match subxComment /^#[^ ].*\|# [^ .=-].*\|# \?$/ | highlight subxComment ctermfg=27
+"? syntax match subxS1Comment /^# \..*/ | highlight subxS1Comment ctermfg=21
+"? syntax match subxS2Comment /^# \. \..*/ | highlight subxS2Comment ctermfg=19
+"? syntax match subxS3Comment /^# \. \. \..*/ | highlight subxS3Comment ctermfg=18
+
+syntax match subxH1Comment /# =.*/ | highlight subxH1Comment ctermfg=14
+syntax match subxH2Comment /# -.*/ | highlight subxH2Comment ctermfg=39
+syntax match subxComment /#[^ ].*\|# [^.=-].*\|# \?$/ | highlight subxComment ctermfg=27
+syntax match subxS1Comment /# \..*/ | highlight subxS1Comment ctermfg=19
+
+"? syntax match subxH2Comment /^# --- .*/ | highlight subxH2Comment ctermfg=33
+"? syntax match subxH3Comment /^# --- .*/ | highlight subxH3Comment ctermfg=21
+"? syntax match subxComment /#.*$/  | highlight link subxComment Comment
+"? syntax match subxSalientComment /##.*$/  | highlight link subxSalientComment SalientComment
 set comments-=:#
 set comments+=n:#
 syntax match subxCommentedCode "#? .*"  | highlight link subxCommentedCode CommentedCode
 let b:cmt_head = "#? "
 
 " comment token
-syntax match subxDelimiter / \. /  | highlight link subxDelimiter Delimiter
+syntax match subxDelimiter / \. /  | highlight link subxDelimiter CommentedCode
 
 syntax match subxString %"[^"]*"% | highlight link subxString Constant
 " match globals but not registers like 'EAX'