5707

1 files changed, 78 insertions, 74 deletions

diff --git a/html/apps/factorial3.subx.html b/html/apps/factorial3.subx.html
index 1a9566d5..7080e5cb 100644
--- a/html/apps/factorial3.subx.html
+++ b/html/apps/factorial3.subx.html
@@ -59,81 +59,85 @@ if ('onhashchange' in window) {
 <pre id='vimCodeElement'>
 <span id="L1" class="LineNr"> 1 </span><span class="subxComment">## compute the factorial of 5, and return the result in the exit code</span>
 <span id="L2" class="LineNr"> 2 </span><span class="subxComment">#</span>
-<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># To run:</span>
-<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   $ ./ntranslate init.linux 0*.subx apps/factorial.subx -o apps/factorial</span>
-<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   $ ./subx run apps/factorial</span>
-<span id="L6" class="LineNr"> 6 </span><span class="subxComment"># Expected result:</span>
-<span id="L7" class="LineNr"> 7 </span><span class="subxComment">#   $ echo $?</span>
-<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   120</span>
-<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#</span>
-<span id="L10" class="LineNr">10 </span><span class="subxComment"># You can also run the automated test suite:</span>
-<span id="L11" class="LineNr">11 </span><span class="subxComment">#   $ ./subx run apps/factorial test</span>
-<span id="L12" class="LineNr">12 </span><span class="subxComment"># Expected output:</span>
-<span id="L13" class="LineNr">13 </span><span class="subxComment">#   ........</span>
-<span id="L14" class="LineNr">14 </span><span class="subxComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span>
-<span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span>== code
-<span id="L17" class="LineNr">17 </span>
-<span id="L18" class="LineNr">18 </span><span class="SpecialChar">Entry</span>:  <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span>
-<span id="L19" class="LineNr">19 </span>    <span class="subxS1Comment"># . prologue</span>
-<span id="L20" class="LineNr">20 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L3" class="LineNr"> 3 </span><span class="subxComment"># Uses syntax sugar for:</span>
+<span id="L4" class="LineNr"> 4 </span><span class="subxComment">#   rm32 operands</span>
+<span id="L5" class="LineNr"> 5 </span><span class="subxComment">#   function calls</span>
+<span id="L6" class="LineNr"> 6 </span><span class="subxComment">#</span>
+<span id="L7" class="LineNr"> 7 </span><span class="subxComment"># To run:</span>
+<span id="L8" class="LineNr"> 8 </span><span class="subxComment">#   $ ./ntranslate init.linux 0*.subx apps/factorial.subx -o apps/factorial</span>
+<span id="L9" class="LineNr"> 9 </span><span class="subxComment">#   $ ./subx run apps/factorial</span>
+<span id="L10" class="LineNr">10 </span><span class="subxComment"># Expected result:</span>
+<span id="L11" class="LineNr">11 </span><span class="subxComment">#   $ echo $?</span>
+<span id="L12" class="LineNr">12 </span><span class="subxComment">#   120</span>
+<span id="L13" class="LineNr">13 </span><span class="subxComment">#</span>
+<span id="L14" class="LineNr">14 </span><span class="subxComment"># You can also run the automated test suite:</span>
+<span id="L15" class="LineNr">15 </span><span class="subxComment">#   $ ./subx run apps/factorial test</span>
+<span id="L16" class="LineNr">16 </span><span class="subxComment"># Expected output:</span>
+<span id="L17" class="LineNr">17 </span><span class="subxComment">#   ........</span>
+<span id="L18" class="LineNr">18 </span><span class="subxComment"># Every '.' indicates a passing test. Failing tests get a 'F'.</span>
+<span id="L19" class="LineNr">19 </span>
+<span id="L20" class="LineNr">20 </span>== code
 <span id="L21" class="LineNr">21 </span>
-<span id="L22" class="LineNr">22 </span>    <span class="subxComment"># initialize heap</span>
-<span id="L23" class="LineNr">23 </span>    (<a href='../053new-segment.subx.html#L41'>new-segment</a> <span class="SpecialChar"><a href='../069allocate.subx.html#L29'>Heap-size</a></span> <span class="SpecialChar"><a href='../069allocate.subx.html#L22'>Heap</a></span>)
-<span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot;, then return run_tests()</span>
-<span id="L26" class="LineNr">26 </span>    <span class="subxComment"># if (argc &lt;= 1) goto run-main</span>
-<span id="L27" class="LineNr">27 </span>    81 7/subop/compare *ebp 1/imm32
-<span id="L28" class="LineNr">28 </span>    7e/jump-if-lesser-or-equal $run-main/disp8
-<span id="L29" class="LineNr">29 </span>    <span class="subxComment"># if (!kernel-string-equal?(argv[1], &quot;test&quot;)) goto run-main</span>
-<span id="L30" class="LineNr">30 </span>    (<a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal?</a> *(ebp+8) <span class="Constant">&quot;test&quot;</span>)  <span class="subxComment"># =&gt; eax</span>
-<span id="L31" class="LineNr">31 </span>    <span class="subxS1Comment"># . if (eax == 0) goto run-main</span>
-<span id="L32" class="LineNr">32 </span>    3d/compare-eax-and 0/imm32
-<span id="L33" class="LineNr">33 </span>    74/jump-if-equal $run-main/disp8
-<span id="L34" class="LineNr">34 </span>    <span class="subxComment">#</span>
-<span id="L35" class="LineNr">35 </span>    (run-tests)
-<span id="L36" class="LineNr">36 </span>    <span class="subxComment"># syscall(exit, *Num-test-failures)</span>
-<span id="L37" class="LineNr">37 </span>    8b/-&gt; *<span class="SpecialChar"><a href='../051test.subx.html#L90'>Num-test-failures</a></span> 3/r32/ebx
-<span id="L38" class="LineNr">38 </span>    eb/jump $main:end/disp8
-<span id="L39" class="LineNr">39 </span><span class="Constant">$run-main</span>:
-<span id="L40" class="LineNr">40 </span>    <span class="subxH1Comment"># - otherwise</span>
-<span id="L41" class="LineNr">41 </span>    (<a href='factorial3.subx.html#L48'>factorial</a> 5)  <span class="subxComment"># =&gt; eax</span>
-<span id="L42" class="LineNr">42 </span>    <span class="subxComment"># syscall(exit, eax)</span>
-<span id="L43" class="LineNr">43 </span>    89/&lt;- %ebx 0/r32/eax
-<span id="L44" class="LineNr">44 </span><span class="Constant">$main:end</span>:
-<span id="L45" class="LineNr">45 </span>    b8/copy-to-eax 1/imm32/exit
-<span id="L46" class="LineNr">46 </span>    cd/syscall 0x80/imm8
-<span id="L47" class="LineNr">47 </span>
-<span id="L48" class="LineNr">48 </span><span class="subxFunction">factorial</span>:  <span class="subxComment"># n : int -&gt; int/eax</span>
-<span id="L49" class="LineNr">49 </span>    <span class="subxS1Comment"># . prologue</span>
-<span id="L50" class="LineNr">50 </span>    55/push-ebp
-<span id="L51" class="LineNr">51 </span>    89/&lt;- %ebp 4/r32/esp
-<span id="L52" class="LineNr">52 </span>    <span class="subxComment"># save registers</span>
-<span id="L53" class="LineNr">53 </span>    53/push-ebx
-<span id="L54" class="LineNr">54 </span>    <span class="subxComment"># if (n &lt;= 1) return 1</span>
-<span id="L55" class="LineNr">55 </span>    b8/copy-to-eax 1/imm32
-<span id="L56" class="LineNr">56 </span>    81 7/subop/compare *(ebp+8) 1/imm32
-<span id="L57" class="LineNr">57 </span>    7e/jump-if-&lt;= $factorial:end/disp8
-<span id="L58" class="LineNr">58 </span>    <span class="subxComment"># ebx = n-1</span>
-<span id="L59" class="LineNr">59 </span>    8b/-&gt; *(ebp+8) 3/r32/ebx
-<span id="L60" class="LineNr">60 </span>    4b/decrement-ebx
-<span id="L61" class="LineNr">61 </span>    <span class="subxComment">#</span>
-<span id="L62" class="LineNr">62 </span>    (<a href='factorial3.subx.html#L48'>factorial</a> %ebx)  <span class="subxComment"># =&gt; eax</span>
-<span id="L63" class="LineNr">63 </span>    <span class="subxComment"># return n * factorial(n-1)</span>
-<span id="L64" class="LineNr">64 </span>    f7 4/subop/multiply-into-eax *(ebp+8)
-<span id="L65" class="LineNr">65 </span>    <span class="subxComment"># TODO: check for overflow</span>
-<span id="L66" class="LineNr">66 </span><span class="Constant">$factorial:end</span>:
-<span id="L67" class="LineNr">67 </span>    <span class="subxComment"># restore registers</span>
-<span id="L68" class="LineNr">68 </span>    5b/pop-to-ebx
-<span id="L69" class="LineNr">69 </span>    <span class="subxS1Comment"># . epilogue</span>
-<span id="L70" class="LineNr">70 </span>    89/&lt;- %esp 5/r32/ebp
-<span id="L71" class="LineNr">71 </span>    5d/pop-to-ebp
-<span id="L72" class="LineNr">72 </span>    c3/return
-<span id="L73" class="LineNr">73 </span>
-<span id="L74" class="LineNr">74 </span><span class="subxTest">test-factorial</span>:
-<span id="L75" class="LineNr">75 </span>    (<a href='factorial3.subx.html#L48'>factorial</a> 5)
-<span id="L76" class="LineNr">76 </span>    (<a href='../051test.subx.html#L24'>check-ints-equal</a> %eax 0x78 <span class="Constant">&quot;F - test-factorial&quot;</span>)
-<span id="L77" class="LineNr">77 </span>    c3/return
+<span id="L22" class="LineNr">22 </span><span class="SpecialChar">Entry</span>:  <span class="subxComment"># run tests if necessary, compute `factorial(5)` if not</span>
+<span id="L23" class="LineNr">23 </span>    <span class="subxS1Comment"># . prologue</span>
+<span id="L24" class="LineNr">24 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L25" class="LineNr">25 </span>
+<span id="L26" class="LineNr">26 </span>    <span class="subxComment"># initialize heap</span>
+<span id="L27" class="LineNr">27 </span>    (<a href='../053new-segment.subx.html#L41'>new-segment</a> <span class="SpecialChar"><a href='../069allocate.subx.html#L29'>Heap-size</a></span> <span class="SpecialChar"><a href='../069allocate.subx.html#L22'>Heap</a></span>)
+<span id="L28" class="LineNr">28 </span>
+<span id="L29" class="LineNr">29 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot;, then return run_tests()</span>
+<span id="L30" class="LineNr">30 </span>    <span class="subxComment"># if (argc &lt;= 1) goto run-main</span>
+<span id="L31" class="LineNr">31 </span>    81 7/subop/compare *ebp 1/imm32
+<span id="L32" class="LineNr">32 </span>    7e/jump-if-lesser-or-equal $run-main/disp8
+<span id="L33" class="LineNr">33 </span>    <span class="subxComment"># if (!kernel-string-equal?(argv[1], &quot;test&quot;)) goto run-main</span>
+<span id="L34" class="LineNr">34 </span>    (<a href='../052kernel-string-equal.subx.html#L31'>kernel-string-equal?</a> *(ebp+8) <span class="Constant">&quot;test&quot;</span>)  <span class="subxComment"># =&gt; eax</span>
+<span id="L35" class="LineNr">35 </span>    <span class="subxS1Comment"># . if (eax == 0) goto run-main</span>
+<span id="L36" class="LineNr">36 </span>    3d/compare-eax-and 0/imm32
+<span id="L37" class="LineNr">37 </span>    74/jump-if-equal $run-main/disp8
+<span id="L38" class="LineNr">38 </span>    <span class="subxComment">#</span>
+<span id="L39" class="LineNr">39 </span>    (run-tests)
+<span id="L40" class="LineNr">40 </span>    <span class="subxComment"># syscall(exit, *Num-test-failures)</span>
+<span id="L41" class="LineNr">41 </span>    8b/-&gt; *<span class="SpecialChar"><a href='../051test.subx.html#L90'>Num-test-failures</a></span> 3/r32/ebx
+<span id="L42" class="LineNr">42 </span>    eb/jump $main:end/disp8
+<span id="L43" class="LineNr">43 </span><span class="Constant">$run-main</span>:
+<span id="L44" class="LineNr">44 </span>    <span class="subxH1Comment"># - otherwise</span>
+<span id="L45" class="LineNr">45 </span>    (<a href='factorial3.subx.html#L52'>factorial</a> 5)  <span class="subxComment"># =&gt; eax</span>
+<span id="L46" class="LineNr">46 </span>    <span class="subxComment"># syscall(exit, eax)</span>
+<span id="L47" class="LineNr">47 </span>    89/&lt;- %ebx 0/r32/eax
+<span id="L48" class="LineNr">48 </span><span class="Constant">$main:end</span>:
+<span id="L49" class="LineNr">49 </span>    b8/copy-to-eax 1/imm32/exit
+<span id="L50" class="LineNr">50 </span>    cd/syscall 0x80/imm8
+<span id="L51" class="LineNr">51 </span>
+<span id="L52" class="LineNr">52 </span><span class="subxFunction">factorial</span>:  <span class="subxComment"># n : int -&gt; int/eax</span>
+<span id="L53" class="LineNr">53 </span>    <span class="subxS1Comment"># . prologue</span>
+<span id="L54" class="LineNr">54 </span>    55/push-ebp
+<span id="L55" class="LineNr">55 </span>    89/&lt;- %ebp 4/r32/esp
+<span id="L56" class="LineNr">56 </span>    <span class="subxComment"># save registers</span>
+<span id="L57" class="LineNr">57 </span>    53/push-ebx
+<span id="L58" class="LineNr">58 </span>    <span class="subxComment"># if (n &lt;= 1) return 1</span>
+<span id="L59" class="LineNr">59 </span>    b8/copy-to-eax 1/imm32
+<span id="L60" class="LineNr">60 </span>    81 7/subop/compare *(ebp+8) 1/imm32
+<span id="L61" class="LineNr">61 </span>    7e/jump-if-&lt;= $factorial:end/disp8
+<span id="L62" class="LineNr">62 </span>    <span class="subxComment"># ebx = n-1</span>
+<span id="L63" class="LineNr">63 </span>    8b/-&gt; *(ebp+8) 3/r32/ebx
+<span id="L64" class="LineNr">64 </span>    4b/decrement-ebx
+<span id="L65" class="LineNr">65 </span>    <span class="subxComment">#</span>
+<span id="L66" class="LineNr">66 </span>    (<a href='factorial3.subx.html#L52'>factorial</a> %ebx)  <span class="subxComment"># =&gt; eax</span>
+<span id="L67" class="LineNr">67 </span>    <span class="subxComment"># return n * factorial(n-1)</span>
+<span id="L68" class="LineNr">68 </span>    f7 4/subop/multiply-into-eax *(ebp+8)
+<span id="L69" class="LineNr">69 </span>    <span class="subxComment"># TODO: check for overflow</span>
+<span id="L70" class="LineNr">70 </span><span class="Constant">$factorial:end</span>:
+<span id="L71" class="LineNr">71 </span>    <span class="subxComment"># restore registers</span>
+<span id="L72" class="LineNr">72 </span>    5b/pop-to-ebx
+<span id="L73" class="LineNr">73 </span>    <span class="subxS1Comment"># . epilogue</span>
+<span id="L74" class="LineNr">74 </span>    89/&lt;- %esp 5/r32/ebp
+<span id="L75" class="LineNr">75 </span>    5d/pop-to-ebp
+<span id="L76" class="LineNr">76 </span>    c3/return
+<span id="L77" class="LineNr">77 </span>
+<span id="L78" class="LineNr">78 </span><span class="subxTest">test-factorial</span>:
+<span id="L79" class="LineNr">79 </span>    (<a href='factorial3.subx.html#L52'>factorial</a> 5)
+<span id="L80" class="LineNr">80 </span>    (<a href='../051test.subx.html#L24'>check-ints-equal</a> %eax 0x78 <span class="Constant">&quot;F - test-factorial&quot;</span>)
+<span id="L81" class="LineNr">81 </span>    c3/return
 </pre>
 </body>
 </html>