6513

1 files changed, 57 insertions, 58 deletions

diff --git a/html/apps/factorial2.subx.html b/html/apps/factorial2.subx.html
index 4e09dcf6..628bb7c2 100644
--- a/html/apps/factorial2.subx.html
+++ b/html/apps/factorial2.subx.html
@@ -16,12 +16,12 @@ a { color:inherit; }
 * { font-size:12pt; font-size: 1em; }
 .subxComment { color: #005faf; }
 .subxS2Comment { color: #8a8a8a; }
+.subxTest { color: #5f8700; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .LineNr { }
 .subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
 .Constant { color: #008787; }
-.subxTest { color: #5f8700; }
 .subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
@@ -85,10 +85,10 @@ if ('onhashchange' in window) {
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxComment"># initialize heap</span>
 <span id="L26" class="LineNr"> 26 </span>    <span class="subxS1Comment"># . Heap = new-segment(Heap-size)</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L28" class="LineNr"> 28 </span>    68/push <span class="SpecialChar"><a href='../069allocate.subx.html#L22'>Heap</a></span>/imm32
-<span id="L29" class="LineNr"> 29 </span>    ff 6/subop/push *<span class="SpecialChar"><a href='../069allocate.subx.html#L29'>Heap-size</a></span>
+<span id="L28" class="LineNr"> 28 </span>    68/push <span class="SpecialChar"><a href='../069allocate.subx.html#L27'>Heap</a></span>/imm32
+<span id="L29" class="LineNr"> 29 </span>    ff 6/subop/push *<span class="SpecialChar"><a href='../069allocate.subx.html#L34'>Heap-size</a></span>
 <span id="L30" class="LineNr"> 30 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L31" class="LineNr"> 31 </span>    e8/call <a href='../053new-segment.subx.html#L41'>new-segment</a>/disp32
+<span id="L31" class="LineNr"> 31 </span>    e8/call <a href='../053new-segment.subx.html#L40'>new-segment</a>/disp32
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L33" class="LineNr"> 33 </span>    81 0/subop/add %esp 8/imm32
 <span id="L34" class="LineNr"> 34 </span>
@@ -102,7 +102,7 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr"> 42 </span>    68/push <span class="Constant">&quot;test&quot;</span>/imm32
 <span id="L43" class="LineNr"> 43 </span>    ff 6/subop/push *(ebp+8)
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L45" class="LineNr"> 45 </span>    e8/call <a href='../052kernel-string-equal.subx.html#L33'>kernel-string-equal?</a>/disp32
+<span id="L45" class="LineNr"> 45 </span>    e8/call <a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal?</a>/disp32
 <span id="L46" class="LineNr"> 46 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L47" class="LineNr"> 47 </span>    81 0/subop/add %esp 8/imm32
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS1Comment"># . if (eax == false) goto run-main</span>
@@ -111,7 +111,7 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span>    <span class="subxComment"># run-tests()</span>
 <span id="L52" class="LineNr"> 52 </span>    e8/call run-tests/disp32
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxComment"># syscall(exit, *Num-test-failures)</span>
-<span id="L54" class="LineNr"> 54 </span>    8b/-&gt; *<span class="SpecialChar"><a href='../051test.subx.html#L90'>Num-test-failures</a></span> 3/r32/ebx
+<span id="L54" class="LineNr"> 54 </span>    8b/-&gt; *<span class="SpecialChar"><a href='../051test.subx.html#L89'>Num-test-failures</a></span> 3/r32/ebx
 <span id="L55" class="LineNr"> 55 </span>    eb/jump $main:end/disp8
 <span id="L56" class="LineNr"> 56 </span><span class="Constant">$run-main</span>:
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxH1Comment"># - otherwise return factorial(5)</span>
@@ -119,63 +119,62 @@ if ('onhashchange' in window) {
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L60" class="LineNr"> 60 </span>    68/push 5/imm32
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L62" class="LineNr"> 62 </span>    e8/call <a href='factorial2.subx.html#L71'>factorial</a>/disp32
+<span id="L62" class="LineNr"> 62 </span>    e8/call <a href='factorial2.subx.html#L70'>factorial</a>/disp32
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxS2Comment"># . . discard args</span>
 <span id="L64" class="LineNr"> 64 </span>    81 0/subop/add %esp 4/imm32
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># syscall(exit, eax)</span>
 <span id="L66" class="LineNr"> 66 </span>    89/&lt;- %ebx 0/r32/eax
 <span id="L67" class="LineNr"> 67 </span><span class="Constant">$main:end</span>:
-<span id="L68" class="LineNr"> 68 </span>    b8/copy-to-eax 1/imm32/exit
-<span id="L69" class="LineNr"> 69 </span>    cd/syscall 0x80/imm8
-<span id="L70" class="LineNr"> 70 </span>
-<span id="L71" class="LineNr"> 71 </span><span class="subxFunction">factorial</span>:  <span class="subxComment"># n: int -&gt; int/eax</span>
-<span id="L72" class="LineNr"> 72 </span>    <span class="subxS1Comment"># . prologue</span>
-<span id="L73" class="LineNr"> 73 </span>    55/push-ebp
-<span id="L74" class="LineNr"> 74 </span>    89/&lt;- %ebp 4/r32/esp
-<span id="L75" class="LineNr"> 75 </span>    53/push-ebx
-<span id="L76" class="LineNr"> 76 </span>    <span class="subxComment"># if (n &lt;= 1) return 1</span>
-<span id="L77" class="LineNr"> 77 </span>    b8/copy-to-eax 1/imm32
-<span id="L78" class="LineNr"> 78 </span>    81 7/subop/compare *(ebp+8) 1/imm32
-<span id="L79" class="LineNr"> 79 </span>    7e/jump-if-&lt;= $factorial:end/disp8
-<span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># var ebx: int = n-1</span>
-<span id="L81" class="LineNr"> 81 </span>    8b/-&gt; *(ebp+8) 3/r32/ebx
-<span id="L82" class="LineNr"> 82 </span>    4b/decrement-ebx
-<span id="L83" class="LineNr"> 83 </span>    <span class="subxComment"># var eax: int = factorial(n-1)</span>
-<span id="L84" class="LineNr"> 84 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L85" class="LineNr"> 85 </span>    53/push-ebx
-<span id="L86" class="LineNr"> 86 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L87" class="LineNr"> 87 </span>    e8/call <a href='factorial2.subx.html#L71'>factorial</a>/disp32
-<span id="L88" class="LineNr"> 88 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L89" class="LineNr"> 89 </span>    81 0/subop/add %esp 4/imm32
-<span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># return n * factorial(n-1)</span>
-<span id="L91" class="LineNr"> 91 </span>    f7 4/subop/multiply-into-eax *(ebp+8)
-<span id="L92" class="LineNr"> 92 </span>    <span class="subxComment"># TODO: check for overflow</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Constant">$factorial:end</span>:
-<span id="L94" class="LineNr"> 94 </span>    <span class="subxS1Comment"># . epilogue</span>
-<span id="L95" class="LineNr"> 95 </span>    5b/pop-to-ebx
-<span id="L96" class="LineNr"> 96 </span>    89/&lt;- %esp 5/r32/ebp
-<span id="L97" class="LineNr"> 97 </span>    5d/pop-to-ebp
-<span id="L98" class="LineNr"> 98 </span>    c3/return
-<span id="L99" class="LineNr"> 99 </span>
-<span id="L100" class="LineNr">100 </span><span class="subxTest">test-factorial</span>:
-<span id="L101" class="LineNr">101 </span>    <span class="subxComment"># factorial(5)</span>
-<span id="L102" class="LineNr">102 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L103" class="LineNr">103 </span>    68/push 5/imm32
-<span id="L104" class="LineNr">104 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L105" class="LineNr">105 </span>    e8/call <a href='factorial2.subx.html#L71'>factorial</a>/disp32
-<span id="L106" class="LineNr">106 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L107" class="LineNr">107 </span>    81 0/subop/add %esp 4/imm32
-<span id="L108" class="LineNr">108 </span>    <span class="subxComment"># check-ints-equal(eax, 120, msg)</span>
-<span id="L109" class="LineNr">109 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L110" class="LineNr">110 </span>    68/push <span class="Constant">&quot;F - test-factorial&quot;</span>/imm32
-<span id="L111" class="LineNr">111 </span>    68/push 0x78/imm32/expected-120
-<span id="L112" class="LineNr">112 </span>    50/push-eax
-<span id="L113" class="LineNr">113 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L114" class="LineNr">114 </span>    e8/call <a href='../051test.subx.html#L24'>check-ints-equal</a>/disp32
-<span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L116" class="LineNr">116 </span>    81 0/subop/add %esp 0xc/imm32
-<span id="L117" class="LineNr">117 </span>    <span class="subxComment"># end</span>
-<span id="L118" class="LineNr">118 </span>    c3/return
+<span id="L68" class="LineNr"> 68 </span>    e8/call  syscall_exit/disp32
+<span id="L69" class="LineNr"> 69 </span>
+<span id="L70" class="LineNr"> 70 </span><span class="subxFunction">factorial</span>:  <span class="subxComment"># n: int -&gt; int/eax</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="subxS1Comment"># . prologue</span>
+<span id="L72" class="LineNr"> 72 </span>    55/push-ebp
+<span id="L73" class="LineNr"> 73 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L74" class="LineNr"> 74 </span>    53/push-ebx
+<span id="L75" class="LineNr"> 75 </span>    <span class="subxComment"># if (n &lt;= 1) return 1</span>
+<span id="L76" class="LineNr"> 76 </span>    b8/copy-to-eax 1/imm32
+<span id="L77" class="LineNr"> 77 </span>    81 7/subop/compare *(ebp+8) 1/imm32
+<span id="L78" class="LineNr"> 78 </span>    7e/jump-if-&lt;= $factorial:end/disp8
+<span id="L79" class="LineNr"> 79 </span>    <span class="subxComment"># var ebx: int = n-1</span>
+<span id="L80" class="LineNr"> 80 </span>    8b/-&gt; *(ebp+8) 3/r32/ebx
+<span id="L81" class="LineNr"> 81 </span>    4b/decrement-ebx
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># var eax: int = factorial(n-1)</span>
+<span id="L83" class="LineNr"> 83 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L84" class="LineNr"> 84 </span>    53/push-ebx
+<span id="L85" class="LineNr"> 85 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L86" class="LineNr"> 86 </span>    e8/call <a href='factorial2.subx.html#L70'>factorial</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 %esp 4/imm32
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxComment"># return n * factorial(n-1)</span>
+<span id="L90" class="LineNr"> 90 </span>    f7 4/subop/multiply-into-eax *(ebp+8)
+<span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># TODO: check for overflow</span>
+<span id="L92" class="LineNr"> 92 </span><span class="Constant">$factorial:end</span>:
+<span id="L93" class="LineNr"> 93 </span>    <span class="subxS1Comment"># . epilogue</span>
+<span id="L94" class="LineNr"> 94 </span>    5b/pop-to-ebx
+<span id="L95" class="LineNr"> 95 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L96" class="LineNr"> 96 </span>    5d/pop-to-ebp
+<span id="L97" class="LineNr"> 97 </span>    c3/return
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="subxTest">test-factorial</span>:
+<span id="L100" class="LineNr">100 </span>    <span class="subxComment"># factorial(5)</span>
+<span id="L101" class="LineNr">101 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L102" class="LineNr">102 </span>    68/push 5/imm32
+<span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L104" class="LineNr">104 </span>    e8/call <a href='factorial2.subx.html#L70'>factorial</a>/disp32
+<span id="L105" class="LineNr">105 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L106" class="LineNr">106 </span>    81 0/subop/add %esp 4/imm32
+<span id="L107" class="LineNr">107 </span>    <span class="subxComment"># check-ints-equal(eax, 120, msg)</span>
+<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L109" class="LineNr">109 </span>    68/push <span class="Constant">&quot;F - test-factorial&quot;</span>/imm32
+<span id="L110" class="LineNr">110 </span>    68/push 0x78/imm32/expected-120
+<span id="L111" class="LineNr">111 </span>    50/push-eax
+<span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L113" class="LineNr">113 </span>    e8/call <a href='../051test.subx.html#L23'>check-ints-equal</a>/disp32
+<span id="L114" class="LineNr">114 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L115" class="LineNr">115 </span>    81 0/subop/add %esp 0xc/imm32
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># end</span>
+<span id="L117" class="LineNr">117 </span>    c3/return
 </pre>
 </body>
 </html>