about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--html/subx/apps/handle.subx.html329
-rw-r--r--subx/apps/handle.subx5
2 files changed, 168 insertions, 166 deletions
diff --git a/html/subx/apps/handle.subx.html b/html/subx/apps/handle.subx.html
index 072cda93..59cafb27 100644
--- a/html/subx/apps/handle.subx.html
+++ b/html/subx/apps/handle.subx.html
@@ -119,13 +119,13 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span><span class="Constant">$new:continue</span>:
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxComment"># otherwise:</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># ECX = *Next-alloc-id</span>
-<span id="L61" class="LineNr"> 61 </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#L381'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy *Next-alloc-id to ECX</span>
+<span id="L61" class="LineNr"> 61 </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#L382'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy *Next-alloc-id to ECX</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="subxComment"># *EAX = *Next-alloc-id/ECX</span>
 <span id="L63" class="LineNr"> 63 </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="L64" class="LineNr"> 64 </span>    <span class="subxComment"># out-&gt;alloc_id = *Next-alloc-id</span>
 <span id="L65" class="LineNr"> 65 </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="L66" class="LineNr"> 66 </span>    <span class="subxComment"># increment *Next-alloc-id</span>
-<span id="L67" class="LineNr"> 67 </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#L381'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># increment *Next-alloc-id</span>
+<span id="L67" class="LineNr"> 67 </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#L382'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># increment *Next-alloc-id</span>
 <span id="L68" class="LineNr"> 68 </span><span class="Constant">$new:end</span>:
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L70" class="LineNr"> 70 </span>    5a/pop-to-EDX
@@ -153,7 +153,7 @@ if ('onhashchange' in window) {
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L93" class="LineNr"> 93 </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="L94" class="LineNr"> 94 </span>    <span class="subxComment"># *Next-alloc-id = 0x34</span>
-<span id="L95" class="LineNr"> 95 </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#L381'>Next-alloc-id</a></span>/disp32  0x34/imm32        <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L95" class="LineNr"> 95 </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#L382'>Next-alloc-id</a></span>/disp32  0x34/imm32        <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
 <span id="L97" class="LineNr"> 97 </span>    68/push  0/imm32/address
 <span id="L98" class="LineNr"> 98 </span>    68/push  0/imm32/alloc-id
@@ -190,14 +190,14 @@ if ('onhashchange' in window) {
 <span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L130" class="LineNr">130 </span>    68/push  <span class="Constant">&quot;F - <a href='handle.subx.html#L78'>test-new</a>: next alloc id&quot;</span>/imm32
 <span id="L131" class="LineNr">131 </span>    68/push  0x35/imm32
-<span id="L132" class="LineNr">132 </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#L381'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L132" class="LineNr">132 </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#L382'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L134" class="LineNr">134 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</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>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L137" class="LineNr">137 </span>    <span class="subxComment"># clean up</span>
 <span id="L138" class="LineNr">138 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L139" class="LineNr">139 </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#L381'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L139" class="LineNr">139 </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#L382'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L141" class="LineNr">141 </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="L142" class="LineNr">142 </span>    5d/pop-to-EBP
@@ -208,7 +208,7 @@ if ('onhashchange' in window) {
 <span id="L147" class="LineNr">147 </span>    55/push-EBP
 <span id="L148" class="LineNr">148 </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="L149" class="LineNr">149 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 0x34</span>
-<span id="L150" class="LineNr">150 </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#L381'>Next-alloc-id</a></span>/disp32  0x34/imm32  <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L150" class="LineNr">150 </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#L382'>Next-alloc-id</a></span>/disp32  0x34/imm32  <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L151" class="LineNr">151 </span>    <span class="subxComment"># define an allocation-descriptor with no space left</span>
 <span id="L152" class="LineNr">152 </span>    <span class="subxS1Comment"># . var ad/EAX : (address allocation-descriptor) = {0x10, 0x10}</span>
 <span id="L153" class="LineNr">153 </span>    68/push  0x10/imm32/limit
@@ -252,14 +252,14 @@ if ('onhashchange' in window) {
 <span id="L191" class="LineNr">191 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L192" class="LineNr">192 </span>    68/push  <span class="Constant">&quot;F - <a href='handle.subx.html#L145'>test-new-failure</a>: next alloc id&quot;</span>/imm32
 <span id="L193" class="LineNr">193 </span>    68/push  0x34/imm32
-<span id="L194" class="LineNr">194 </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#L381'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L194" class="LineNr">194 </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#L382'>Next-alloc-id</a></span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L196" class="LineNr">196 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L197" class="LineNr">197 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L198" class="LineNr">198 </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="L199" class="LineNr">199 </span>    <span class="subxComment"># clean up</span>
 <span id="L200" class="LineNr">200 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L201" class="LineNr">201 </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#L381'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L201" class="LineNr">201 </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#L382'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
 <span id="L202" class="LineNr">202 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L203" class="LineNr">203 </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="L204" class="LineNr">204 </span>    5d/pop-to-EBP
@@ -279,7 +279,7 @@ if ('onhashchange' in window) {
 <span id="L218" class="LineNr">218 </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="L219" class="LineNr">219 </span>    <span class="subxComment"># if (EAX != *ESP) abort</span>
 <span id="L220" class="LineNr">220 </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="L221" class="LineNr">221 </span>    75/jump-if-not-equal  $lookup:fail/disp8
+<span id="L221" class="LineNr">221 </span>    75/jump-if-not-equal  $lookup:abort/disp8
 <span id="L222" class="LineNr">222 </span>    <span class="subxComment"># return ESP+4</span>
 <span id="L223" class="LineNr">223 </span>    58/pop-to-EAX
 <span id="L224" class="LineNr">224 </span>    05/add-to-EAX  4/imm32
@@ -288,161 +288,162 @@ if ('onhashchange' in window) {
 <span id="L227" class="LineNr">227 </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="L228" class="LineNr">228 </span>    5d/pop-to-EBP
 <span id="L229" class="LineNr">229 </span>    c3/return
-<span id="L230" class="LineNr">230 </span><span class="Constant">$lookup:fail</span>:
-<span id="L231" class="LineNr">231 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
-<span id="L232" class="LineNr">232 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L233" class="LineNr">233 </span>    68/push  <span class="Constant">&quot;lookup failed&quot;</span>/imm32
-<span id="L234" class="LineNr">234 </span>    68/push  2/imm32/stderr
-<span id="L235" class="LineNr">235 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L236" class="LineNr">236 </span>    e8/call  <a href='../050_write.subx.html#L14'>_write</a>/disp32
-<span id="L237" class="LineNr">237 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L238" class="LineNr">238 </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="L239" class="LineNr">239 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
-<span id="L240" class="LineNr">240 </span>    bb/copy-to-EBX  1/imm32/exit-status
-<span id="L241" class="LineNr">241 </span>    b8/copy-to-EAX  1/imm32/exit
-<span id="L242" class="LineNr">242 </span>    cd/syscall  0x80/imm8
-<span id="L243" class="LineNr">243 </span>
-<span id="L244" class="LineNr">244 </span><span class="subxTest">test-lookup-success</span>:
-<span id="L245" class="LineNr">245 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L246" class="LineNr">246 </span>    55/push-EBP
-<span id="L247" class="LineNr">247 </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="L248" class="LineNr">248 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L249" class="LineNr">249 </span>    <span class="subxComment"># var heap/EBX : (address allocation-descriptor) = {0, 0}</span>
-<span id="L250" class="LineNr">250 </span>    68/push  0/imm32/limit
-<span id="L251" class="LineNr">251 </span>    68/push  0/imm32/curr
-<span id="L252" class="LineNr">252 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <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 EBX</span>
-<span id="L253" class="LineNr">253 </span>    <span class="subxComment"># heap = new-segment(512)</span>
-<span id="L254" class="LineNr">254 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L255" class="LineNr">255 </span>    53/push-EBX
-<span id="L256" class="LineNr">256 </span>    68/push  0x200/imm32
-<span id="L257" class="LineNr">257 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L258" class="LineNr">258 </span>    e8/call  <a href='../053new-segment.subx.html#L41'>new-segment</a>/disp32
-<span id="L259" class="LineNr">259 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
-<span id="L262" class="LineNr">262 </span>    68/push  0/imm32/address
-<span id="L263" class="LineNr">263 </span>    68/push  0/imm32/alloc-id
-<span id="L264" class="LineNr">264 </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="L265" class="LineNr">265 </span>    <span class="subxComment"># var old_top/EDX = heap-&gt;curr</span>
-<span id="L266" class="LineNr">266 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <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 *EBX to EDX</span>
-<span id="L267" class="LineNr">267 </span>    <span class="subxComment"># new(heap, 2, handle)</span>
-<span id="L268" class="LineNr">268 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L269" class="LineNr">269 </span>    51/push-ECX
-<span id="L270" class="LineNr">270 </span>    68/push  2/imm32/size
-<span id="L271" class="LineNr">271 </span>    53/push-EBX
-<span id="L272" class="LineNr">272 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L273" class="LineNr">273 </span>    e8/call  <a href='handle.subx.html#L30'>new</a>/disp32
-<span id="L274" class="LineNr">274 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L275" class="LineNr">275 </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="L276" class="LineNr">276 </span>    <span class="subxComment"># EAX = lookup(handle)</span>
-<span id="L277" class="LineNr">277 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L278" class="LineNr">278 </span>    51/push-ECX
-<span id="L279" class="LineNr">279 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L280" class="LineNr">280 </span>    e8/call  <a href='handle.subx.html#L207'>lookup</a>/disp32
-<span id="L281" class="LineNr">281 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L282" class="LineNr">282 </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="L283" class="LineNr">283 </span>    <span class="subxComment"># EAX contains old top of heap, except skipping the alloc id in the payload</span>
-<span id="L284" class="LineNr">284 </span>    <span class="subxS1Comment"># . check-ints-equal(EAX, old_top+4, msg)</span>
-<span id="L285" class="LineNr">285 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L286" class="LineNr">286 </span>    68/push  <span class="Constant">&quot;F - test-lookup-success&quot;</span>/imm32
-<span id="L287" class="LineNr">287 </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="L288" class="LineNr">288 </span>    52/push-EDX
-<span id="L289" class="LineNr">289 </span>    50/push-EAX
-<span id="L290" class="LineNr">290 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L291" class="LineNr">291 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L292" class="LineNr">292 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L293" class="LineNr">293 </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="L294" class="LineNr">294 </span>    <span class="subxComment"># clean up</span>
-<span id="L295" class="LineNr">295 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L296" class="LineNr">296 </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#L381'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
-<span id="L297" class="LineNr">297 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L298" class="LineNr">298 </span>    5a/pop-to-EDX
-<span id="L299" class="LineNr">299 </span>    59/pop-to-ECX
-<span id="L300" class="LineNr">300 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L301" class="LineNr">301 </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="L302" class="LineNr">302 </span>    5d/pop-to-EBP
-<span id="L303" class="LineNr">303 </span>    c3/return
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span><span class="subxTest">test-lookup-failure</span>:
-<span id="L306" class="LineNr">306 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L307" class="LineNr">307 </span>    55/push-EBP
-<span id="L308" class="LineNr">308 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="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="L309" class="LineNr">309 </span>    <span class="subxComment"># var heap/ESI : (address allocation-descriptor) = {0, 0}</span>
-<span id="L310" class="LineNr">310 </span>    68/push  0/imm32/limit
-<span id="L311" class="LineNr">311 </span>    68/push  0/imm32/curr
-<span id="L312" class="LineNr">312 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <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 ESI</span>
-<span id="L313" class="LineNr">313 </span>    <span class="subxComment"># heap = new-segment(512)</span>
-<span id="L314" class="LineNr">314 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L315" class="LineNr">315 </span>    56/push-ESI
-<span id="L316" class="LineNr">316 </span>    68/push  0x200/imm32
-<span id="L317" class="LineNr">317 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L318" class="LineNr">318 </span>    e8/call  <a href='../053new-segment.subx.html#L41'>new-segment</a>/disp32
-<span id="L319" class="LineNr">319 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L320" class="LineNr">320 </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="L321" class="LineNr">321 </span>    <span class="subxComment"># var h1/ECX = {0, 0}</span>
-<span id="L322" class="LineNr">322 </span>    68/push  0/imm32/address
-<span id="L323" class="LineNr">323 </span>    68/push  0/imm32/alloc-id
-<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>    <span class="subxComment"># var old_top/EBX = heap-&gt;curr</span>
-<span id="L326" class="LineNr">326 </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="L327" class="LineNr">327 </span>    <span class="subxComment"># first allocation, to h1</span>
-<span id="L328" class="LineNr">328 </span>    <span class="subxS1Comment"># . new(heap, 2, h1)</span>
-<span id="L329" class="LineNr">329 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L330" class="LineNr">330 </span>    51/push-ECX
-<span id="L331" class="LineNr">331 </span>    68/push  2/imm32/size
-<span id="L332" class="LineNr">332 </span>    56/push-ESI
-<span id="L333" class="LineNr">333 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L334" class="LineNr">334 </span>    e8/call  <a href='handle.subx.html#L30'>new</a>/disp32
-<span id="L335" class="LineNr">335 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L336" class="LineNr">336 </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="L337" class="LineNr">337 </span>    <span class="subxComment"># reset heap-&gt;curr to mimic reclamation</span>
-<span id="L338" class="LineNr">338 </span>    89/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 EBX to *ESI</span>
-<span id="L339" class="LineNr">339 </span>    <span class="subxComment"># second allocation that returns the same address as the first</span>
-<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># var h2/EDX = {0, 0}</span>
-<span id="L341" class="LineNr">341 </span>    68/push  0/imm32/address
-<span id="L342" class="LineNr">342 </span>    68/push  0/imm32/alloc-id
-<span id="L343" class="LineNr">343 </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="L344" class="LineNr">344 </span>    <span class="subxS1Comment"># . new(heap, 2, h2)</span>
-<span id="L345" class="LineNr">345 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L346" class="LineNr">346 </span>    52/push-EDX
-<span id="L347" class="LineNr">347 </span>    68/push  2/imm32/size
-<span id="L348" class="LineNr">348 </span>    56/push-ESI
-<span id="L349" class="LineNr">349 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L350" class="LineNr">350 </span>    e8/call  <a href='handle.subx.html#L30'>new</a>/disp32
-<span id="L351" class="LineNr">351 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L352" class="LineNr">352 </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="L353" class="LineNr">353 </span>    <span class="subxComment"># check-ints-equal(h1-&gt;address, h2-&gt;address, msg)</span>
-<span id="L354" class="LineNr">354 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L355" class="LineNr">355 </span>    68/push  <span class="Constant">&quot;F - test-lookup-failure&quot;</span>/imm32
-<span id="L356" class="LineNr">356 </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="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L359" class="LineNr">359 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L360" class="LineNr">360 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L361" class="LineNr">361 </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="L362" class="LineNr">362 </span>    <span class="subxComment"># lookup(h1) should crash</span>
-<span id="L363" class="LineNr">363 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L364" class="LineNr">364 </span>    51/push-ECX
-<span id="L365" class="LineNr">365 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L366" class="LineNr">366 </span>    e8/call  <a href='handle.subx.html#L207'>lookup</a>/disp32
-<span id="L367" class="LineNr">367 </span>    <span class="subxComment"># should never get past this point</span>
-<span id="L368" class="LineNr">368 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L369" class="LineNr">369 </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="L370" class="LineNr">370 </span>    <span class="subxComment"># clean up</span>
-<span id="L371" class="LineNr">371 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
-<span id="L372" class="LineNr">372 </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#L381'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
-<span id="L373" class="LineNr">373 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L374" class="LineNr">374 </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="L375" class="LineNr">375 </span>    5d/pop-to-EBP
-<span id="L376" class="LineNr">376 </span>    c3/return
-<span id="L377" class="LineNr">377 </span>
-<span id="L378" class="LineNr">378 </span>== data
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="subxComment"># Monotonically increasing counter for calls to 'new'</span>
-<span id="L381" class="LineNr">381 </span><span class="SpecialChar">Next-alloc-id</span>:
-<span id="L382" class="LineNr">382 </span>    1/imm32
-<span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L230" class="LineNr">230 </span>
+<span id="L231" class="LineNr">231 </span><span class="Constant">$lookup:abort</span>:
+<span id="L232" class="LineNr">232 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
+<span id="L233" class="LineNr">233 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L234" class="LineNr">234 </span>    68/push  <span class="Constant">&quot;lookup failed&quot;</span>/imm32
+<span id="L235" class="LineNr">235 </span>    68/push  2/imm32/stderr
+<span id="L236" class="LineNr">236 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L237" class="LineNr">237 </span>    e8/call  <a href='../050_write.subx.html#L14'>_write</a>/disp32
+<span id="L238" class="LineNr">238 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L239" class="LineNr">239 </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="L240" class="LineNr">240 </span>    <span class="subxS1Comment"># . syscall(exit, 1)</span>
+<span id="L241" class="LineNr">241 </span>    bb/copy-to-EBX  1/imm32/exit-status
+<span id="L242" class="LineNr">242 </span>    b8/copy-to-EAX  1/imm32/exit
+<span id="L243" class="LineNr">243 </span>    cd/syscall  0x80/imm8
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="subxTest">test-lookup-success</span>:
+<span id="L246" class="LineNr">246 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L247" class="LineNr">247 </span>    55/push-EBP
+<span id="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L250" class="LineNr">250 </span>    <span class="subxComment"># var heap/EBX : (address allocation-descriptor) = {0, 0}</span>
+<span id="L251" class="LineNr">251 </span>    68/push  0/imm32/limit
+<span id="L252" class="LineNr">252 </span>    68/push  0/imm32/curr
+<span id="L253" class="LineNr">253 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <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 EBX</span>
+<span id="L254" class="LineNr">254 </span>    <span class="subxComment"># heap = new-segment(512)</span>
+<span id="L255" class="LineNr">255 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L256" class="LineNr">256 </span>    53/push-EBX
+<span id="L257" class="LineNr">257 </span>    68/push  0x200/imm32
+<span id="L258" class="LineNr">258 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L259" class="LineNr">259 </span>    e8/call  <a href='../053new-segment.subx.html#L41'>new-segment</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>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L262" class="LineNr">262 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
+<span id="L263" class="LineNr">263 </span>    68/push  0/imm32/address
+<span id="L264" class="LineNr">264 </span>    68/push  0/imm32/alloc-id
+<span id="L265" class="LineNr">265 </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="L266" class="LineNr">266 </span>    <span class="subxComment"># var old_top/EDX = heap-&gt;curr</span>
+<span id="L267" class="LineNr">267 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <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 *EBX to EDX</span>
+<span id="L268" class="LineNr">268 </span>    <span class="subxComment"># new(heap, 2, handle)</span>
+<span id="L269" class="LineNr">269 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L270" class="LineNr">270 </span>    51/push-ECX
+<span id="L271" class="LineNr">271 </span>    68/push  2/imm32/size
+<span id="L272" class="LineNr">272 </span>    53/push-EBX
+<span id="L273" class="LineNr">273 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L274" class="LineNr">274 </span>    e8/call  <a href='handle.subx.html#L30'>new</a>/disp32
+<span id="L275" class="LineNr">275 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L276" class="LineNr">276 </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="L277" class="LineNr">277 </span>    <span class="subxComment"># EAX = lookup(handle)</span>
+<span id="L278" class="LineNr">278 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L279" class="LineNr">279 </span>    51/push-ECX
+<span id="L280" class="LineNr">280 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L281" class="LineNr">281 </span>    e8/call  <a href='handle.subx.html#L207'>lookup</a>/disp32
+<span id="L282" class="LineNr">282 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span>    <span class="subxComment"># EAX contains old top of heap, except skipping the alloc id in the payload</span>
+<span id="L285" class="LineNr">285 </span>    <span class="subxS1Comment"># . check-ints-equal(EAX, old_top+4, msg)</span>
+<span id="L286" class="LineNr">286 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L287" class="LineNr">287 </span>    68/push  <span class="Constant">&quot;F - test-lookup-success&quot;</span>/imm32
+<span id="L288" class="LineNr">288 </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="L289" class="LineNr">289 </span>    52/push-EDX
+<span id="L290" class="LineNr">290 </span>    50/push-EAX
+<span id="L291" class="LineNr">291 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L292" class="LineNr">292 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L293" class="LineNr">293 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L294" class="LineNr">294 </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="L295" class="LineNr">295 </span>    <span class="subxComment"># clean up</span>
+<span id="L296" class="LineNr">296 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
+<span id="L297" class="LineNr">297 </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#L382'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L298" class="LineNr">298 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L299" class="LineNr">299 </span>    5a/pop-to-EDX
+<span id="L300" class="LineNr">300 </span>    59/pop-to-ECX
+<span id="L301" class="LineNr">301 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L302" class="LineNr">302 </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="L303" class="LineNr">303 </span>    5d/pop-to-EBP
+<span id="L304" class="LineNr">304 </span>    c3/return
+<span id="L305" class="LineNr">305 </span>
+<span id="L306" class="LineNr">306 </span><span class="subxTest">test-lookup-failure</span>:
+<span id="L307" class="LineNr">307 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L308" class="LineNr">308 </span>    55/push-EBP
+<span id="L309" class="LineNr">309 </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="L310" class="LineNr">310 </span>    <span class="subxComment"># var heap/ESI : (address allocation-descriptor) = {0, 0}</span>
+<span id="L311" class="LineNr">311 </span>    68/push  0/imm32/limit
+<span id="L312" class="LineNr">312 </span>    68/push  0/imm32/curr
+<span id="L313" class="LineNr">313 </span>    89/copy                         3/mod/direct    6/rm32/ESI   <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 ESI</span>
+<span id="L314" class="LineNr">314 </span>    <span class="subxComment"># heap = new-segment(512)</span>
+<span id="L315" class="LineNr">315 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L316" class="LineNr">316 </span>    56/push-ESI
+<span id="L317" class="LineNr">317 </span>    68/push  0x200/imm32
+<span id="L318" class="LineNr">318 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L319" class="LineNr">319 </span>    e8/call  <a href='../053new-segment.subx.html#L41'>new-segment</a>/disp32
+<span id="L320" class="LineNr">320 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L321" class="LineNr">321 </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="L322" class="LineNr">322 </span>    <span class="subxComment"># var h1/ECX = {0, 0}</span>
+<span id="L323" class="LineNr">323 </span>    68/push  0/imm32/address
+<span id="L324" class="LineNr">324 </span>    68/push  0/imm32/alloc-id
+<span id="L325" class="LineNr">325 </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="L326" class="LineNr">326 </span>    <span class="subxComment"># var old_top/EBX = heap-&gt;curr</span>
+<span id="L327" class="LineNr">327 </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="L328" class="LineNr">328 </span>    <span class="subxComment"># first allocation, to h1</span>
+<span id="L329" class="LineNr">329 </span>    <span class="subxS1Comment"># . new(heap, 2, h1)</span>
+<span id="L330" class="LineNr">330 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L331" class="LineNr">331 </span>    51/push-ECX
+<span id="L332" class="LineNr">332 </span>    68/push  2/imm32/size
+<span id="L333" class="LineNr">333 </span>    56/push-ESI
+<span id="L334" class="LineNr">334 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L335" class="LineNr">335 </span>    e8/call  <a href='handle.subx.html#L30'>new</a>/disp32
+<span id="L336" class="LineNr">336 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L337" class="LineNr">337 </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="L338" class="LineNr">338 </span>    <span class="subxComment"># reset heap-&gt;curr to mimic reclamation</span>
+<span id="L339" class="LineNr">339 </span>    89/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 EBX to *ESI</span>
+<span id="L340" class="LineNr">340 </span>    <span class="subxComment"># second allocation that returns the same address as the first</span>
+<span id="L341" class="LineNr">341 </span>    <span class="subxComment"># var h2/EDX = {0, 0}</span>
+<span id="L342" class="LineNr">342 </span>    68/push  0/imm32/address
+<span id="L343" class="LineNr">343 </span>    68/push  0/imm32/alloc-id
+<span id="L344" class="LineNr">344 </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="L345" class="LineNr">345 </span>    <span class="subxS1Comment"># . new(heap, 2, h2)</span>
+<span id="L346" class="LineNr">346 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L347" class="LineNr">347 </span>    52/push-EDX
+<span id="L348" class="LineNr">348 </span>    68/push  2/imm32/size
+<span id="L349" class="LineNr">349 </span>    56/push-ESI
+<span id="L350" class="LineNr">350 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L351" class="LineNr">351 </span>    e8/call  <a href='handle.subx.html#L30'>new</a>/disp32
+<span id="L352" class="LineNr">352 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L353" class="LineNr">353 </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="L354" class="LineNr">354 </span>    <span class="subxComment"># check-ints-equal(h1-&gt;address, h2-&gt;address, msg)</span>
+<span id="L355" class="LineNr">355 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L356" class="LineNr">356 </span>    68/push  <span class="Constant">&quot;F - test-lookup-failure&quot;</span>/imm32
+<span id="L357" class="LineNr">357 </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="L358" class="LineNr">358 </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="L359" class="LineNr">359 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L360" class="LineNr">360 </span>    e8/call  <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L361" class="LineNr">361 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L362" class="LineNr">362 </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="L363" class="LineNr">363 </span>    <span class="subxComment"># lookup(h1) should crash</span>
+<span id="L364" class="LineNr">364 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L365" class="LineNr">365 </span>    51/push-ECX
+<span id="L366" class="LineNr">366 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L367" class="LineNr">367 </span>    e8/call  <a href='handle.subx.html#L207'>lookup</a>/disp32
+<span id="L368" class="LineNr">368 </span>    <span class="subxComment"># should never get past this point</span>
+<span id="L369" class="LineNr">369 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L370" class="LineNr">370 </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="L371" class="LineNr">371 </span>    <span class="subxComment"># clean up</span>
+<span id="L372" class="LineNr">372 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
+<span id="L373" class="LineNr">373 </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#L382'>Next-alloc-id</a></span>/disp32  1/imm32           <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L374" class="LineNr">374 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L375" class="LineNr">375 </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="L376" class="LineNr">376 </span>    5d/pop-to-EBP
+<span id="L377" class="LineNr">377 </span>    c3/return
+<span id="L378" class="LineNr">378 </span>
+<span id="L379" class="LineNr">379 </span>== data
+<span id="L380" class="LineNr">380 </span>
+<span id="L381" class="LineNr">381 </span><span class="subxComment"># Monotonically increasing counter for calls to 'new'</span>
+<span id="L382" class="LineNr">382 </span><span class="SpecialChar">Next-alloc-id</span>:
+<span id="L383" class="LineNr">383 </span>    1/imm32
+<span id="L384" class="LineNr">384 </span>
+<span id="L385" class="LineNr">385 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/subx/apps/handle.subx b/subx/apps/handle.subx
index 0ed12067..073b624c 100644
--- a/subx/apps/handle.subx
+++ b/subx/apps/handle.subx
@@ -218,7 +218,7 @@ lookup:  # h : (handle T) -> EAX : (address T)
     8b/copy                         0/mod/indirect  0/rm32/EAX    .           .             .           .           .               .                 # copy *EAX to EAX
     # if (EAX != *ESP) abort
     39/compare                      0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none  .           0/r32/EAX   .               .                 # compare *ESP and EAX
-    75/jump-if-not-equal  $lookup:fail/disp8
+    75/jump-if-not-equal  $lookup:abort/disp8
     # return ESP+4
     58/pop-to-EAX
     05/add-to-EAX  4/imm32
@@ -227,7 +227,8 @@ lookup:  # h : (handle T) -> EAX : (address T)
     89/copy                         3/mod/direct    4/rm32/ESP    .           .             .           5/r32/EBP   .               .                 # copy EBP to ESP
     5d/pop-to-EBP
     c3/return
-$lookup:fail:
+
+$lookup:abort:
     # . _write(2/stderr, msg)
     # . . push args
     68/push  "lookup failed"/imm32