4846

Clean up a few things:

a) Call scan-next-byte in hex.subx with the right number of args. Turns
out tests continue to work fine if they never use the other args.

b) Tear down a test for 'stop' in the right order. Not important since we
have no EBP to restore. But can still be misleading.

c) Have 'check-ints-equal' return nothing. Handy for it to not mess up
EAX. I never use the result anyway, and the name also is imperative suggesting
callers won't expect a return value.

1 files changed, 62 insertions, 60 deletions

diff --git a/html/subx/051test.subx.html b/html/subx/051test.subx.html
index cf70c9bc..90b2b48c 100644
--- a/html/subx/051test.subx.html
+++ b/html/subx/051test.subx.html
@@ -84,71 +84,73 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr">21 </span>    cd/syscall  0x80/imm8
 <span id="L22" class="LineNr">22 </span>
 <span id="L23" class="LineNr">23 </span><span class="subxComment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L24" class="LineNr">24 </span><span class="subxFunction">check-ints-equal</span>:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L24" class="LineNr">24 </span><span class="subxFunction">check-ints-equal</span>:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; &lt;void&gt;</span>
 <span id="L25" class="LineNr">25 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L26" class="LineNr">26 </span>    55/push-EBP
 <span id="L27" class="LineNr">27 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L28" class="LineNr">28 </span>    <span class="subxS1Comment"># . save registers</span>
-<span id="L29" class="LineNr">29 </span>    51/push-ECX
-<span id="L30" class="LineNr">30 </span>    53/push-EBX
-<span id="L31" class="LineNr">31 </span>    <span class="subxComment"># load first 2 args into EAX and EBX</span>
-<span id="L32" class="LineNr">32 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L33" class="LineNr">33 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
-<span id="L34" class="LineNr">34 </span>    <span class="subxComment"># if EAX == EBX success</span>
-<span id="L35" class="LineNr">35 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
-<span id="L36" class="LineNr">36 </span>    75/jump-if-unequal  $check-ints-equal:else/disp8
-<span id="L37" class="LineNr">37 </span>    <span class="subxS1Comment"># . _write(2/stderr, '.')</span>
-<span id="L38" class="LineNr">38 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L39" class="LineNr">39 </span>    68/push  <span class="Constant">&quot;.&quot;</span>/imm32
-<span id="L40" class="LineNr">40 </span>    68/push  2/imm32/stderr
-<span id="L41" class="LineNr">41 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L42" class="LineNr">42 </span>    e8/call  _write/disp32
-<span id="L43" class="LineNr">43 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L44" class="LineNr">44 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L45" class="LineNr">45 </span>    <span class="subxS1Comment"># . return</span>
-<span id="L46" class="LineNr">46 </span>    eb/jump  $check-ints-equal:end/disp8
-<span id="L47" class="LineNr">47 </span>    <span class="subxComment"># otherwise print error message</span>
-<span id="L48" class="LineNr">48 </span><span class="Constant">$check-ints-equal:else</span>:
-<span id="L49" class="LineNr">49 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
-<span id="L50" class="LineNr">50 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L51" class="LineNr">51 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to ECX</span>
-<span id="L52" class="LineNr">52 </span>    51/push-ECX
-<span id="L53" class="LineNr">53 </span>    68/push  2/imm32/stderr
-<span id="L54" class="LineNr">54 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L55" class="LineNr">55 </span>    e8/call  _write/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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L58" class="LineNr">58 </span>    <span class="subxS1Comment"># . _write(2/stderr, Newline)</span>
-<span id="L59" class="LineNr">59 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L60" class="LineNr">60 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L61" class="LineNr">61 </span>    68/push  2/imm32/stderr
-<span id="L62" class="LineNr">62 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L63" class="LineNr">63 </span>    e8/call  _write/disp32
-<span id="L64" class="LineNr">64 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L65" class="LineNr">65 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
-<span id="L66" class="LineNr">66 </span>    <span class="subxComment"># increment Num-test-failures</span>
-<span id="L67" class="LineNr">67 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># increment *Num-test-failures</span>
-<span id="L68" class="LineNr">68 </span><span class="Constant">$check-ints-equal:end</span>:
-<span id="L69" class="LineNr">69 </span>    <span class="subxS1Comment"># . restore registers</span>
-<span id="L70" class="LineNr">70 </span>    5b/pop-to-EBX
-<span id="L71" class="LineNr">71 </span>    59/pop-to-ECX
-<span id="L72" class="LineNr">72 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L73" class="LineNr">73 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
-<span id="L74" class="LineNr">74 </span>    5d/pop-to-EBP
-<span id="L75" class="LineNr">75 </span>    c3/return
-<span id="L76" class="LineNr">76 </span>
-<span id="L77" class="LineNr">77 </span>== data
+<span id="L29" class="LineNr">29 </span>    50/push-EAX
+<span id="L30" class="LineNr">30 </span>    51/push-ECX
+<span id="L31" class="LineNr">31 </span>    53/push-EBX
+<span id="L32" class="LineNr">32 </span>    <span class="subxComment"># load first 2 args into EAX and EBX</span>
+<span id="L33" class="LineNr">33 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0x8/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L34" class="LineNr">34 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L35" class="LineNr">35 </span>    <span class="subxComment"># if EAX == EBX success</span>
+<span id="L36" class="LineNr">36 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
+<span id="L37" class="LineNr">37 </span>    75/jump-if-unequal  $check-ints-equal:else/disp8
+<span id="L38" class="LineNr">38 </span>    <span class="subxS1Comment"># . _write(2/stderr, '.')</span>
+<span id="L39" class="LineNr">39 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L40" class="LineNr">40 </span>    68/push  <span class="Constant">&quot;.&quot;</span>/imm32
+<span id="L41" class="LineNr">41 </span>    68/push  2/imm32/stderr
+<span id="L42" class="LineNr">42 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L43" class="LineNr">43 </span>    e8/call  _write/disp32
+<span id="L44" class="LineNr">44 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L45" class="LineNr">45 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L46" class="LineNr">46 </span>    <span class="subxS1Comment"># . return</span>
+<span id="L47" class="LineNr">47 </span>    eb/jump  $check-ints-equal:end/disp8
+<span id="L48" class="LineNr">48 </span>    <span class="subxComment"># otherwise print error message</span>
+<span id="L49" class="LineNr">49 </span><span class="Constant">$check-ints-equal:else</span>:
+<span id="L50" class="LineNr">50 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
+<span id="L51" class="LineNr">51 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L52" class="LineNr">52 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to ECX</span>
+<span id="L53" class="LineNr">53 </span>    51/push-ECX
+<span id="L54" class="LineNr">54 </span>    68/push  2/imm32/stderr
+<span id="L55" class="LineNr">55 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L56" class="LineNr">56 </span>    e8/call  _write/disp32
+<span id="L57" class="LineNr">57 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L58" class="LineNr">58 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L59" class="LineNr">59 </span>    <span class="subxS1Comment"># . _write(2/stderr, Newline)</span>
+<span id="L60" class="LineNr">60 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L61" class="LineNr">61 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
+<span id="L62" class="LineNr">62 </span>    68/push  2/imm32/stderr
+<span id="L63" class="LineNr">63 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L64" class="LineNr">64 </span>    e8/call  _write/disp32
+<span id="L65" class="LineNr">65 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L66" class="LineNr">66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L67" class="LineNr">67 </span>    <span class="subxComment"># increment Num-test-failures</span>
+<span id="L68" class="LineNr">68 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># increment *Num-test-failures</span>
+<span id="L69" class="LineNr">69 </span><span class="Constant">$check-ints-equal:end</span>:
+<span id="L70" class="LineNr">70 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L71" class="LineNr">71 </span>    5b/pop-to-EBX
+<span id="L72" class="LineNr">72 </span>    59/pop-to-ECX
+<span id="L73" class="LineNr">73 </span>    58/pop-to-EAX
+<span id="L74" class="LineNr">74 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L75" class="LineNr">75 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L76" class="LineNr">76 </span>    5d/pop-to-EBP
+<span id="L77" class="LineNr">77 </span>    c3/return
 <span id="L78" class="LineNr">78 </span>
-<span id="L79" class="LineNr">79 </span><span class="SpecialChar">Newline</span>:
-<span id="L80" class="LineNr">80 </span>    <span class="subxComment"># size</span>
-<span id="L81" class="LineNr">81 </span>    01 00 00 00
-<span id="L82" class="LineNr">82 </span>    <span class="subxComment"># data</span>
-<span id="L83" class="LineNr">83 </span>    0a/newline
-<span id="L84" class="LineNr">84 </span>
-<span id="L85" class="LineNr">85 </span><span class="SpecialChar">Num-test-failures</span>:
-<span id="L86" class="LineNr">86 </span>    00 00 00 00
-<span id="L87" class="LineNr">87 </span>
-<span id="L88" class="LineNr">88 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+<span id="L79" class="LineNr">79 </span>== data
+<span id="L80" class="LineNr">80 </span>
+<span id="L81" class="LineNr">81 </span><span class="SpecialChar">Newline</span>:
+<span id="L82" class="LineNr">82 </span>    <span class="subxComment"># size</span>
+<span id="L83" class="LineNr">83 </span>    01 00 00 00
+<span id="L84" class="LineNr">84 </span>    <span class="subxComment"># data</span>
+<span id="L85" class="LineNr">85 </span>    0a/newline
+<span id="L86" class="LineNr">86 </span>
+<span id="L87" class="LineNr">87 </span><span class="SpecialChar">Num-test-failures</span>:
+<span id="L88" class="LineNr">88 </span>    00 00 00 00
+<span id="L89" class="LineNr">89 </span>
+<span id="L90" class="LineNr">90 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>