about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-01-07 13:36:15 -0800
committerKartik Agaram <vc@akkartik.com>2019-01-07 13:36:15 -0800
commit96a6bac52d6f4a67932e54d25166bf7961718e9d (patch)
treeca35d65154852542b7b5717fd45e02532ce97ea4
parent74a46597aad859875327809e885be09e983d24ea (diff)
downloadmu-96a6bac52d6f4a67932e54d25166bf7961718e9d.tar.gz
4914
-rw-r--r--html/subx/052kernel-string-equal.subx.html461
-rw-r--r--html/subx/053new-segment.subx.html10
-rw-r--r--html/subx/054string-equal.subx.html52
-rw-r--r--html/subx/055trace.subx.html2
-rw-r--r--html/subx/056write.subx.html6
-rw-r--r--html/subx/062write-byte.subx.html4
-rw-r--r--html/subx/066allocate.subx.html57
-rw-r--r--html/subx/067new-stream.subx.html190
-rw-r--r--html/subx/068read-line.subx.html377
-rw-r--r--html/subx/069next-token.subx.html514
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html2
-rw-r--r--html/subx/apps/crenshaw2-1b.subx.html2
-rw-r--r--html/subx/apps/factorial.subx.html2
-rw-r--r--html/subx/apps/handle.subx.html338
-rw-r--r--html/subx/apps/hex.subx.html2
15 files changed, 1575 insertions, 444 deletions
diff --git a/html/subx/052kernel-string-equal.subx.html b/html/subx/052kernel-string-equal.subx.html
index 3bc6e6f4..83df21de 100644
--- a/html/subx/052kernel-string-equal.subx.html
+++ b/html/subx/052kernel-string-equal.subx.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/052kernel_string_equal.subx</title>
+<title>Mu - subx/052kernel-string-equal.subx</title>
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
@@ -57,7 +57,7 @@ if ('onhashchange' in window) {
 </script>
 </head>
 <body onload='JumpToLine();'>
-<a href='https://github.com/akkartik/mu/blob/master/subx/052kernel_string_equal.subx'>https://github.com/akkartik/mu/blob/master/subx/052kernel_string_equal.subx</a>
+<a href='https://github.com/akkartik/mu/blob/master/subx/052kernel-string-equal.subx'>https://github.com/akkartik/mu/blob/master/subx/052kernel-string-equal.subx</a>
 <pre id='vimCodeElement'>
 <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>
@@ -90,235 +90,234 @@ if ('onhashchange' in window) {
 <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><span class="subxFunction">kernel-string-equal</span>:  <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="subxS1Comment"># . 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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="subxS1Comment"># . 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="subxComment"># pseudocode:</span>
-<span id="L43" class="LineNr"> 43 </span>    <span class="subxComment">#   initialize n = b-&gt;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-&gt;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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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="subxComment"># while (i/ECX &lt; n/EDX)</span>
-<span id="L67" class="LineNr"> 67 </span><span class="Constant">$kernel-string-equal:loop</span>:
-<span id="L68" class="LineNr"> 68 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </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="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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </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="subxComment"># if (c1 != c2) return false</span>
-<span id="L79" class="LineNr"> 79 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </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="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="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><span class="Constant">$kernel-string-equal:break</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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </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><span class="Constant">$kernel-string-equal:true</span>:
-<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="subxComment"># return false</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Constant">$kernel-string-equal:false</span>:
-<span id="L98" class="LineNr"> 98 </span>    b8/copy-to-EAX  0/imm32
-<span id="L99" class="LineNr"> 99 </span><span class="Constant">$kernel-string-equal:end</span>:
-<span id="L100" class="LineNr">100 </span>    <span class="subxS1Comment"># . 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="subxS1Comment"># . epilog</span>
-<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </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="subxH1Comment"># - tests</span>
-<span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="subxTest">test-compare-null-kernel-string-with-empty-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>/imm32
-<span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L119" class="LineNr">119 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L121" class="LineNr">121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L122" class="LineNr">122 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L128" class="LineNr">128 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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><span class="subxTest">test-compare-null-kernel-string-with-non-empty-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>/imm32
-<span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L139" class="LineNr">139 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L142" class="LineNr">142 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L148" class="LineNr">148 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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><span class="subxTest">test-compare-kernel-string-with-equal-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
-<span id="L158" class="LineNr">158 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L159" class="LineNr">159 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L161" class="LineNr">161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L162" class="LineNr">162 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
-<span id="L163" class="LineNr">163 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L168" class="LineNr">168 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L169" class="LineNr">169 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L170" class="LineNr">170 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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><span class="subxTest">test-compare-kernel-string-with-inequal-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
-<span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L179" class="LineNr">179 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L182" class="LineNr">182 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L188" class="LineNr">188 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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><span class="subxTest">test-compare-kernel-string-with-empty-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
-<span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L199" class="LineNr">199 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L200" class="LineNr">200 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L201" class="LineNr">201 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L202" class="LineNr">202 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L208" class="LineNr">208 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L209" class="LineNr">209 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L210" class="LineNr">210 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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><span class="subxTest">test-compare-kernel-string-with-shorter-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
-<span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L219" class="LineNr">219 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L221" class="LineNr">221 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L222" class="LineNr">222 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L228" class="LineNr">228 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L229" class="LineNr">229 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L230" class="LineNr">230 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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><span class="subxTest">test-compare-kernel-string-with-longer-array</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="subxS2Comment"># . . 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="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
-<span id="L238" class="LineNr">238 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L239" class="LineNr">239 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
-<span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L241" class="LineNr">241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L242" class="LineNr">242 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
-<span id="L243" class="LineNr">243 </span>    <span class="subxS2Comment"># . . 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="subxS2Comment"># . . call</span>
-<span id="L248" class="LineNr">248 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L250" class="LineNr">250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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>== data
-<span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="SpecialChar">Null-kernel-string</span>:
-<span id="L256" class="LineNr">256 </span>    00/null
-<span id="L257" class="LineNr">257 </span><span class="SpecialChar">Abc-kernel-string</span>:
-<span id="L258" class="LineNr">258 </span>    41/A 62/b 63/c 00/null
-<span id="L259" class="LineNr">259 </span>
-<span id="L260" class="LineNr">260 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L33" class="LineNr"> 33 </span>    <span class="subxComment">#   initialize n = b-&gt;length</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment">#   initialize s1 = s</span>
+<span id="L35" class="LineNr"> 35 </span>    <span class="subxComment">#   initialize s2 = b-&gt;data</span>
+<span id="L36" class="LineNr"> 36 </span>    <span class="subxComment">#   i = 0</span>
+<span id="L37" class="LineNr"> 37 </span>    <span class="subxComment">#   for (i = 0; i &lt; n; ++n)</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="subxComment">#     c1 = *s1</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="subxComment">#     c2 = *s2</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="subxComment">#     if c1 == 0</span>
+<span id="L41" class="LineNr"> 41 </span>    <span class="subxComment">#       return false</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxComment">#     if c1 != c2</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="subxComment">#       return false</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="subxComment">#   return *s1 == 0</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxComment">#</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L47" class="LineNr"> 47 </span>    55/push-EBP
+<span id="L48" class="LineNr"> 48 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L49" class="LineNr"> 49 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L50" class="LineNr"> 50 </span>    51/push-ECX
+<span id="L51" class="LineNr"> 51 </span>    52/push-EDX
+<span id="L52" class="LineNr"> 52 </span>    53/push-EBX
+<span id="L53" class="LineNr"> 53 </span>    56/push-ESI
+<span id="L54" class="LineNr"> 54 </span>    57/push-EDI
+<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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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="subxComment"># while (i/ECX &lt; n/EDX)</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Constant">$kernel-string-equal:loop</span>:
+<span id="L67" class="LineNr"> 67 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </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="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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </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="subxComment"># if (c1 != c2) return false</span>
+<span id="L78" class="LineNr"> 78 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </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="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="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><span class="Constant">$kernel-string-equal:break</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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L90" class="LineNr"> 90 </span>    3d/compare-EAX  0/imm32
+<span id="L91" class="LineNr"> 91 </span>    75/jump-if-not-equal  $kernel-string-equal:false/disp8
+<span id="L92" class="LineNr"> 92 </span><span class="Constant">$kernel-string-equal:true</span>:
+<span id="L93" class="LineNr"> 93 </span>    b8/copy-to-EAX  1/imm32
+<span id="L94" class="LineNr"> 94 </span>    eb/jump  $kernel-string-equal:end/disp8
+<span id="L95" class="LineNr"> 95 </span>    <span class="subxComment"># return false</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Constant">$kernel-string-equal:false</span>:
+<span id="L97" class="LineNr"> 97 </span>    b8/copy-to-EAX  0/imm32
+<span id="L98" class="LineNr"> 98 </span><span class="Constant">$kernel-string-equal:end</span>:
+<span id="L99" class="LineNr"> 99 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L100" class="LineNr">100 </span>    5f/pop-to-EDI
+<span id="L101" class="LineNr">101 </span>    5e/pop-to-ESI
+<span id="L102" class="LineNr">102 </span>    5b/pop-to-EBX
+<span id="L103" class="LineNr">103 </span>    5a/pop-to-EDX
+<span id="L104" class="LineNr">104 </span>    59/pop-to-ECX
+<span id="L105" class="LineNr">105 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L106" class="LineNr">106 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L107" class="LineNr">107 </span>    5d/pop-to-EBP
+<span id="L108" class="LineNr">108 </span>    c3/return
+<span id="L109" class="LineNr">109 </span>
+<span id="L110" class="LineNr">110 </span><span class="subxH1Comment"># - tests</span>
+<span id="L111" class="LineNr">111 </span>
+<span id="L112" class="LineNr">112 </span><span class="subxTest">test-compare-null-kernel-string-with-empty-array</span>:
+<span id="L113" class="LineNr">113 </span>    <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
+<span id="L114" class="LineNr">114 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L115" class="LineNr">115 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
+<span id="L116" class="LineNr">116 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L254'>Null-kernel-string</a></span>/imm32
+<span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L118" class="LineNr">118 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L119" class="LineNr">119 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L120" class="LineNr">120 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L122" class="LineNr">122 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L123" class="LineNr">123 </span>    68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-empty-array&quot;</span>/imm32
+<span id="L124" class="LineNr">124 </span>    68/push  1/imm32/true
+<span id="L125" class="LineNr">125 </span>    50/push-EAX
+<span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L127" class="LineNr">127 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L129" class="LineNr">129 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L130" class="LineNr">130 </span>    c3/return
+<span id="L131" class="LineNr">131 </span>
+<span id="L132" class="LineNr">132 </span><span class="subxTest">test-compare-null-kernel-string-with-non-empty-array</span>:
+<span id="L133" class="LineNr">133 </span>    <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
+<span id="L134" class="LineNr">134 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L135" class="LineNr">135 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L136" class="LineNr">136 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L254'>Null-kernel-string</a></span>/imm32
+<span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L138" class="LineNr">138 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L139" class="LineNr">139 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L140" class="LineNr">140 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L141" class="LineNr">141 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L142" class="LineNr">142 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L143" class="LineNr">143 </span>    68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;</span>/imm32
+<span id="L144" class="LineNr">144 </span>    68/push  0/imm32/false
+<span id="L145" class="LineNr">145 </span>    50/push-EAX
+<span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L147" class="LineNr">147 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L149" class="LineNr">149 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L150" class="LineNr">150 </span>    c3/return
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="subxTest">test-compare-kernel-string-with-equal-array</span>:
+<span id="L153" class="LineNr">153 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L155" class="LineNr">155 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
+<span id="L156" class="LineNr">156 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L256'>Abc-kernel-string</a></span>/imm32
+<span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L158" class="LineNr">158 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L160" class="LineNr">160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
+<span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L163" class="LineNr">163 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
+<span id="L164" class="LineNr">164 </span>    68/push  1/imm32/true
+<span id="L165" class="LineNr">165 </span>    50/push-EAX
+<span id="L166" class="LineNr">166 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L167" class="LineNr">167 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L168" class="LineNr">168 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L169" class="LineNr">169 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L170" class="LineNr">170 </span>    c3/return
+<span id="L171" class="LineNr">171 </span>
+<span id="L172" class="LineNr">172 </span><span class="subxTest">test-compare-kernel-string-with-inequal-array</span>:
+<span id="L173" class="LineNr">173 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
+<span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L175" class="LineNr">175 </span>    68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
+<span id="L176" class="LineNr">176 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L256'>Abc-kernel-string</a></span>/imm32
+<span id="L177" class="LineNr">177 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L178" class="LineNr">178 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L180" class="LineNr">180 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L182" class="LineNr">182 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L183" class="LineNr">183 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
+<span id="L184" class="LineNr">184 </span>    68/push  0/imm32/false
+<span id="L185" class="LineNr">185 </span>    50/push-EAX
+<span id="L186" class="LineNr">186 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L187" class="LineNr">187 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L189" class="LineNr">189 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    c3/return
+<span id="L191" class="LineNr">191 </span>
+<span id="L192" class="LineNr">192 </span><span class="subxTest">test-compare-kernel-string-with-empty-array</span>:
+<span id="L193" class="LineNr">193 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
+<span id="L194" class="LineNr">194 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L195" class="LineNr">195 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
+<span id="L196" class="LineNr">196 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L256'>Abc-kernel-string</a></span>/imm32
+<span id="L197" class="LineNr">197 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L198" class="LineNr">198 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L199" class="LineNr">199 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L200" class="LineNr">200 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L202" class="LineNr">202 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L203" class="LineNr">203 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/imm32
+<span id="L204" class="LineNr">204 </span>    68/push  0/imm32/false
+<span id="L205" class="LineNr">205 </span>    50/push-EAX
+<span id="L206" class="LineNr">206 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L207" class="LineNr">207 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L208" class="LineNr">208 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L209" class="LineNr">209 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L210" class="LineNr">210 </span>    c3/return
+<span id="L211" class="LineNr">211 </span>
+<span id="L212" class="LineNr">212 </span><span class="subxTest">test-compare-kernel-string-with-shorter-array</span>:
+<span id="L213" class="LineNr">213 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
+<span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L215" class="LineNr">215 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
+<span id="L216" class="LineNr">216 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L256'>Abc-kernel-string</a></span>/imm32
+<span id="L217" class="LineNr">217 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L218" class="LineNr">218 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L219" class="LineNr">219 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L220" class="LineNr">220 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L221" class="LineNr">221 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L222" class="LineNr">222 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L223" class="LineNr">223 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-shorter-array&quot;</span>/imm32
+<span id="L224" class="LineNr">224 </span>    68/push  0/imm32/false
+<span id="L225" class="LineNr">225 </span>    50/push-EAX
+<span id="L226" class="LineNr">226 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L227" class="LineNr">227 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L228" class="LineNr">228 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L229" class="LineNr">229 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L230" class="LineNr">230 </span>    c3/return
+<span id="L231" class="LineNr">231 </span>
+<span id="L232" class="LineNr">232 </span><span class="subxTest">test-compare-kernel-string-with-longer-array</span>:
+<span id="L233" class="LineNr">233 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
+<span id="L234" class="LineNr">234 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L235" class="LineNr">235 </span>    68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
+<span id="L236" class="LineNr">236 </span>    68/push  <span class="SpecialChar"><a href='052kernel-string-equal.subx.html#L256'>Abc-kernel-string</a></span>/imm32
+<span id="L237" class="LineNr">237 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L238" class="LineNr">238 </span>    e8/call  <a href='052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L239" class="LineNr">239 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L240" class="LineNr">240 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L241" class="LineNr">241 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L242" class="LineNr">242 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L243" class="LineNr">243 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-longer-array&quot;</span>/imm32
+<span id="L244" class="LineNr">244 </span>    68/push  0/imm32/false
+<span id="L245" class="LineNr">245 </span>    50/push-EAX
+<span id="L246" class="LineNr">246 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L247" class="LineNr">247 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L248" class="LineNr">248 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L249" class="LineNr">249 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L250" class="LineNr">250 </span>    c3/return
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span>== data
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="SpecialChar">Null-kernel-string</span>:
+<span id="L255" class="LineNr">255 </span>    00/null
+<span id="L256" class="LineNr">256 </span><span class="SpecialChar">Abc-kernel-string</span>:
+<span id="L257" class="LineNr">257 </span>    41/A 62/b 63/c 00/null
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="subxS2Comment"># . . 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 df60c22a..cce753d5 100644
--- a/html/subx/053new-segment.subx.html
+++ b/html/subx/053new-segment.subx.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/053new_segment.subx</title>
+<title>Mu - subx/053new-segment.subx</title>
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
@@ -55,7 +55,7 @@ if ('onhashchange' in window) {
 </script>
 </head>
 <body onload='JumpToLine();'>
-<a href='https://github.com/akkartik/mu/blob/master/subx/053new_segment.subx'>https://github.com/akkartik/mu/blob/master/subx/053new_segment.subx</a>
+<a href='https://github.com/akkartik/mu/blob/master/subx/053new-segment.subx'>https://github.com/akkartik/mu/blob/master/subx/053new-segment.subx</a>
 <pre id='vimCodeElement'>
 <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>
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L11" class="LineNr">11 </span>    68/push  0x1000/imm32
 <span id="L12" class="LineNr">12 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L13" class="LineNr">13 </span>    e8/call  <a href='053new_segment.subx.html#L25'>new-segment</a>/disp32
+<span id="L13" class="LineNr">13 </span>    e8/call  <a href='053new-segment.subx.html#L25'>new-segment</a>/disp32
 <span id="L14" class="LineNr">14 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L15" class="LineNr">15 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L16" class="LineNr">16 </span>
@@ -89,10 +89,10 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>    <span class="subxComment"># copy len to _mmap-new-segment-&gt;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   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L33" class="LineNr">33 </span>    bb/copy-to-EBX  <a href='053new_segment.subx.html#L49'>_mmap-new-segment</a>/imm32
+<span id="L33" class="LineNr">33 </span>    bb/copy-to-EBX  <a href='053new-segment.subx.html#L49'>_mmap-new-segment</a>/imm32
 <span id="L34" class="LineNr">34 </span>    89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </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  <a href='053new_segment.subx.html#L49'>_mmap-new-segment</a>/imm32
+<span id="L36" class="LineNr">36 </span>    bb/copy-to-EBX  <a href='053new-segment.subx.html#L49'>_mmap-new-segment</a>/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="Constant">$new-segment:end</span>:
diff --git a/html/subx/054string-equal.subx.html b/html/subx/054string-equal.subx.html
index 83507aed..2544aca2 100644
--- a/html/subx/054string-equal.subx.html
+++ b/html/subx/054string-equal.subx.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<title>Mu - subx/054string_equal.subx</title>
+<title>Mu - subx/054string-equal.subx</title>
 <meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
@@ -57,7 +57,7 @@ if ('onhashchange' in window) {
 </script>
 </head>
 <body onload='JumpToLine();'>
-<a href='https://github.com/akkartik/mu/blob/master/subx/054string_equal.subx'>https://github.com/akkartik/mu/blob/master/subx/054string_equal.subx</a>
+<a href='https://github.com/akkartik/mu/blob/master/subx/054string-equal.subx'>https://github.com/akkartik/mu/blob/master/subx/054string-equal.subx</a>
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr">  1 </span><span class="subxComment"># Comparing 'regular' length-prefixed strings.</span>
 <span id="L2" class="LineNr">  2 </span>
@@ -75,26 +75,26 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr"> 14 </span>    cd/syscall  0x80/imm8
 <span id="L15" class="LineNr"> 15 </span>
 <span id="L16" class="LineNr"> 16 </span><span class="subxFunction">string-equal</span>:  <span class="subxComment"># s : string, benchmark : string -&gt; EAX : boolean</span>
-<span id="L17" class="LineNr"> 17 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L18" class="LineNr"> 18 </span>    55/push-EBP
-<span id="L19" class="LineNr"> 19 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L20" class="LineNr"> 20 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L21" class="LineNr"> 21 </span>    51/push-ECX
-<span id="L22" class="LineNr"> 22 </span>    52/push-EDX
-<span id="L23" class="LineNr"> 23 </span>    53/push-EBX
-<span id="L24" class="LineNr"> 24 </span>    56/push-ESI
-<span id="L25" class="LineNr"> 25 </span>    <span class="subxComment"># pseudocode:</span>
-<span id="L26" class="LineNr"> 26 </span>    <span class="subxComment">#   if s-&gt;length != b-&gt;length return false</span>
-<span id="L27" class="LineNr"> 27 </span>    <span class="subxComment">#   for i = 0;  i &lt; s-&gt;length;  ++i</span>
-<span id="L28" class="LineNr"> 28 </span>    <span class="subxComment">#     if s[i] != b[i] return false</span>
-<span id="L29" class="LineNr"> 29 </span>    <span class="subxComment">#   return true</span>
-<span id="L30" class="LineNr"> 30 </span>    <span class="subxComment"># registers:</span>
-<span id="L31" class="LineNr"> 31 </span>    <span class="subxComment">#   i: ECX</span>
-<span id="L32" class="LineNr"> 32 </span>    <span class="subxComment">#   s-&gt;length: EDX</span>
-<span id="L33" class="LineNr"> 33 </span>    <span class="subxComment">#   b-&gt;length: EBX</span>
-<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment">#   b[i]: EBX</span>
-<span id="L35" class="LineNr"> 35 </span>    <span class="subxComment">#   s[i]: EAX</span>
-<span id="L36" class="LineNr"> 36 </span>    <span class="subxComment">#</span>
+<span id="L17" class="LineNr"> 17 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L18" class="LineNr"> 18 </span>    <span class="subxComment">#   if s-&gt;length != b-&gt;length return false</span>
+<span id="L19" class="LineNr"> 19 </span>    <span class="subxComment">#   for i = 0;  i &lt; s-&gt;length;  ++i</span>
+<span id="L20" class="LineNr"> 20 </span>    <span class="subxComment">#     if s[i] != b[i] return false</span>
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment">#   return true</span>
+<span id="L22" class="LineNr"> 22 </span>    <span class="subxComment"># registers:</span>
+<span id="L23" class="LineNr"> 23 </span>    <span class="subxComment">#   i: ECX</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="subxComment">#   s-&gt;length: EDX</span>
+<span id="L25" class="LineNr"> 25 </span>    <span class="subxComment">#   b-&gt;length: EBX</span>
+<span id="L26" class="LineNr"> 26 </span>    <span class="subxComment">#   b[i]: EBX</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="subxComment">#   s[i]: EAX</span>
+<span id="L28" class="LineNr"> 28 </span>    <span class="subxComment">#</span>
+<span id="L29" class="LineNr"> 29 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L30" class="LineNr"> 30 </span>    55/push-EBP
+<span id="L31" class="LineNr"> 31 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L33" class="LineNr"> 33 </span>    51/push-ECX
+<span id="L34" class="LineNr"> 34 </span>    52/push-EDX
+<span id="L35" class="LineNr"> 35 </span>    53/push-EBX
+<span id="L36" class="LineNr"> 36 </span>    56/push-ESI
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxComment"># var s/EAX : (address array byte)</span>
 <span id="L38" class="LineNr"> 38 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="subxComment"># var benchmark/EBX : (address array byte)</span>
@@ -154,7 +154,7 @@ if ('onhashchange' in window) {
 <span id="L93" class="LineNr"> 93 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L94" class="LineNr"> 94 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L95" class="LineNr"> 95 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L96" class="LineNr"> 96 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
+<span id="L96" class="LineNr"> 96 </span>    e8/call  <a href='054string-equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
@@ -174,7 +174,7 @@ if ('onhashchange' in window) {
 <span id="L113" class="LineNr">113 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L114" class="LineNr">114 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L116" class="LineNr">116 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
+<span id="L116" class="LineNr">116 </span>    e8/call  <a href='054string-equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L118" class="LineNr">118 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L119" class="LineNr">119 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
@@ -194,7 +194,7 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr">133 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L134" class="LineNr">134 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L136" class="LineNr">136 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
+<span id="L136" class="LineNr">136 </span>    e8/call  <a href='054string-equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L139" class="LineNr">139 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
@@ -214,7 +214,7 @@ if ('onhashchange' in window) {
 <span id="L153" class="LineNr">153 </span>    68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
 <span id="L154" class="LineNr">154 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L156" class="LineNr">156 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
+<span id="L156" class="LineNr">156 </span>    e8/call  <a href='054string-equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L158" class="LineNr">158 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L159" class="LineNr">159 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
diff --git a/html/subx/055trace.subx.html b/html/subx/055trace.subx.html
index fc55d888..ea9a152c 100644
--- a/html/subx/055trace.subx.html
+++ b/html/subx/055trace.subx.html
@@ -119,7 +119,7 @@ if ('onhashchange' in window) {
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L58" class="LineNr"> 58 </span>    68/push  0x1000/imm32/N
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L60" class="LineNr"> 60 </span>    e8/call  <a href='053new_segment.subx.html#L25'>new-segment</a>/disp32
+<span id="L60" class="LineNr"> 60 </span>    e8/call  <a href='053new-segment.subx.html#L25'>new-segment</a>/disp32
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L62" class="LineNr"> 62 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># copy EAX to *Trace-stream</span>
diff --git a/html/subx/056write.subx.html b/html/subx/056write.subx.html
index 304a06f2..f9f81766 100644
--- a/html/subx/056write.subx.html
+++ b/html/subx/056write.subx.html
@@ -168,9 +168,9 @@ if ('onhashchange' in window) {
 <span id="L107" class="LineNr">107 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </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="subxComment"># *EAX = 0</span>
-<span id="L110" class="LineNr">110 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
+<span id="L110" class="LineNr">110 </span>    c6          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm8            <span class="subxComment"># copy byte to *EAX</span>
+<span id="L111" class="LineNr">111 </span>    <span class="subxComment"># ++EAX</span>
+<span id="L112" class="LineNr">112 </span>    40/increment-EAX
 <span id="L113" class="LineNr">113 </span>    eb/jump  $clear-stream:loop/disp8
 <span id="L114" class="LineNr">114 </span><span class="Constant">$clear-stream:end</span>:
 <span id="L115" class="LineNr">115 </span>    <span class="subxS1Comment"># . restore registers</span>
diff --git a/html/subx/062write-byte.subx.html b/html/subx/062write-byte.subx.html
index 606e12fe..f53db7ba 100644
--- a/html/subx/062write-byte.subx.html
+++ b/html/subx/062write-byte.subx.html
@@ -127,11 +127,11 @@ if ('onhashchange' in window) {
 <span id="L66" class="LineNr"> 66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L67" class="LineNr"> 67 </span><span class="Constant">$write-byte:to-stream</span>:
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># write to stream</span>
-<span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># f-&gt;data[f-&gt;read] = LSB(n)</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># f-&gt;data[f-&gt;write] = LSB(n)</span>
 <span id="L70" class="LineNr"> 70 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
 <span id="L71" class="LineNr"> 71 </span>    8a/copy-byte                    1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(EBP+12) to AL</span>
 <span id="L72" class="LineNr"> 72 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+ECX+16)</span>
-<span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># ++f-&gt;read</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># ++f-&gt;write</span>
 <span id="L74" class="LineNr"> 74 </span>    ff          0/subop/increment   1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># increment *(EDI+4)</span>
 <span id="L75" class="LineNr"> 75 </span><span class="Constant">$write-byte:end</span>:
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxS1Comment"># . restore registers</span>
diff --git a/html/subx/066allocate.subx.html b/html/subx/066allocate.subx.html
index 9cae149f..74be6f73 100644
--- a/html/subx/066allocate.subx.html
+++ b/html/subx/066allocate.subx.html
@@ -209,7 +209,62 @@ if ('onhashchange' in window) {
 <span id="L149" class="LineNr">149 </span>    5d/pop-to-EBP
 <span id="L150" class="LineNr">150 </span>    c3/return
 <span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L152" class="LineNr">152 </span><span class="subxComment"># helper: create a nested allocation descriptor (useful for tests)</span>
+<span id="L153" class="LineNr">153 </span><span class="subxFunction">allocate-region</span>:  <span class="subxComment"># ad : (address allocation-descriptor), n : int -&gt; new-ad : (address allocation-descriptor)</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L155" class="LineNr">155 </span>    55/push-EBP
+<span id="L156" class="LineNr">156 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L157" class="LineNr">157 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L158" class="LineNr">158 </span>    51/push-ECX
+<span id="L159" class="LineNr">159 </span>    <span class="subxComment"># EAX = allocate(ad, n)</span>
+<span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L161" class="LineNr">161 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L162" class="LineNr">162 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L164" class="LineNr">164 </span>    e8/call  <a href='066allocate.subx.html#L41'>allocate</a>/disp32
+<span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L166" class="LineNr">166 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L167" class="LineNr">167 </span>    <span class="subxComment"># if EAX == 0 abort</span>
+<span id="L168" class="LineNr">168 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L169" class="LineNr">169 </span>    74/jump-if-equal  $allocate-region:abort/disp8
+<span id="L170" class="LineNr">170 </span>    <span class="subxComment"># earmark 8 bytes at the start for a new allocation descriptor</span>
+<span id="L171" class="LineNr">171 </span>    <span class="subxS1Comment"># . *EAX = EAX + 8</span>
+<span id="L172" class="LineNr">172 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to ECX</span>
+<span id="L173" class="LineNr">173 </span>    81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ECX</span>
+<span id="L174" class="LineNr">174 </span>    89/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EAX</span>
+<span id="L175" class="LineNr">175 </span>    <span class="subxS1Comment"># . *(EAX+4) = EAX + n</span>
+<span id="L176" class="LineNr">176 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to ECX</span>
+<span id="L177" class="LineNr">177 </span>    03/add                          1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># add *(EBP+12) to ECX</span>
+<span id="L178" class="LineNr">178 </span>    89/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(EAX+4)</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L180" class="LineNr">180 </span>    59/pop-to-ECX
+<span id="L181" class="LineNr">181 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L182" class="LineNr">182 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L183" class="LineNr">183 </span>    5d/pop-to-EBP
+<span id="L184" class="LineNr">184 </span>    c3/return
+<span id="L185" class="LineNr">185 </span>
+<span id="L186" class="LineNr">186 </span><span class="subxComment"># We could create a more general '$abort' jump target, but then we'd need to do</span>
+<span id="L187" class="LineNr">187 </span><span class="subxComment"># a conditional jump followed by loading the error message and an unconditional</span>
+<span id="L188" class="LineNr">188 </span><span class="subxComment"># jump. Or we'd need to unconditionally load the error message before a</span>
+<span id="L189" class="LineNr">189 </span><span class="subxComment"># conditional jump, even if it's unused the vast majority of the time. This way</span>
+<span id="L190" class="LineNr">190 </span><span class="subxComment"># we bloat a potentially cold segment in RAM so we can abort with a single</span>
+<span id="L191" class="LineNr">191 </span><span class="subxComment"># instruction.</span>
+<span id="L192" class="LineNr">192 </span><span class="Constant">$allocate-region:abort</span>:
+<span id="L193" class="LineNr">193 </span>    <span class="subxS1Comment"># . _write(2/stderr, error)</span>
+<span id="L194" class="LineNr">194 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L195" class="LineNr">195 </span>    68/push  <span class="Constant">&quot;allocate-region: failed to allocate&quot;</span>/imm32
+<span id="L196" class="LineNr">196 </span>    68/push  2/imm32/stderr
+<span id="L197" class="LineNr">197 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L198" class="LineNr">198 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
+<span id="L199" class="LineNr">199 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L200" class="LineNr">200 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
+<span id="L202" class="LineNr">202 </span>    bb/copy-to-EBX  1/imm32
+<span id="L203" class="LineNr">203 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L204" class="LineNr">204 </span>    cd/syscall  0x80/imm8
+<span id="L205" class="LineNr">205 </span>    <span class="subxComment"># never gets here</span>
+<span id="L206" class="LineNr">206 </span>
+<span id="L207" class="LineNr">207 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/067new-stream.subx.html b/html/subx/067new-stream.subx.html
new file mode 100644
index 00000000..64241760
--- /dev/null
+++ b/html/subx/067new-stream.subx.html
@@ -0,0 +1,190 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/067new-stream.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/067new-stream.subx'>https://github.com/akkartik/mu/blob/master/subx/067new-stream.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># Helper to allocate a stream on the heap.</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># We'll now start gingerly supporting streams containing arbitrary types.</span>
+<span id="L4" class="LineNr">  4 </span>
+<span id="L5" class="LineNr">  5 </span>== code
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#   instruction                     effective address                                                   register    displacement    immediate</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxS1Comment"># . 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 id="L10" class="LineNr"> 10 </span><span class="subxComment"># main:</span>
+<span id="L11" class="LineNr"> 11 </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="L12" class="LineNr"> 12 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L13" class="LineNr"> 13 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L90'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L14" class="LineNr"> 14 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L15" class="LineNr"> 15 </span>    cd/syscall  0x80/imm8
+<span id="L16" class="LineNr"> 16 </span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxFunction">new-stream</span>:  <span class="subxComment"># ad : (address allocation-descriptor), length : int, elemsize : int -&gt; address/EAX</span>
+<span id="L18" class="LineNr"> 18 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L19" class="LineNr"> 19 </span>    55/push-EBP
+<span id="L20" class="LineNr"> 20 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L22" class="LineNr"> 22 </span>    52/push-EDX
+<span id="L23" class="LineNr"> 23 </span>    <span class="subxComment"># n = elemsize * length + 12 (for read, write and length)</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="subxS1Comment"># . EAX = elemsize</span>
+<span id="L25" class="LineNr"> 25 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EAX</span>
+<span id="L26" class="LineNr"> 26 </span>    <span class="subxS1Comment"># . EAX *= length</span>
+<span id="L27" class="LineNr"> 27 </span>    31/xor                          3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EDX</span>
+<span id="L28" class="LineNr"> 28 </span>    f7          4/subop/multiply    1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                                    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># multiply *(EBP+12) into EAX</span>
+<span id="L29" class="LineNr"> 29 </span>    <span class="subxS1Comment"># . if overflow abort</span>
+<span id="L30" class="LineNr"> 30 </span>    81          7/subop/compare     3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EDX</span>
+<span id="L31" class="LineNr"> 31 </span>    75/jump-if-not-equal  $new-stream:abort/disp8
+<span id="L32" class="LineNr"> 32 </span>    <span class="subxS1Comment"># . EDX = elemsize*length</span>
+<span id="L33" class="LineNr"> 33 </span>    89/copy                         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EDX</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="subxS1Comment"># . EAX += 12</span>
+<span id="L35" class="LineNr"> 35 </span>    05/add-to-EAX  0xc/imm32
+<span id="L36" class="LineNr"> 36 </span>    <span class="subxComment"># allocate(ad, n)</span>
+<span id="L37" class="LineNr"> 37 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L38" class="LineNr"> 38 </span>    50/push-EAX
+<span id="L39" class="LineNr"> 39 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L40" class="LineNr"> 40 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L41" class="LineNr"> 41 </span>    e8/call  <a href='066allocate.subx.html#L41'>allocate</a>/disp32
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L43" class="LineNr"> 43 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L44" class="LineNr"> 44 </span>    <span class="subxComment"># EAX-&gt;length = elemsize*length</span>
+<span id="L45" class="LineNr"> 45 </span>    89/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EDX to *(EAX+8)</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="subxComment"># clear-stream(EAX)</span>
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L48" class="LineNr"> 48 </span>    50/push-EAX
+<span id="L49" class="LineNr"> 49 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L50" class="LineNr"> 50 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L51" class="LineNr"> 51 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L52" class="LineNr"> 52 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L53" class="LineNr"> 53 </span><span class="Constant">$new-stream:end</span>:
+<span id="L54" class="LineNr"> 54 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L55" class="LineNr"> 55 </span>    5a/pop-to-EDX
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L57" class="LineNr"> 57 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L58" class="LineNr"> 58 </span>    5d/pop-to-EBP
+<span id="L59" class="LineNr"> 59 </span>    c3/return
+<span id="L60" class="LineNr"> 60 </span>
+<span id="L61" class="LineNr"> 61 </span><span class="Constant">$new-stream:abort</span>:
+<span id="L62" class="LineNr"> 62 </span>    <span class="subxS1Comment"># . _write(2/stderr, error)</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L64" class="LineNr"> 64 </span>    68/push  <span class="Constant">&quot;new-stream: size too large&quot;</span>/imm32
+<span id="L65" class="LineNr"> 65 </span>    68/push  2/imm32/stderr
+<span id="L66" class="LineNr"> 66 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L67" class="LineNr"> 67 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
+<span id="L68" class="LineNr"> 68 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L69" class="LineNr"> 69 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
+<span id="L71" class="LineNr"> 71 </span>    bb/copy-to-EBX  1/imm32
+<span id="L72" class="LineNr"> 72 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L73" class="LineNr"> 73 </span>    cd/syscall  0x80/imm8
+<span id="L74" class="LineNr"> 74 </span>    <span class="subxComment"># never gets here</span>
+<span id="L75" class="LineNr"> 75 </span>
+<span id="L76" class="LineNr"> 76 </span><span class="subxTest">test-new-stream</span>:
+<span id="L77" class="LineNr"> 77 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L78" class="LineNr"> 78 </span>    55/push-EBP
+<span id="L79" class="LineNr"> 79 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># var ad/ECX : (address allocation-descriptor) = allocate-region(Heap, 512)</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="subxS1Comment"># . EAX = allocate-region(Heap, 512)</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L83" class="LineNr"> 83 </span>    68/push  0x200/imm32
+<span id="L84" class="LineNr"> 84 </span>    68/push  <span class="SpecialChar"><a href='066allocate.subx.html#L23'>Heap</a></span>/imm32
+<span id="L85" class="LineNr"> 85 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L86" class="LineNr"> 86 </span>    e8/call  <a href='066allocate.subx.html#L153'>allocate-region</a>/disp32
+<span id="L87" class="LineNr"> 87 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L88" class="LineNr"> 88 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxS1Comment"># . ECX = EAX</span>
+<span id="L90" class="LineNr"> 90 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to ECX</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># var start/EDX = ad-&gt;curr</span>
+<span id="L92" class="LineNr"> 92 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EDX</span>
+<span id="L93" class="LineNr"> 93 </span>    <span class="subxComment"># EAX = new-stream(ad, 3, 2)</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L95" class="LineNr"> 95 </span>    68/push  2/imm32
+<span id="L96" class="LineNr"> 96 </span>    68/push  3/imm32
+<span id="L97" class="LineNr"> 97 </span>    51/push-ECX
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L99" class="LineNr"> 99 </span>    e8/call  <a href='067new-stream.subx.html#L17'>new-stream</a>/disp32
+<span id="L100" class="LineNr">100 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L101" class="LineNr">101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L102" class="LineNr">102 </span>    <span class="subxComment"># check-ints-equal(EAX, EDX, msg)</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L104" class="LineNr">104 </span>    68/push  <span class="Constant">&quot;F - <a href='067new-stream.subx.html#L76'>test-new-stream</a>: returns current pointer of allocation descriptor&quot;</span>/imm32
+<span id="L105" class="LineNr">105 </span>    52/push-EDX
+<span id="L106" class="LineNr">106 </span>    50/push-EAX
+<span id="L107" class="LineNr">107 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L108" class="LineNr">108 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L109" class="LineNr">109 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L110" class="LineNr">110 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L111" class="LineNr">111 </span>    <span class="subxComment"># check-ints-equal(EAX-&gt;length, 6, msg)</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L113" class="LineNr">113 </span>    68/push  <span class="Constant">&quot;F - <a href='067new-stream.subx.html#L76'>test-new-stream</a>: sets length correctly&quot;</span>/imm32
+<span id="L114" class="LineNr">114 </span>    68/push  6/imm32
+<span id="L115" class="LineNr">115 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/disp8           <span class="subxComment"># push *(EAX+8)</span>
+<span id="L116" class="LineNr">116 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L117" class="LineNr">117 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L119" class="LineNr">119 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># the rest is delegated to clear-stream() so we won't bother checking it</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L122" class="LineNr">122 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L123" class="LineNr">123 </span>    5d/pop-to-EBP
+<span id="L124" class="LineNr">124 </span>    c3/return
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/068read-line.subx.html b/html/subx/068read-line.subx.html
new file mode 100644
index 00000000..3c42df5c
--- /dev/null
+++ b/html/subx/068read-line.subx.html
@@ -0,0 +1,377 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/068read-line.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/068read-line.subx'>https://github.com/akkartik/mu/blob/master/subx/068read-line.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span>== code
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#   instruction                     effective address                                                   register    displacement    immediate</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxS1Comment"># . 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="L5" class="LineNr">  5 </span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># main:</span>
+<span id="L7" class="LineNr">  7 </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="L8" class="LineNr">  8 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L9" class="LineNr">  9 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L90'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L10" class="LineNr"> 10 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L11" class="LineNr"> 11 </span>    cd/syscall  0x80/imm8
+<span id="L12" class="LineNr"> 12 </span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># read bytes from 'f' until (and including) a newline and store them into 's'</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># return true if no data found, false otherwise</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># just abort if 's' is too small</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxFunction">read-line</span>:  <span class="subxComment"># f : (address buffered-file), s : (address stream byte) -&gt; eof?/EAX</span>
+<span id="L17" class="LineNr"> 17 </span>    <span class="subxComment"># pseudocode:</span>
+<span id="L18" class="LineNr"> 18 </span>    <span class="subxComment">#   loop:</span>
+<span id="L19" class="LineNr"> 19 </span>    <span class="subxComment">#     if (s-&gt;write &gt;= s-&gt;length) abort</span>
+<span id="L20" class="LineNr"> 20 </span>    <span class="subxComment">#     if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxComment">#     if (f-&gt;write == 0) break</span>
+<span id="L22" class="LineNr"> 22 </span>    <span class="subxComment">#     AL = f-&gt;data[f-&gt;read]</span>
+<span id="L23" class="LineNr"> 23 </span>    <span class="subxComment">#     s-&gt;data[s-&gt;write] = AL</span>
+<span id="L24" class="LineNr"> 24 </span>    <span class="subxComment">#     ++f-&gt;read</span>
+<span id="L25" class="LineNr"> 25 </span>    <span class="subxComment">#     ++s-&gt;write</span>
+<span id="L26" class="LineNr"> 26 </span>    <span class="subxComment">#     if AL == '\n' break</span>
+<span id="L27" class="LineNr"> 27 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L28" class="LineNr"> 28 </span>    55/push-EBP
+<span id="L29" class="LineNr"> 29 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L30" class="LineNr"> 30 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L31" class="LineNr"> 31 </span>    51/push-ECX
+<span id="L32" class="LineNr"> 32 </span>    52/push-EDX
+<span id="L33" class="LineNr"> 33 </span>    56/push-ESI
+<span id="L34" class="LineNr"> 34 </span>    57/push-EDI
+<span id="L35" class="LineNr"> 35 </span>    <span class="subxComment"># ESI = f</span>
+<span id="L36" class="LineNr"> 36 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L37" class="LineNr"> 37 </span>    <span class="subxComment"># ECX = f-&gt;read</span>
+<span id="L38" class="LineNr"> 38 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+8) to ECX</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="subxComment"># EDI = s</span>
+<span id="L40" class="LineNr"> 40 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L41" class="LineNr"> 41 </span>    <span class="subxComment"># EDX = s-&gt;write</span>
+<span id="L42" class="LineNr"> 42 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to EDX</span>
+<span id="L43" class="LineNr"> 43 </span><span class="Constant">$read-line:loop</span>:
+<span id="L44" class="LineNr"> 44 </span>    <span class="subxComment"># if (s-&gt;write &gt;= s-&gt;length) abort</span>
+<span id="L45" class="LineNr"> 45 </span>    3b/compare                      1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *(EDI+8)</span>
+<span id="L46" class="LineNr"> 46 </span>    7d/jump-if-greater-or-equal  $read-line:abort/disp8
+<span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
+<span id="L48" class="LineNr"> 48 </span>    3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *(ESI+4)</span>
+<span id="L49" class="LineNr"> 49 </span>    7c/jump-if-lesser  $read-line:from-stream/disp8
+<span id="L50" class="LineNr"> 50 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
+<span id="L51" class="LineNr"> 51 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L52" class="LineNr"> 52 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+4 to EAX</span>
+<span id="L53" class="LineNr"> 53 </span>    50/push-EAX
+<span id="L54" class="LineNr"> 54 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L55" class="LineNr"> 55 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L57" class="LineNr"> 57 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L58" class="LineNr"> 58 </span>    <span class="subxS1Comment"># . f-&gt;read must now be 0; update ECX</span>
+<span id="L59" class="LineNr"> 59 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
+<span id="L60" class="LineNr"> 60 </span>    <span class="subxS1Comment"># . EAX = read(f-&gt;fd, stream = f+4)</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L62" class="LineNr"> 62 </span>    50/push-EAX
+<span id="L63" class="LineNr"> 63 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
+<span id="L64" class="LineNr"> 64 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L65" class="LineNr"> 65 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
+<span id="L66" class="LineNr"> 66 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L67" class="LineNr"> 67 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># if f-&gt;write == 0 return true</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . if EAX == 0 return true</span>
+<span id="L70" class="LineNr"> 70 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L71" class="LineNr"> 71 </span>    75/jump-if-not-equal  $read-line:from-stream/disp8
+<span id="L72" class="LineNr"> 72 </span>    b8/copy-to-EAX  0xffffffff/imm32
+<span id="L73" class="LineNr"> 73 </span>    eb/jump  $read-line:end/disp8
+<span id="L74" class="LineNr"> 74 </span><span class="Constant">$read-line:from-stream</span>:
+<span id="L75" class="LineNr"> 75 </span>    <span class="subxComment"># AL = f-&gt;data[f-&gt;read]</span>
+<span id="L76" class="LineNr"> 76 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L77" class="LineNr"> 77 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+16) to AL</span>
+<span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># s-&gt;data[s-&gt;write] = AL</span>
+<span id="L79" class="LineNr"> 79 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+EDX+12)</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># ++f-&gt;read</span>
+<span id="L81" class="LineNr"> 81 </span>    41/increment-ECX
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># ++s-&gt;write</span>
+<span id="L83" class="LineNr"> 83 </span>    42/increment-EDX
+<span id="L84" class="LineNr"> 84 </span>    <span class="subxComment"># if AL == '\n' return false</span>
+<span id="L85" class="LineNr"> 85 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L86" class="LineNr"> 86 </span>    75/jump-if-not-equal  $read-line:loop/disp8
+<span id="L87" class="LineNr"> 87 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L88" class="LineNr"> 88 </span><span class="Constant">$read-line:end</span>:
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxComment"># save f-&gt;read</span>
+<span id="L90" class="LineNr"> 90 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+8)</span>
+<span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># save s-&gt;write</span>
+<span id="L92" class="LineNr"> 92 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EDX to *EDI</span>
+<span id="L93" class="LineNr"> 93 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L94" class="LineNr"> 94 </span>    5f/pop-to-EDI
+<span id="L95" class="LineNr"> 95 </span>    5e/pop-to-ESI
+<span id="L96" class="LineNr"> 96 </span>    5a/pop-to-EDX
+<span id="L97" class="LineNr"> 97 </span>    59/pop-to-ECX
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L99" class="LineNr"> 99 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L100" class="LineNr">100 </span>    5d/pop-to-EBP
+<span id="L101" class="LineNr">101 </span>    c3/return
+<span id="L102" class="LineNr">102 </span>
+<span id="L103" class="LineNr">103 </span><span class="Constant">$read-line:abort</span>:
+<span id="L104" class="LineNr">104 </span>    <span class="subxS1Comment"># . _write(2/stderr, error)</span>
+<span id="L105" class="LineNr">105 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L106" class="LineNr">106 </span>    68/push  <span class="Constant">&quot;read-line: line too long&quot;</span>/imm32
+<span id="L107" class="LineNr">107 </span>    68/push  2/imm32/stderr
+<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L109" class="LineNr">109 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
+<span id="L110" class="LineNr">110 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L111" class="LineNr">111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
+<span id="L113" class="LineNr">113 </span>    bb/copy-to-EBX  1/imm32
+<span id="L114" class="LineNr">114 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L115" class="LineNr">115 </span>    cd/syscall  0x80/imm8
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># never gets here</span>
+<span id="L117" class="LineNr">117 </span>
+<span id="L118" class="LineNr">118 </span><span class="subxTest">test-read-line</span>:
+<span id="L119" class="LineNr">119 </span>    <span class="subxH1Comment"># - check that read-line stops at a newline</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># setup</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L122" class="LineNr">122 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L123" class="LineNr">123 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L125" class="LineNr">125 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L127" class="LineNr">127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L130" class="LineNr">130 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L131" class="LineNr">131 </span>    05/add-to-EAX  4/imm32
+<span id="L132" class="LineNr">132 </span>    50/push-EAX
+<span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L134" class="LineNr">134 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L136" class="LineNr">136 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream-buffer)</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L139" class="LineNr">139 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L141" class="LineNr">141 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L142" class="LineNr">142 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L143" class="LineNr">143 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L144" class="LineNr">144 </span>    <span class="subxComment"># write(_test-stream, &quot;ab\ncd&quot;)</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;ab&quot;)</span>
+<span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L147" class="LineNr">147 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L148" class="LineNr">148 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L150" class="LineNr">150 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L151" class="LineNr">151 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L152" class="LineNr">152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L153" class="LineNr">153 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;\n&quot;)</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L155" class="LineNr">155 </span>    68/push <span class="SpecialChar"><a href='051test.subx.html#L83'>Newline</a></span>/imm32
+<span id="L156" class="LineNr">156 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L158" class="LineNr">158 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L160" class="LineNr">160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;cd&quot;)</span>
+<span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L163" class="LineNr">163 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
+<span id="L164" class="LineNr">164 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L166" class="LineNr">166 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L167" class="LineNr">167 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L168" class="LineNr">168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxComment"># read a line from _test-stream (buffered by _test-buffered-file) into _test-stream-buffer</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxS1Comment"># . EAX = read-line(_test-buffered-file, _test-stream-buffer)</span>
+<span id="L171" class="LineNr">171 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L172" class="LineNr">172 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L173" class="LineNr">173 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L175" class="LineNr">175 </span>    e8/call  <a href='068read-line.subx.html#L16'>read-line</a>/disp32
+<span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L177" class="LineNr">177 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxComment"># check-ints-equal(EAX, 0/not-at-eof, msg)</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L180" class="LineNr">180 </span>    68/push  <span class="Constant">&quot;F - <a href='068read-line.subx.html#L118'>test-read-line</a>: return value&quot;</span>/imm32
+<span id="L181" class="LineNr">181 </span>    68/push  0/imm32/not-at-eof
+<span id="L182" class="LineNr">182 </span>    50/push-EAX
+<span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L184" class="LineNr">184 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L185" class="LineNr">185 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L186" class="LineNr">186 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-buffer-&gt;data, 61/a 62/b 0a/newline 00, msg)</span>
+<span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L189" class="LineNr">189 </span>    68/push  <span class="Constant">&quot;F - test-read-line&quot;</span>/imm32
+<span id="L190" class="LineNr">190 </span>    68/push  0x000a6261/imm32
+<span id="L191" class="LineNr">191 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
+<span id="L192" class="LineNr">192 </span>    b8/copy-to-EAX  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L193" class="LineNr">193 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L194" class="LineNr">194 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L195" class="LineNr">195 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L196" class="LineNr">196 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L197" class="LineNr">197 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L198" class="LineNr">198 </span>    <span class="subxComment"># end</span>
+<span id="L199" class="LineNr">199 </span>    c3/return
+<span id="L200" class="LineNr">200 </span>
+<span id="L201" class="LineNr">201 </span><span class="subxTest">test-read-line-returns-true-on-eof</span>:
+<span id="L202" class="LineNr">202 </span>    <span class="subxComment"># setup</span>
+<span id="L203" class="LineNr">203 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L204" class="LineNr">204 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L205" class="LineNr">205 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L206" class="LineNr">206 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L207" class="LineNr">207 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L208" class="LineNr">208 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L209" class="LineNr">209 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L210" class="LineNr">210 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L211" class="LineNr">211 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L212" class="LineNr">212 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L213" class="LineNr">213 </span>    05/add-to-EAX  4/imm32
+<span id="L214" class="LineNr">214 </span>    50/push-EAX
+<span id="L215" class="LineNr">215 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L216" class="LineNr">216 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L217" class="LineNr">217 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L218" class="LineNr">218 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream-buffer)</span>
+<span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L221" class="LineNr">221 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L222" class="LineNr">222 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L223" class="LineNr">223 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L224" class="LineNr">224 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L225" class="LineNr">225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L226" class="LineNr">226 </span>    <span class="subxComment"># write nothing</span>
+<span id="L227" class="LineNr">227 </span>    <span class="subxComment"># EAX = read-line(_test-buffered-file, _test-stream-buffer)</span>
+<span id="L228" class="LineNr">228 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L229" class="LineNr">229 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L230" class="LineNr">230 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L231" class="LineNr">231 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L232" class="LineNr">232 </span>    e8/call  <a href='068read-line.subx.html#L16'>read-line</a>/disp32
+<span id="L233" class="LineNr">233 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L234" class="LineNr">234 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L235" class="LineNr">235 </span>    <span class="subxComment"># check-ints-equal(EAX, eof, msg)</span>
+<span id="L236" class="LineNr">236 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L237" class="LineNr">237 </span>    68/push  <span class="Constant">&quot;F - test-read-line-returns-true-on-eof&quot;</span>/imm32
+<span id="L238" class="LineNr">238 </span>    68/push  0xffffffff/imm32/not-at-eof
+<span id="L239" class="LineNr">239 </span>    50/push-EAX
+<span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L241" class="LineNr">241 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L242" class="LineNr">242 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L243" class="LineNr">243 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L244" class="LineNr">244 </span>    <span class="subxComment"># end</span>
+<span id="L245" class="LineNr">245 </span>    c3/return
+<span id="L246" class="LineNr">246 </span>
+<span id="L247" class="LineNr">247 </span><span class="subxTest">test-read-line-reads-final-line-until-eof</span>:
+<span id="L248" class="LineNr">248 </span>    <span class="subxComment"># setup</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L250" class="LineNr">250 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L251" class="LineNr">251 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L252" class="LineNr">252 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L253" class="LineNr">253 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L254" class="LineNr">254 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L255" class="LineNr">255 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L256" class="LineNr">256 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
+<span id="L257" class="LineNr">257 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L258" class="LineNr">258 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L259" class="LineNr">259 </span>    05/add-to-EAX  4/imm32
+<span id="L260" class="LineNr">260 </span>    50/push-EAX
+<span id="L261" class="LineNr">261 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L262" class="LineNr">262 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L263" class="LineNr">263 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L264" class="LineNr">264 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L265" class="LineNr">265 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream-buffer)</span>
+<span id="L266" class="LineNr">266 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L267" class="LineNr">267 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L268" class="LineNr">268 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L269" class="LineNr">269 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L270" class="LineNr">270 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L271" class="LineNr">271 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L272" class="LineNr">272 </span>    <span class="subxComment"># write(_test-stream, &quot;cd&quot;)</span>
+<span id="L273" class="LineNr">273 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L274" class="LineNr">274 </span>    68/push  <span class="Constant">&quot;cd&quot;</span>/imm32
+<span id="L275" class="LineNr">275 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L276" class="LineNr">276 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L277" class="LineNr">277 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L278" class="LineNr">278 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L279" class="LineNr">279 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L280" class="LineNr">280 </span>    <span class="subxComment"># read a line from _test-stream (buffered by _test-buffered-file) into _test-stream-buffer</span>
+<span id="L281" class="LineNr">281 </span>    <span class="subxS1Comment"># . EAX = read-line(_test-buffered-file, _test-stream-buffer)</span>
+<span id="L282" class="LineNr">282 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L283" class="LineNr">283 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L284" class="LineNr">284 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L285" class="LineNr">285 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L286" class="LineNr">286 </span>    e8/call  <a href='068read-line.subx.html#L16'>read-line</a>/disp32
+<span id="L287" class="LineNr">287 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L288" class="LineNr">288 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L289" class="LineNr">289 </span>    <span class="subxComment"># check-ints-equal(EAX, eof, msg)</span>
+<span id="L290" class="LineNr">290 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L291" class="LineNr">291 </span>    68/push  <span class="Constant">&quot;F - <a href='068read-line.subx.html#L247'>test-read-line-reads-final-line-until-eof</a>: return value&quot;</span>/imm32
+<span id="L292" class="LineNr">292 </span>    68/push  0xffffffff/imm32/not-at-eof
+<span id="L293" class="LineNr">293 </span>    50/push-EAX
+<span id="L294" class="LineNr">294 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L295" class="LineNr">295 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L296" class="LineNr">296 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L297" class="LineNr">297 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L298" class="LineNr">298 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-buffer-&gt;data, 63/c 64/d 00 00, msg)</span>
+<span id="L299" class="LineNr">299 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L300" class="LineNr">300 </span>    68/push  <span class="Constant">&quot;F - test-read-line-reads-final-line-until-eof&quot;</span>/imm32
+<span id="L301" class="LineNr">301 </span>    68/push  0x00006463/imm32
+<span id="L302" class="LineNr">302 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
+<span id="L303" class="LineNr">303 </span>    b8/copy-to-EAX  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L304" class="LineNr">304 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L305" class="LineNr">305 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L306" class="LineNr">306 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L307" class="LineNr">307 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L308" class="LineNr">308 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L309" class="LineNr">309 </span>    <span class="subxComment"># end</span>
+<span id="L310" class="LineNr">310 </span>    c3/return
+<span id="L311" class="LineNr">311 </span>
+<span id="L312" class="LineNr">312 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/069next-token.subx.html b/html/subx/069next-token.subx.html
new file mode 100644
index 00000000..9a8395a1
--- /dev/null
+++ b/html/subx/069next-token.subx.html
@@ -0,0 +1,514 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/069next-token.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+a { color:inherit; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/069next-token.subx'>https://github.com/akkartik/mu/blob/master/subx/069next-token.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span>== code
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#   instruction                     effective address                                                   register    displacement    immediate</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxS1Comment"># . 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="L5" class="LineNr">  5 </span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment"># main:</span>
+<span id="L7" class="LineNr">  7 </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="L8" class="LineNr">  8 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L9" class="LineNr">  9 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L90'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L10" class="LineNr"> 10 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L11" class="LineNr"> 11 </span>    cd/syscall  0x80/imm8
+<span id="L12" class="LineNr"> 12 </span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># new data structure: a slice is an open interval of addresses [start, end) that includes 'start' but not 'end'</span>
+<span id="L14" class="LineNr"> 14 </span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># extract the next run of characters that are different from a given 'delimiter'</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment"># on eof return an empty interval</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxFunction">next-token</span>:  <span class="subxComment"># in : (address stream), delimiter : byte, out : (address slice)</span>
+<span id="L18" class="LineNr"> 18 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L19" class="LineNr"> 19 </span>    55/push-EBP
+<span id="L20" class="LineNr"> 20 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L21" class="LineNr"> 21 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L22" class="LineNr"> 22 </span>    50/push-EAX
+<span id="L23" class="LineNr"> 23 </span>    51/push-ECX
+<span id="L24" class="LineNr"> 24 </span>    56/push-ESI
+<span id="L25" class="LineNr"> 25 </span>    57/push-EDI
+<span id="L26" class="LineNr"> 26 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L27" class="LineNr"> 27 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L28" class="LineNr"> 28 </span>    <span class="subxComment"># EDI = out</span>
+<span id="L29" class="LineNr"> 29 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDI</span>
+<span id="L30" class="LineNr"> 30 </span>    <span class="subxComment"># skip-chars-matching(in, delimiter)</span>
+<span id="L31" class="LineNr"> 31 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L32" class="LineNr"> 32 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L33" class="LineNr"> 33 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L35" class="LineNr"> 35 </span>    e8/call  <a href='069next-token.subx.html#L168'>skip-chars-matching</a>/disp32
+<span id="L36" class="LineNr"> 36 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L37" class="LineNr"> 37 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="subxComment"># out-&gt;start = &amp;in-&gt;data[in-&gt;read]</span>
+<span id="L39" class="LineNr"> 39 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L40" class="LineNr"> 40 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX+12 to EAX</span>
+<span id="L41" class="LineNr"> 41 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *EDI</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxComment"># skip-chars-not-matching(in, delimiter)</span>
+<span id="L43" class="LineNr"> 43 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L44" class="LineNr"> 44 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L45" class="LineNr"> 45 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L47" class="LineNr"> 47 </span>    e8/call  <a href='069next-token.subx.html#L290'>skip-chars-not-matching</a>/disp32
+<span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L49" class="LineNr"> 49 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="subxComment"># out-&gt;end = &amp;in-&gt;data[in-&gt;read]</span>
+<span id="L51" class="LineNr"> 51 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L52" class="LineNr"> 52 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX+12 to EAX</span>
+<span id="L53" class="LineNr"> 53 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EDI+4)</span>
+<span id="L54" class="LineNr"> 54 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L55" class="LineNr"> 55 </span>    5f/pop-to-EDI
+<span id="L56" class="LineNr"> 56 </span>    5e/pop-to-ESI
+<span id="L57" class="LineNr"> 57 </span>    59/pop-to-ECX
+<span id="L58" class="LineNr"> 58 </span>    58/pop-to-EAX
+<span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L60" class="LineNr"> 60 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L61" class="LineNr"> 61 </span>    5d/pop-to-EBP
+<span id="L62" class="LineNr"> 62 </span>    c3/return
+<span id="L63" class="LineNr"> 63 </span>
+<span id="L64" class="LineNr"> 64 </span><span class="subxTest">test-next-token</span>:
+<span id="L65" class="LineNr"> 65 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L66" class="LineNr"> 66 </span>    55/push-EBP
+<span id="L67" class="LineNr"> 67 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># setup</span>
+<span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L71" class="LineNr"> 71 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L72" class="LineNr"> 72 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L73" class="LineNr"> 73 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L74" class="LineNr"> 74 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L75" class="LineNr"> 75 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
+<span id="L77" class="LineNr"> 77 </span>    68/push  0/imm32/end
+<span id="L78" class="LineNr"> 78 </span>    68/push  0/imm32/start
+<span id="L79" class="LineNr"> 79 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># write(_test-stream, &quot;  ab&quot;)</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L82" class="LineNr"> 82 </span>    68/push  <span class="Constant">&quot;  ab&quot;</span>/imm32
+<span id="L83" class="LineNr"> 83 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L84" class="LineNr"> 84 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L85" class="LineNr"> 85 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L86" class="LineNr"> 86 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L87" class="LineNr"> 87 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># next-token(_test-stream, 0x20/space, slice)</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L90" class="LineNr"> 90 </span>    51/push-ECX
+<span id="L91" class="LineNr"> 91 </span>    68/push  0x20/imm32
+<span id="L92" class="LineNr"> 92 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L93" class="LineNr"> 93 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L94" class="LineNr"> 94 </span>    e8/call  <a href='069next-token.subx.html#L17'>next-token</a>/disp32
+<span id="L95" class="LineNr"> 95 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L96" class="LineNr"> 96 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L97" class="LineNr"> 97 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;start - _test-stream-&gt;data, 2, msg)</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;start - _test-stream, 14, msg)</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L100" class="LineNr">100 </span>    68/push  <span class="Constant">&quot;F - <a href='069next-token.subx.html#L64'>test-next-token</a>: start&quot;</span>/imm32
+<span id="L101" class="LineNr">101 </span>    68/push  0xe/imm32
+<span id="L102" class="LineNr">102 </span>    <span class="subxS2Comment"># . . push slice-&gt;start - _test-stream</span>
+<span id="L103" class="LineNr">103 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
+<span id="L104" class="LineNr">104 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='056write.subx.html#L193'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
+<span id="L105" class="LineNr">105 </span>    50/push-EAX
+<span id="L106" class="LineNr">106 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L107" class="LineNr">107 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L109" class="LineNr">109 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L110" class="LineNr">110 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end - _test-stream-&gt;data, 4, msg)</span>
+<span id="L111" class="LineNr">111 </span>    <span class="subxS1Comment"># . check-ints-equal(slice-&gt;end - _test-stream, 16, msg)</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L113" class="LineNr">113 </span>    68/push  <span class="Constant">&quot;F - <a href='069next-token.subx.html#L64'>test-next-token</a>: end&quot;</span>/imm32
+<span id="L114" class="LineNr">114 </span>    68/push  0x10/imm32
+<span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . push slice-&gt;end - _test-stream</span>
+<span id="L116" class="LineNr">116 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
+<span id="L117" class="LineNr">117 </span>    81          5/subop/subtract    3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              <a href='056write.subx.html#L193'>_test-stream</a>/imm32 <span class="subxComment"># subtract from EAX</span>
+<span id="L118" class="LineNr">118 </span>    50/push-EAX
+<span id="L119" class="LineNr">119 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L120" class="LineNr">120 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L122" class="LineNr">122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L123" class="LineNr">123 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L124" class="LineNr">124 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L125" class="LineNr">125 </span>    5d/pop-to-EBP
+<span id="L126" class="LineNr">126 </span>    c3/return
+<span id="L127" class="LineNr">127 </span>
+<span id="L128" class="LineNr">128 </span><span class="subxTest">test-next-token-eof</span>:
+<span id="L129" class="LineNr">129 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L130" class="LineNr">130 </span>    55/push-EBP
+<span id="L131" class="LineNr">131 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L132" class="LineNr">132 </span>    <span class="subxComment"># setup</span>
+<span id="L133" class="LineNr">133 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L134" class="LineNr">134 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L135" class="LineNr">135 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L137" class="LineNr">137 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L140" class="LineNr">140 </span>    <span class="subxComment"># var slice/ECX = {0, 0}</span>
+<span id="L141" class="LineNr">141 </span>    68/push  0/imm32/end
+<span id="L142" class="LineNr">142 </span>    68/push  0/imm32/start
+<span id="L143" class="LineNr">143 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L144" class="LineNr">144 </span>    <span class="subxComment"># write nothing to _test-stream</span>
+<span id="L145" class="LineNr">145 </span>    <span class="subxComment"># next-token(_test-stream, 0x20/space, slice)</span>
+<span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L147" class="LineNr">147 </span>    51/push-ECX
+<span id="L148" class="LineNr">148 </span>    68/push  0x20/imm32
+<span id="L149" class="LineNr">149 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L150" class="LineNr">150 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L151" class="LineNr">151 </span>    e8/call  <a href='069next-token.subx.html#L17'>next-token</a>/disp32
+<span id="L152" class="LineNr">152 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L153" class="LineNr">153 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxComment"># check-ints-equal(slice-&gt;end, slice-&gt;start, msg)</span>
+<span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L156" class="LineNr">156 </span>    68/push  <span class="Constant">&quot;F - test-next-token-eof&quot;</span>/imm32
+<span id="L157" class="LineNr">157 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L158" class="LineNr">158 </span>    ff          6/subop/push        0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ECX</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L160" class="LineNr">160 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L161" class="LineNr">161 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L162" class="LineNr">162 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L164" class="LineNr">164 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L165" class="LineNr">165 </span>    5d/pop-to-EBP
+<span id="L166" class="LineNr">166 </span>    c3/return
+<span id="L167" class="LineNr">167 </span>
+<span id="L168" class="LineNr">168 </span><span class="subxFunction">skip-chars-matching</span>:  <span class="subxComment"># in : (address stream), delimiter : byte</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L170" class="LineNr">170 </span>    55/push-EBP
+<span id="L171" class="LineNr">171 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L172" class="LineNr">172 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L173" class="LineNr">173 </span>    50/push-EAX
+<span id="L174" class="LineNr">174 </span>    51/push-ECX
+<span id="L175" class="LineNr">175 </span>    52/push-EDX
+<span id="L176" class="LineNr">176 </span>    56/push-ESI
+<span id="L177" class="LineNr">177 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L178" class="LineNr">178 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
+<span id="L180" class="LineNr">180 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L181" class="LineNr">181 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
+<span id="L182" class="LineNr">182 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
+<span id="L183" class="LineNr">183 </span>    <span class="subxComment"># EDX = delimiter</span>
+<span id="L184" class="LineNr">184 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L185" class="LineNr">185 </span><span class="Constant">$skip-chars-matching:loop</span>:
+<span id="L186" class="LineNr">186 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
+<span id="L187" class="LineNr">187 </span>    3b/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *EBX</span>
+<span id="L188" class="LineNr">188 </span>    7d/jump-if-greater-or-equal  $skip-chars-matching:end/disp8
+<span id="L189" class="LineNr">189 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
+<span id="L190" class="LineNr">190 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L191" class="LineNr">191 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L192" class="LineNr">192 </span>    <span class="subxComment"># if (EAX != delimiter) break</span>
+<span id="L193" class="LineNr">193 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EDX</span>
+<span id="L194" class="LineNr">194 </span>    75/jump-if-not-equal  $skip-chars-matching:end/disp8
+<span id="L195" class="LineNr">195 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L196" class="LineNr">196 </span>    41/inc-ECX
+<span id="L197" class="LineNr">197 </span>    eb/jump  $skip-chars-matching:loop/disp8
+<span id="L198" class="LineNr">198 </span><span class="Constant">$skip-chars-matching:end</span>:
+<span id="L199" class="LineNr">199 </span>    <span class="subxComment"># persist in-&gt;read</span>
+<span id="L200" class="LineNr">200 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
+<span id="L201" class="LineNr">201 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L202" class="LineNr">202 </span>    5e/pop-to-ESI
+<span id="L203" class="LineNr">203 </span>    5a/pop-to-EDX
+<span id="L204" class="LineNr">204 </span>    59/pop-to-ECX
+<span id="L205" class="LineNr">205 </span>    58/pop-to-EAX
+<span id="L206" class="LineNr">206 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L207" class="LineNr">207 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L208" class="LineNr">208 </span>    5d/pop-to-EBP
+<span id="L209" class="LineNr">209 </span>    c3/return
+<span id="L210" class="LineNr">210 </span>
+<span id="L211" class="LineNr">211 </span><span class="subxTest">test-skip-chars-matching</span>:
+<span id="L212" class="LineNr">212 </span>    <span class="subxComment"># setup</span>
+<span id="L213" class="LineNr">213 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L215" class="LineNr">215 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L216" class="LineNr">216 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L217" class="LineNr">217 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L219" class="LineNr">219 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L220" class="LineNr">220 </span>    <span class="subxComment"># write(_test-stream, &quot;  ab&quot;)</span>
+<span id="L221" class="LineNr">221 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L222" class="LineNr">222 </span>    68/push  <span class="Constant">&quot;  ab&quot;</span>/imm32
+<span id="L223" class="LineNr">223 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L224" class="LineNr">224 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L225" class="LineNr">225 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L226" class="LineNr">226 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L227" class="LineNr">227 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L228" class="LineNr">228 </span>    <span class="subxComment"># skip-chars-matching(_test-stream, 0x20/space)</span>
+<span id="L229" class="LineNr">229 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L230" class="LineNr">230 </span>    68/push  0x20/imm32
+<span id="L231" class="LineNr">231 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L232" class="LineNr">232 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L233" class="LineNr">233 </span>    e8/call  <a href='069next-token.subx.html#L168'>skip-chars-matching</a>/disp32
+<span id="L234" class="LineNr">234 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L235" class="LineNr">235 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L236" class="LineNr">236 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
+<span id="L237" class="LineNr">237 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L238" class="LineNr">238 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching&quot;</span>/imm32
+<span id="L239" class="LineNr">239 </span>    68/push  2/imm32
+<span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L241" class="LineNr">241 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L242" class="LineNr">242 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L243" class="LineNr">243 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L244" class="LineNr">244 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L245" class="LineNr">245 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L246" class="LineNr">246 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L247" class="LineNr">247 </span>    <span class="subxComment"># end</span>
+<span id="L248" class="LineNr">248 </span>    c3/return
+<span id="L249" class="LineNr">249 </span>
+<span id="L250" class="LineNr">250 </span><span class="subxTest">test-skip-chars-matching-none</span>:
+<span id="L251" class="LineNr">251 </span>    <span class="subxComment"># setup</span>
+<span id="L252" class="LineNr">252 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L253" class="LineNr">253 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L254" class="LineNr">254 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L255" class="LineNr">255 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L256" class="LineNr">256 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L257" class="LineNr">257 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L258" class="LineNr">258 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L259" class="LineNr">259 </span>    <span class="subxComment"># write(_test-stream, &quot;ab&quot;)</span>
+<span id="L260" class="LineNr">260 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L261" class="LineNr">261 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L262" class="LineNr">262 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L263" class="LineNr">263 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L264" class="LineNr">264 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L265" class="LineNr">265 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L266" class="LineNr">266 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L267" class="LineNr">267 </span>    <span class="subxComment"># skip-chars-matching(_test-stream, 0x20/space)</span>
+<span id="L268" class="LineNr">268 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L269" class="LineNr">269 </span>    68/push  0x20/imm32
+<span id="L270" class="LineNr">270 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L271" class="LineNr">271 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L272" class="LineNr">272 </span>    e8/call  <a href='069next-token.subx.html#L168'>skip-chars-matching</a>/disp32
+<span id="L273" class="LineNr">273 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L274" class="LineNr">274 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L275" class="LineNr">275 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 0, msg)</span>
+<span id="L276" class="LineNr">276 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L277" class="LineNr">277 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-matching-none&quot;</span>/imm32
+<span id="L278" class="LineNr">278 </span>    68/push  0/imm32
+<span id="L279" class="LineNr">279 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L280" class="LineNr">280 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L281" class="LineNr">281 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L282" class="LineNr">282 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L283" class="LineNr">283 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L284" class="LineNr">284 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L285" class="LineNr">285 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L286" class="LineNr">286 </span>    <span class="subxComment"># end</span>
+<span id="L287" class="LineNr">287 </span>    c3/return
+<span id="L288" class="LineNr">288 </span>
+<span id="L289" class="LineNr">289 </span><span class="subxComment"># minor fork of 'skip-chars-matching'</span>
+<span id="L290" class="LineNr">290 </span><span class="subxFunction">skip-chars-not-matching</span>:  <span class="subxComment"># in : (address stream), delimiter : byte</span>
+<span id="L291" class="LineNr">291 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L292" class="LineNr">292 </span>    55/push-EBP
+<span id="L293" class="LineNr">293 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L294" class="LineNr">294 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L295" class="LineNr">295 </span>    50/push-EAX
+<span id="L296" class="LineNr">296 </span>    51/push-ECX
+<span id="L297" class="LineNr">297 </span>    52/push-EDX
+<span id="L298" class="LineNr">298 </span>    56/push-ESI
+<span id="L299" class="LineNr">299 </span>    <span class="subxComment"># ESI = in</span>
+<span id="L300" class="LineNr">300 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L301" class="LineNr">301 </span>    <span class="subxComment"># ECX = in-&gt;read</span>
+<span id="L302" class="LineNr">302 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to ECX</span>
+<span id="L303" class="LineNr">303 </span>    <span class="subxComment"># EBX = in-&gt;write</span>
+<span id="L304" class="LineNr">304 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EBX</span>
+<span id="L305" class="LineNr">305 </span>    <span class="subxComment"># EDX = delimiter</span>
+<span id="L306" class="LineNr">306 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L307" class="LineNr">307 </span><span class="Constant">$skip-chars-not-matching:loop</span>:
+<span id="L308" class="LineNr">308 </span>    <span class="subxComment"># if (in-&gt;read &gt;= in-&gt;write) break</span>
+<span id="L309" class="LineNr">309 </span>    3b/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *EBX</span>
+<span id="L310" class="LineNr">310 </span>    7d/jump-if-greater-or-equal  $skip-chars-not-matching:end/disp8
+<span id="L311" class="LineNr">311 </span>    <span class="subxComment"># EAX = in-&gt;data[in-&gt;read]</span>
+<span id="L312" class="LineNr">312 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L313" class="LineNr">313 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+12) to AL</span>
+<span id="L314" class="LineNr">314 </span>    <span class="subxComment"># if (EAX == delimiter) break</span>
+<span id="L315" class="LineNr">315 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EDX</span>
+<span id="L316" class="LineNr">316 </span>    74/jump-if-equal  $skip-chars-not-matching:end/disp8
+<span id="L317" class="LineNr">317 </span>    <span class="subxComment"># ++in-&gt;read</span>
+<span id="L318" class="LineNr">318 </span>    41/inc-ECX
+<span id="L319" class="LineNr">319 </span>    eb/jump  $skip-chars-not-matching:loop/disp8
+<span id="L320" class="LineNr">320 </span><span class="Constant">$skip-chars-not-matching:end</span>:
+<span id="L321" class="LineNr">321 </span>    <span class="subxComment"># persist in-&gt;read</span>
+<span id="L322" class="LineNr">322 </span>    89/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(ESI+4)</span>
+<span id="L323" class="LineNr">323 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L324" class="LineNr">324 </span>    5e/pop-to-ESI
+<span id="L325" class="LineNr">325 </span>    5a/pop-to-EDX
+<span id="L326" class="LineNr">326 </span>    59/pop-to-ECX
+<span id="L327" class="LineNr">327 </span>    58/pop-to-EAX
+<span id="L328" class="LineNr">328 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L329" class="LineNr">329 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L330" class="LineNr">330 </span>    5d/pop-to-EBP
+<span id="L331" class="LineNr">331 </span>    c3/return
+<span id="L332" class="LineNr">332 </span>
+<span id="L333" class="LineNr">333 </span><span class="subxTest">test-skip-chars-not-matching</span>:
+<span id="L334" class="LineNr">334 </span>    <span class="subxComment"># setup</span>
+<span id="L335" class="LineNr">335 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L336" class="LineNr">336 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L337" class="LineNr">337 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L338" class="LineNr">338 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L339" class="LineNr">339 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L340" class="LineNr">340 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L341" class="LineNr">341 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L342" class="LineNr">342 </span>    <span class="subxComment"># write(_test-stream, &quot;ab &quot;)</span>
+<span id="L343" class="LineNr">343 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L344" class="LineNr">344 </span>    68/push  <span class="Constant">&quot;ab &quot;</span>/imm32
+<span id="L345" class="LineNr">345 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L346" class="LineNr">346 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L347" class="LineNr">347 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L348" class="LineNr">348 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L349" class="LineNr">349 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L350" class="LineNr">350 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
+<span id="L351" class="LineNr">351 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L352" class="LineNr">352 </span>    68/push  0x20/imm32
+<span id="L353" class="LineNr">353 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L354" class="LineNr">354 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L355" class="LineNr">355 </span>    e8/call  <a href='069next-token.subx.html#L290'>skip-chars-not-matching</a>/disp32
+<span id="L356" class="LineNr">356 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L357" class="LineNr">357 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L358" class="LineNr">358 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
+<span id="L359" class="LineNr">359 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L360" class="LineNr">360 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching&quot;</span>/imm32
+<span id="L361" class="LineNr">361 </span>    68/push  2/imm32
+<span id="L362" class="LineNr">362 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L363" class="LineNr">363 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L364" class="LineNr">364 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L365" class="LineNr">365 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L366" class="LineNr">366 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L367" class="LineNr">367 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L368" class="LineNr">368 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L369" class="LineNr">369 </span>    <span class="subxComment"># end</span>
+<span id="L370" class="LineNr">370 </span>    c3/return
+<span id="L371" class="LineNr">371 </span>
+<span id="L372" class="LineNr">372 </span><span class="subxTest">test-skip-chars-not-matching-none</span>:
+<span id="L373" class="LineNr">373 </span>    <span class="subxComment"># setup</span>
+<span id="L374" class="LineNr">374 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L375" class="LineNr">375 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L376" class="LineNr">376 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L377" class="LineNr">377 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L378" class="LineNr">378 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L379" class="LineNr">379 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L380" class="LineNr">380 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L381" class="LineNr">381 </span>    <span class="subxComment"># write(_test-stream, &quot; ab&quot;)</span>
+<span id="L382" class="LineNr">382 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L383" class="LineNr">383 </span>    68/push  <span class="Constant">&quot; ab&quot;</span>/imm32
+<span id="L384" class="LineNr">384 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L385" class="LineNr">385 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L386" class="LineNr">386 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L387" class="LineNr">387 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L388" class="LineNr">388 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L389" class="LineNr">389 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
+<span id="L390" class="LineNr">390 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L391" class="LineNr">391 </span>    68/push  0x20/imm32
+<span id="L392" class="LineNr">392 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L393" class="LineNr">393 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L394" class="LineNr">394 </span>    e8/call  <a href='069next-token.subx.html#L290'>skip-chars-not-matching</a>/disp32
+<span id="L395" class="LineNr">395 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L396" class="LineNr">396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L397" class="LineNr">397 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 0, msg)</span>
+<span id="L398" class="LineNr">398 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L399" class="LineNr">399 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-none&quot;</span>/imm32
+<span id="L400" class="LineNr">400 </span>    68/push  0/imm32
+<span id="L401" class="LineNr">401 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L402" class="LineNr">402 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L403" class="LineNr">403 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L404" class="LineNr">404 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L405" class="LineNr">405 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L406" class="LineNr">406 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L407" class="LineNr">407 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L408" class="LineNr">408 </span>    <span class="subxComment"># end</span>
+<span id="L409" class="LineNr">409 </span>    c3/return
+<span id="L410" class="LineNr">410 </span>
+<span id="L411" class="LineNr">411 </span><span class="subxTest">test-skip-chars-not-matching-all</span>:
+<span id="L412" class="LineNr">412 </span>    <span class="subxComment"># setup</span>
+<span id="L413" class="LineNr">413 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
+<span id="L414" class="LineNr">414 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L415" class="LineNr">415 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L416" class="LineNr">416 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L417" class="LineNr">417 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
+<span id="L418" class="LineNr">418 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L419" class="LineNr">419 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L420" class="LineNr">420 </span>    <span class="subxComment"># write(_test-stream, &quot;ab&quot;)</span>
+<span id="L421" class="LineNr">421 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L422" class="LineNr">422 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
+<span id="L423" class="LineNr">423 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L424" class="LineNr">424 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L425" class="LineNr">425 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
+<span id="L426" class="LineNr">426 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L427" class="LineNr">427 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L428" class="LineNr">428 </span>    <span class="subxComment"># skip-chars-not-matching(_test-stream, 0x20/space)</span>
+<span id="L429" class="LineNr">429 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L430" class="LineNr">430 </span>    68/push  0x20/imm32
+<span id="L431" class="LineNr">431 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L432" class="LineNr">432 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L433" class="LineNr">433 </span>    e8/call  <a href='069next-token.subx.html#L290'>skip-chars-not-matching</a>/disp32
+<span id="L434" class="LineNr">434 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L435" class="LineNr">435 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L436" class="LineNr">436 </span>    <span class="subxComment"># check-ints-equal(_test-stream-&gt;read, 2, msg)</span>
+<span id="L437" class="LineNr">437 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L438" class="LineNr">438 </span>    68/push  <span class="Constant">&quot;F - test-skip-chars-not-matching-all&quot;</span>/imm32
+<span id="L439" class="LineNr">439 </span>    68/push  2/imm32
+<span id="L440" class="LineNr">440 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;read</span>
+<span id="L441" class="LineNr">441 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L442" class="LineNr">442 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L443" class="LineNr">443 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L444" class="LineNr">444 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L445" class="LineNr">445 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L446" class="LineNr">446 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L447" class="LineNr">447 </span>    <span class="subxComment"># end</span>
+<span id="L448" class="LineNr">448 </span>    c3/return
+<span id="L449" class="LineNr">449 </span>
+<span id="L450" class="LineNr">450 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index de7cf5c0..34312bf0 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -109,7 +109,7 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr"> 46 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
 <span id="L47" class="LineNr"> 47 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L49" class="LineNr"> 49 </span>    e8/call  <a href='../052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L49" class="LineNr"> 49 </span>    e8/call  <a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS1Comment"># . check result</span>
diff --git a/html/subx/apps/crenshaw2-1b.subx.html b/html/subx/apps/crenshaw2-1b.subx.html
index b059f0fc..cd692a32 100644
--- a/html/subx/apps/crenshaw2-1b.subx.html
+++ b/html/subx/apps/crenshaw2-1b.subx.html
@@ -109,7 +109,7 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr"> 46 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
 <span id="L47" class="LineNr"> 47 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L49" class="LineNr"> 49 </span>    e8/call  <a href='../052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L49" class="LineNr"> 49 </span>    e8/call  <a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS1Comment"># . check result</span>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 2999bbe9..0beb2d21 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L31" class="LineNr"> 31 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
 <span id="L32" class="LineNr"> 32 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L33" class="LineNr"> 33 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L34" class="LineNr"> 34 </span>    e8/call  <a href='../052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L34" class="LineNr"> 34 </span>    e8/call  <a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L36" class="LineNr"> 36 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxS1Comment"># . check result</span>
diff --git a/html/subx/apps/handle.subx.html b/html/subx/apps/handle.subx.html
index f0d9d792..cd0d569c 100644
--- a/html/subx/apps/handle.subx.html
+++ b/html/subx/apps/handle.subx.html
@@ -23,6 +23,7 @@ a { color:inherit; }
 .subxTest { color: #5f8700; }
 .Constant { color: #008787; }
 .Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -123,13 +124,13 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr"> 63 </span><span class="Constant">$new:continue</span>:
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># otherwise:</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># ECX = *Next-alloc-id</span>
-<span id="L66" class="LineNr"> 66 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy *Next-alloc-id to ECX</span>
+<span id="L66" class="LineNr"> 66 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy *Next-alloc-id to ECX</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxComment"># *EAX = *Next-alloc-id/ECX</span>
 <span id="L68" class="LineNr"> 68 </span>    89/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EAX</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># out-&gt;alloc_id = *Next-alloc-id</span>
 <span id="L70" class="LineNr"> 70 </span>    89/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EDX</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="subxComment"># increment *Next-alloc-id</span>
-<span id="L72" class="LineNr"> 72 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># increment *Next-alloc-id</span>
+<span id="L72" class="LineNr"> 72 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># increment *Next-alloc-id</span>
 <span id="L73" class="LineNr"> 73 </span><span class="Constant">$new:end</span>:
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L75" class="LineNr"> 75 </span>    5a/pop-to-EDX
@@ -145,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr"> 85 </span>    55/push-EBP
 <span id="L86" class="LineNr"> 86 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="subxComment"># *Next-alloc-id = 0x34</span>
-<span id="L88" class="LineNr"> 88 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32  0x34/imm32        <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L88" class="LineNr"> 88 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32  0x34/imm32        <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
 <span id="L90" class="LineNr"> 90 </span>    68/push  0/imm32/address
 <span id="L91" class="LineNr"> 91 </span>    68/push  0/imm32/alloc-id
@@ -182,14 +183,14 @@ if ('onhashchange' in window) {
 <span id="L122" class="LineNr">122 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L123" class="LineNr">123 </span>    68/push  <span class="Constant">&quot;F - <a href='handle.subx.html#L83'>test-new</a>: next alloc id&quot;</span>/imm32
 <span id="L124" class="LineNr">124 </span>    68/push  0x35/imm32
-<span id="L125" class="LineNr">125 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L125" class="LineNr">125 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L127" class="LineNr">127 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L129" class="LineNr">129 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L130" class="LineNr">130 </span>    <span class="subxComment"># clean up</span>
 <span id="L131" class="LineNr">131 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L132" class="LineNr">132 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L132" class="LineNr">132 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L133" class="LineNr">133 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L134" class="LineNr">134 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L135" class="LineNr">135 </span>    5d/pop-to-EBP
@@ -200,7 +201,7 @@ if ('onhashchange' in window) {
 <span id="L140" class="LineNr">140 </span>    55/push-EBP
 <span id="L141" class="LineNr">141 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L142" class="LineNr">142 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 0x34</span>
-<span id="L143" class="LineNr">143 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32  0x34/imm32  <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L143" class="LineNr">143 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32  0x34/imm32  <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L144" class="LineNr">144 </span>    <span class="subxComment"># define an allocation-descriptor with no space left</span>
 <span id="L145" class="LineNr">145 </span>    <span class="subxS1Comment"># . var ad/EAX : (address allocation-descriptor) = {0x10, 0x10}</span>
 <span id="L146" class="LineNr">146 </span>    68/push  0x10/imm32/limit
@@ -244,14 +245,14 @@ if ('onhashchange' in window) {
 <span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L185" class="LineNr">185 </span>    68/push  <span class="Constant">&quot;F - <a href='handle.subx.html#L138'>test-new-failure</a>: next alloc id&quot;</span>/imm32
 <span id="L186" class="LineNr">186 </span>    68/push  0x34/imm32
-<span id="L187" class="LineNr">187 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L187" class="LineNr">187 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L189" class="LineNr">189 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L190" class="LineNr">190 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L191" class="LineNr">191 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L192" class="LineNr">192 </span>    <span class="subxComment"># clean up</span>
 <span id="L193" class="LineNr">193 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L194" class="LineNr">194 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L194" class="LineNr">194 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L195" class="LineNr">195 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L196" class="LineNr">196 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L197" class="LineNr">197 </span>    5d/pop-to-EBP
@@ -261,169 +262,164 @@ if ('onhashchange' in window) {
 <span id="L201" class="LineNr">201 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L202" class="LineNr">202 </span>    55/push-EBP
 <span id="L203" class="LineNr">203 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L204" class="LineNr">204 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L205" class="LineNr">205 </span>    51/push-ECX
-<span id="L206" class="LineNr">206 </span>    52/push-EDX
-<span id="L207" class="LineNr">207 </span>    <span class="subxComment"># ECX = handle</span>
-<span id="L208" class="LineNr">208 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
-<span id="L209" class="LineNr">209 </span>    <span class="subxComment"># EDX = handle-&gt;alloc_id</span>
-<span id="L210" class="LineNr">210 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EDX</span>
-<span id="L211" class="LineNr">211 </span>    <span class="subxComment"># EAX = handle-&gt;address</span>
-<span id="L212" class="LineNr">212 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EAX</span>
-<span id="L213" class="LineNr">213 </span>    <span class="subxComment"># if (*EAX == EDX) return</span>
-<span id="L214" class="LineNr">214 </span>    39/compare                      0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EAX and EDX</span>
-<span id="L215" class="LineNr">215 </span>    74/jump-if-equal  $lookup:success/disp8
-<span id="L216" class="LineNr">216 </span>    <span class="subxComment"># otherwise print a message and exit</span>
-<span id="L217" class="LineNr">217 </span>    <span class="subxComment"># hard-coded abort just to minimize args and simplify calls</span>
-<span id="L218" class="LineNr">218 </span>    <span class="subxComment"># TODO: emit stack trace, etc.</span>
-<span id="L219" class="LineNr">219 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
-<span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L221" class="LineNr">221 </span>    68/push  <span class="Constant">&quot;lookup failed&quot;</span>/imm32
-<span id="L222" class="LineNr">222 </span>    68/push  2/imm32/stderr
-<span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L224" class="LineNr">224 </span>    e8/call  <a href='../050_write.subx.html#L14'>_write</a>/disp32
-<span id="L225" class="LineNr">225 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L226" class="LineNr">226 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L227" class="LineNr">227 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
-<span id="L228" class="LineNr">228 </span>    bb/copy-to-EBX  1/imm32/exit-status
-<span id="L229" class="LineNr">229 </span>    b8/copy-to-EAX  1/imm32/exit
-<span id="L230" class="LineNr">230 </span>    cd/syscall  0x80/imm8
-<span id="L231" class="LineNr">231 </span><span class="Constant">$lookup:success</span>:
-<span id="L232" class="LineNr">232 </span>    <span class="subxComment"># increment past payload alloc id</span>
-<span id="L233" class="LineNr">233 </span>    05/add-to-EAX  4/imm32
-<span id="L234" class="LineNr">234 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L235" class="LineNr">235 </span>    5a/pop-to-EDX
-<span id="L236" class="LineNr">236 </span>    59/pop-to-ECX
-<span id="L237" class="LineNr">237 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L238" class="LineNr">238 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L239" class="LineNr">239 </span>    5d/pop-to-EBP
-<span id="L240" class="LineNr">240 </span>    c3/return
-<span id="L241" class="LineNr">241 </span>
-<span id="L242" class="LineNr">242 </span><span class="subxTest">test-lookup-success</span>:
-<span id="L243" class="LineNr">243 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L244" class="LineNr">244 </span>    55/push-EBP
-<span id="L245" class="LineNr">245 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L246" class="LineNr">246 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L247" class="LineNr">247 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
-<span id="L248" class="LineNr">248 </span>    68/push  0/imm32/address
-<span id="L249" class="LineNr">249 </span>    68/push  0/imm32/alloc-id
-<span id="L250" class="LineNr">250 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L251" class="LineNr">251 </span>    <span class="subxComment"># var old_top/EDX = Heap-&gt;curr</span>
-<span id="L252" class="LineNr">252 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Heap to EDX</span>
-<span id="L253" class="LineNr">253 </span>    <span class="subxComment"># new(Heap, 2, handle)</span>
-<span id="L254" class="LineNr">254 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L255" class="LineNr">255 </span>    51/push-ECX
-<span id="L256" class="LineNr">256 </span>    68/push  2/imm32/size
-<span id="L257" class="LineNr">257 </span>    68/push  <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/imm32
-<span id="L258" class="LineNr">258 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L259" class="LineNr">259 </span>    e8/call  <a href='handle.subx.html#L35'>new</a>/disp32
-<span id="L260" class="LineNr">260 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L261" class="LineNr">261 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L262" class="LineNr">262 </span>    <span class="subxComment"># EAX = lookup(handle)</span>
-<span id="L263" class="LineNr">263 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L264" class="LineNr">264 </span>    51/push-ECX
-<span id="L265" class="LineNr">265 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L266" class="LineNr">266 </span>    e8/call  <a href='handle.subx.html#L200'>lookup</a>/disp32
-<span id="L267" class="LineNr">267 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L268" class="LineNr">268 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L269" class="LineNr">269 </span>    <span class="subxComment"># EAX contains old top of Heap, except skipping the alloc id in the payload</span>
-<span id="L270" class="LineNr">270 </span>    <span class="subxS1Comment"># . check-ints-equal(EAX, old_top+4, msg)</span>
-<span id="L271" class="LineNr">271 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L272" class="LineNr">272 </span>    68/push  <span class="Constant">&quot;F - test-lookup-success&quot;</span>/imm32
-<span id="L273" class="LineNr">273 </span>    81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EDX</span>
-<span id="L274" class="LineNr">274 </span>    52/push-EDX
-<span id="L275" class="LineNr">275 </span>    50/push-EAX
-<span id="L276" class="LineNr">276 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L277" class="LineNr">277 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L278" class="LineNr">278 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L279" class="LineNr">279 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L280" class="LineNr">280 </span>    <span class="subxComment"># clean up</span>
-<span id="L281" class="LineNr">281 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L282" class="LineNr">282 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
-<span id="L283" class="LineNr">283 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L284" class="LineNr">284 </span>    5a/pop-to-EDX
-<span id="L285" class="LineNr">285 </span>    59/pop-to-ECX
-<span id="L286" class="LineNr">286 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L287" class="LineNr">287 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L288" class="LineNr">288 </span>    5d/pop-to-EBP
-<span id="L289" class="LineNr">289 </span>    c3/return
-<span id="L290" class="LineNr">290 </span>
-<span id="L291" class="LineNr">291 </span><span class="subxTest">test-lookup-failure</span>:
-<span id="L292" class="LineNr">292 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L293" class="LineNr">293 </span>    55/push-EBP
-<span id="L294" class="LineNr">294 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
-<span id="L295" class="LineNr">295 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L296" class="LineNr">296 </span>    50/push-EAX
-<span id="L297" class="LineNr">297 </span>    51/push-ECX
-<span id="L298" class="LineNr">298 </span>    52/push-EDX
-<span id="L299" class="LineNr">299 </span>    <span class="subxComment"># var h1/ECX = {0, 0}</span>
-<span id="L300" class="LineNr">300 </span>    68/push  0/imm32/address
-<span id="L301" class="LineNr">301 </span>    68/push  0/imm32/alloc-id
-<span id="L302" class="LineNr">302 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
-<span id="L303" class="LineNr">303 </span>    <span class="subxComment"># var old_top/EBX = Heap-&gt;curr</span>
-<span id="L304" class="LineNr">304 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Heap to EBX</span>
-<span id="L305" class="LineNr">305 </span>    <span class="subxComment"># first allocation, to h1</span>
-<span id="L306" class="LineNr">306 </span>    <span class="subxS1Comment"># . new(Heap, 2, h1)</span>
-<span id="L307" class="LineNr">307 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L308" class="LineNr">308 </span>    51/push-ECX
-<span id="L309" class="LineNr">309 </span>    68/push  2/imm32/size
-<span id="L310" class="LineNr">310 </span>    68/push  <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/imm32
-<span id="L311" class="LineNr">311 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L312" class="LineNr">312 </span>    e8/call  <a href='handle.subx.html#L35'>new</a>/disp32
-<span id="L313" class="LineNr">313 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L314" class="LineNr">314 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L315" class="LineNr">315 </span>    <span class="subxComment"># reset Heap-&gt;curr to mimic reclamation</span>
-<span id="L316" class="LineNr">316 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy EBX to *Heap</span>
-<span id="L317" class="LineNr">317 </span>    <span class="subxComment"># second allocation that returns the same address as the first</span>
-<span id="L318" class="LineNr">318 </span>    <span class="subxComment"># var h2/EDX = {0, 0}</span>
-<span id="L319" class="LineNr">319 </span>    68/push  0/imm32/address
-<span id="L320" class="LineNr">320 </span>    68/push  0/imm32/alloc-id
-<span id="L321" class="LineNr">321 </span>    89/copy                         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDX</span>
-<span id="L322" class="LineNr">322 </span>    <span class="subxS1Comment"># . new(Heap, 2, h2)</span>
-<span id="L323" class="LineNr">323 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L324" class="LineNr">324 </span>    52/push-EDX
-<span id="L325" class="LineNr">325 </span>    68/push  2/imm32/size
-<span id="L326" class="LineNr">326 </span>    68/push  <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/imm32
-<span id="L327" class="LineNr">327 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L328" class="LineNr">328 </span>    e8/call  <a href='handle.subx.html#L35'>new</a>/disp32
-<span id="L329" class="LineNr">329 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L330" class="LineNr">330 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L331" class="LineNr">331 </span>    <span class="subxComment"># check-ints-equal(h1-&gt;address, h2-&gt;address, msg)</span>
-<span id="L332" class="LineNr">332 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L333" class="LineNr">333 </span>    68/push  <span class="Constant">&quot;F - test-lookup-failure&quot;</span>/imm32
-<span id="L334" class="LineNr">334 </span>    ff          6/subop/push        1/mod/*+disp8   2/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EDX+4)</span>
-<span id="L335" class="LineNr">335 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
-<span id="L336" class="LineNr">336 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L337" class="LineNr">337 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L338" class="LineNr">338 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L339" class="LineNr">339 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
-<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># lookup(h1) should crash</span>
-<span id="L341" class="LineNr">341 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L342" class="LineNr">342 </span>    51/push-ECX
-<span id="L343" class="LineNr">343 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L344" class="LineNr">344 </span>    e8/call  <a href='handle.subx.html#L200'>lookup</a>/disp32
-<span id="L345" class="LineNr">345 </span>    <span class="subxComment"># should never get past this point</span>
-<span id="L346" class="LineNr">346 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L347" class="LineNr">347 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L348" class="LineNr">348 </span>    <span class="subxComment"># clean up</span>
-<span id="L349" class="LineNr">349 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L350" class="LineNr">350 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L363'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
-<span id="L351" class="LineNr">351 </span>    <span class="subxS1Comment"># . restore registers</span>
-<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>    58/pop-to-EAX
-<span id="L355" class="LineNr">355 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L356" class="LineNr">356 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L357" class="LineNr">357 </span>    5d/pop-to-EBP
-<span id="L358" class="LineNr">358 </span>    c3/return
-<span id="L359" class="LineNr">359 </span>
-<span id="L360" class="LineNr">360 </span>== data
-<span id="L361" class="LineNr">361 </span>
-<span id="L362" class="LineNr">362 </span><span class="subxComment"># Monotonically increasing counter for calls to 'new'</span>
-<span id="L363" class="LineNr">363 </span><span class="SpecialChar">Next-alloc-id</span>:
-<span id="L364" class="LineNr">364 </span>    01 00 00 00  <span class="subxComment"># 1</span>
-<span id="L365" class="LineNr">365 </span>
-<span id="L366" class="LineNr">366 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L204" class="LineNr">204 </span>    <span class="subxH1Comment"># - as a proof of concept for future inlining, uses no general-purpose registers besides the output (EAX)</span>
+<span id="L205" class="LineNr">205 </span>    <span class="subxComment"># EAX = handle</span>
+<span id="L206" class="LineNr">206 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L207" class="LineNr">207 </span>    <span class="subxH1Comment"># - inline {</span>
+<span id="L208" class="LineNr">208 </span>    <span class="subxComment"># push handle-&gt;address</span>
+<span id="L209" class="LineNr">209 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L210" class="LineNr">210 </span>    <span class="subxComment"># EAX = handle-&gt;alloc_id</span>
+<span id="L211" class="LineNr">211 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to EAX</span>
+<span id="L212" class="LineNr">212 </span>    <span class="subxComment"># if (EAX != *ESP) abort</span>
+<span id="L213" class="LineNr">213 </span>    39/compare                      0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *ESP and EAX</span>
+<span id="L214" class="LineNr">214 </span>    75/jump-if-not-equal  $lookup:fail/disp8
+<span id="L215" class="LineNr">215 </span>    <span class="subxComment"># return ESP+4</span>
+<span id="L216" class="LineNr">216 </span>    58/pop-to-EAX
+<span id="L217" class="LineNr">217 </span>    05/add-to-EAX  4/imm32
+<span id="L218" class="LineNr">218 </span>    <span class="subxH1Comment"># - }</span>
+<span id="L219" class="LineNr">219 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L220" class="LineNr">220 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L221" class="LineNr">221 </span>    5d/pop-to-EBP
+<span id="L222" class="LineNr">222 </span>    c3/return
+<span id="L223" class="LineNr">223 </span><span class="Constant">$lookup:fail</span>:
+<span id="L224" class="LineNr">224 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
+<span id="L225" class="LineNr">225 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L226" class="LineNr">226 </span>    68/push  <span class="Constant">&quot;lookup failed&quot;</span>/imm32
+<span id="L227" class="LineNr">227 </span>    68/push  2/imm32/stderr
+<span id="L228" class="LineNr">228 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L229" class="LineNr">229 </span>    e8/call  <a href='../050_write.subx.html#L14'>_write</a>/disp32
+<span id="L230" class="LineNr">230 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L231" class="LineNr">231 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L232" class="LineNr">232 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
+<span id="L233" class="LineNr">233 </span>    bb/copy-to-EBX  1/imm32/exit-status
+<span id="L234" class="LineNr">234 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L235" class="LineNr">235 </span>    cd/syscall  0x80/imm8
+<span id="L236" class="LineNr">236 </span>
+<span id="L237" class="LineNr">237 </span><span class="subxTest">test-lookup-success</span>:
+<span id="L238" class="LineNr">238 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L239" class="LineNr">239 </span>    55/push-EBP
+<span id="L240" class="LineNr">240 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L241" class="LineNr">241 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L242" class="LineNr">242 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
+<span id="L243" class="LineNr">243 </span>    68/push  0/imm32/address
+<span id="L244" class="LineNr">244 </span>    68/push  0/imm32/alloc-id
+<span id="L245" class="LineNr">245 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L246" class="LineNr">246 </span>    <span class="subxComment"># var old_top/EDX = Heap-&gt;curr</span>
+<span id="L247" class="LineNr">247 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Heap to EDX</span>
+<span id="L248" class="LineNr">248 </span>    <span class="subxComment"># new(Heap, 2, handle)</span>
+<span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L250" class="LineNr">250 </span>    51/push-ECX
+<span id="L251" class="LineNr">251 </span>    68/push  2/imm32/size
+<span id="L252" class="LineNr">252 </span>    68/push  <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/imm32
+<span id="L253" class="LineNr">253 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L254" class="LineNr">254 </span>    e8/call  <a href='handle.subx.html#L35'>new</a>/disp32
+<span id="L255" class="LineNr">255 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L256" class="LineNr">256 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L257" class="LineNr">257 </span>    <span class="subxComment"># EAX = lookup(handle)</span>
+<span id="L258" class="LineNr">258 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L259" class="LineNr">259 </span>    51/push-ECX
+<span id="L260" class="LineNr">260 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L261" class="LineNr">261 </span>    e8/call  <a href='handle.subx.html#L200'>lookup</a>/disp32
+<span id="L262" class="LineNr">262 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L263" class="LineNr">263 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L264" class="LineNr">264 </span>    <span class="subxComment"># EAX contains old top of Heap, except skipping the alloc id in the payload</span>
+<span id="L265" class="LineNr">265 </span>    <span class="subxS1Comment"># . check-ints-equal(EAX, old_top+4, msg)</span>
+<span id="L266" class="LineNr">266 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L267" class="LineNr">267 </span>    68/push  <span class="Constant">&quot;F - test-lookup-success&quot;</span>/imm32
+<span id="L268" class="LineNr">268 </span>    81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EDX</span>
+<span id="L269" class="LineNr">269 </span>    52/push-EDX
+<span id="L270" class="LineNr">270 </span>    50/push-EAX
+<span id="L271" class="LineNr">271 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L272" class="LineNr">272 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L273" class="LineNr">273 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L274" class="LineNr">274 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L275" class="LineNr">275 </span>    <span class="subxComment"># clean up</span>
+<span id="L276" class="LineNr">276 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
+<span id="L277" class="LineNr">277 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L278" class="LineNr">278 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L279" class="LineNr">279 </span>    5a/pop-to-EDX
+<span id="L280" class="LineNr">280 </span>    59/pop-to-ECX
+<span id="L281" class="LineNr">281 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L282" class="LineNr">282 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L283" class="LineNr">283 </span>    5d/pop-to-EBP
+<span id="L284" class="LineNr">284 </span>    c3/return
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span><span class="subxTest">test-lookup-failure</span>:
+<span id="L287" class="LineNr">287 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L288" class="LineNr">288 </span>    55/push-EBP
+<span id="L289" class="LineNr">289 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L290" class="LineNr">290 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L291" class="LineNr">291 </span>    50/push-EAX
+<span id="L292" class="LineNr">292 </span>    51/push-ECX
+<span id="L293" class="LineNr">293 </span>    52/push-EDX
+<span id="L294" class="LineNr">294 </span>    <span class="subxComment"># var h1/ECX = {0, 0}</span>
+<span id="L295" class="LineNr">295 </span>    68/push  0/imm32/address
+<span id="L296" class="LineNr">296 </span>    68/push  0/imm32/alloc-id
+<span id="L297" class="LineNr">297 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L298" class="LineNr">298 </span>    <span class="subxComment"># var old_top/EBX = Heap-&gt;curr</span>
+<span id="L299" class="LineNr">299 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Heap to EBX</span>
+<span id="L300" class="LineNr">300 </span>    <span class="subxComment"># first allocation, to h1</span>
+<span id="L301" class="LineNr">301 </span>    <span class="subxS1Comment"># . new(Heap, 2, h1)</span>
+<span id="L302" class="LineNr">302 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L303" class="LineNr">303 </span>    51/push-ECX
+<span id="L304" class="LineNr">304 </span>    68/push  2/imm32/size
+<span id="L305" class="LineNr">305 </span>    68/push  <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/imm32
+<span id="L306" class="LineNr">306 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L307" class="LineNr">307 </span>    e8/call  <a href='handle.subx.html#L35'>new</a>/disp32
+<span id="L308" class="LineNr">308 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L309" class="LineNr">309 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L310" class="LineNr">310 </span>    <span class="subxComment"># reset Heap-&gt;curr to mimic reclamation</span>
+<span id="L311" class="LineNr">311 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy EBX to *Heap</span>
+<span id="L312" class="LineNr">312 </span>    <span class="subxComment"># second allocation that returns the same address as the first</span>
+<span id="L313" class="LineNr">313 </span>    <span class="subxComment"># var h2/EDX = {0, 0}</span>
+<span id="L314" class="LineNr">314 </span>    68/push  0/imm32/address
+<span id="L315" class="LineNr">315 </span>    68/push  0/imm32/alloc-id
+<span id="L316" class="LineNr">316 </span>    89/copy                         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EDX</span>
+<span id="L317" class="LineNr">317 </span>    <span class="subxS1Comment"># . new(Heap, 2, h2)</span>
+<span id="L318" class="LineNr">318 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L319" class="LineNr">319 </span>    52/push-EDX
+<span id="L320" class="LineNr">320 </span>    68/push  2/imm32/size
+<span id="L321" class="LineNr">321 </span>    68/push  <span class="SpecialChar"><a href='../066allocate.subx.html#L23'>Heap</a></span>/imm32
+<span id="L322" class="LineNr">322 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L323" class="LineNr">323 </span>    e8/call  <a href='handle.subx.html#L35'>new</a>/disp32
+<span id="L324" class="LineNr">324 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L325" class="LineNr">325 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L326" class="LineNr">326 </span>    <span class="subxComment"># check-ints-equal(h1-&gt;address, h2-&gt;address, msg)</span>
+<span id="L327" class="LineNr">327 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L328" class="LineNr">328 </span>    68/push  <span class="Constant">&quot;F - test-lookup-failure&quot;</span>/imm32
+<span id="L329" class="LineNr">329 </span>    ff          6/subop/push        1/mod/*+disp8   2/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EDX+4)</span>
+<span id="L330" class="LineNr">330 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L331" class="LineNr">331 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L332" class="LineNr">332 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L333" class="LineNr">333 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L334" class="LineNr">334 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L335" class="LineNr">335 </span>    <span class="subxComment"># lookup(h1) should crash</span>
+<span id="L336" class="LineNr">336 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L337" class="LineNr">337 </span>    51/push-ECX
+<span id="L338" class="LineNr">338 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L339" class="LineNr">339 </span>    e8/call  <a href='handle.subx.html#L200'>lookup</a>/disp32
+<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># should never get past this point</span>
+<span id="L341" class="LineNr">341 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L342" class="LineNr">342 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L343" class="LineNr">343 </span>    <span class="subxComment"># clean up</span>
+<span id="L344" class="LineNr">344 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
+<span id="L345" class="LineNr">345 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar"><a href='handle.subx.html#L358'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L346" class="LineNr">346 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L347" class="LineNr">347 </span>    5a/pop-to-EDX
+<span id="L348" class="LineNr">348 </span>    59/pop-to-ECX
+<span id="L349" class="LineNr">349 </span>    58/pop-to-EAX
+<span id="L350" class="LineNr">350 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L351" class="LineNr">351 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L352" class="LineNr">352 </span>    5d/pop-to-EBP
+<span id="L353" class="LineNr">353 </span>    c3/return
+<span id="L354" class="LineNr">354 </span>
+<span id="L355" class="LineNr">355 </span>== data
+<span id="L356" class="LineNr">356 </span>
+<span id="L357" class="LineNr">357 </span><span class="subxComment"># Monotonically increasing counter for calls to 'new'</span>
+<span id="L358" class="LineNr">358 </span><span class="SpecialChar">Next-alloc-id</span>:
+<span id="L359" class="LineNr">359 </span>    01 00 00 00  <span class="subxComment"># 1</span>
+<span id="L360" class="LineNr">360 </span>
+<span id="L361" class="LineNr">361 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/hex.subx.html b/html/subx/apps/hex.subx.html
index 17d17854..2980f7e8 100644
--- a/html/subx/apps/hex.subx.html
+++ b/html/subx/apps/hex.subx.html
@@ -97,7 +97,7 @@ if ('onhashchange' in window) {
 <span id="L34" class="LineNr">  34 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
 <span id="L35" class="LineNr">  35 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L36" class="LineNr">  36 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L37" class="LineNr">  37 </span>    e8/call  <a href='../052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
+<span id="L37" class="LineNr">  37 </span>    e8/call  <a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L38" class="LineNr">  38 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L39" class="LineNr">  39 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L40" class="LineNr">  40 </span>    <span class="subxS1Comment"># . check result</span>