about summary refs log tree commit diff stats
path: root/html/subx/apps
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2018-10-28 13:41:53 -0700
committerKartik Agaram <vc@akkartik.com>2018-10-28 13:41:53 -0700
commit4c37b3e91b3e9c891c22379f029c42abc38e408c (patch)
tree4ec99b816d7a0d1c93107e16ea1d79e4231e6962 /html/subx/apps
parent172e52c47bd5bd1b189c5160ffda30eb75c39239 (diff)
downloadmu-4c37b3e91b3e9c891c22379f029c42abc38e408c.tar.gz
4734
Diffstat (limited to 'html/subx/apps')
-rw-r--r--html/subx/apps/crenshaw2-1.subx.html188
-rw-r--r--html/subx/apps/factorial.subx.html10
2 files changed, 105 insertions, 93 deletions
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index 5bd1da84..c848a55f 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -54,94 +54,106 @@ if ('onhashchange' in window) {
 </head>
 <body onload='JumpToLine();'>
 <pre id='vimCodeElement'>
-<span id="L1" class="LineNr"> 1 </span><span class="SalientComment">## port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
-<span id="L2" class="LineNr"> 2 </span><span class="Comment"># corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
-<span id="L3" class="LineNr"> 3 </span><span class="Comment">#</span>
-<span id="L4" class="LineNr"> 4 </span><span class="Comment"># To run (from the subx directory):</span>
-<span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx translate *.subx apps/crenshaw2.1.subx -o crenshaw 2.1</span>
-<span id="L6" class="LineNr"> 6 </span><span class="Comment">#   $ echo '3'  |subx run apps/crenshaw2.1  |xxd -</span>
-<span id="L7" class="LineNr"> 7 </span><span class="Comment"># Expected output:</span>
-<span id="L8" class="LineNr"> 8 </span><span class="Comment">#   TODO</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment">#</span>
-<span id="L10" class="LineNr">10 </span><span class="Comment"># The output is the code a function would need to include, returning the</span>
-<span id="L11" class="LineNr">11 </span><span class="Comment"># result in EAX.</span>
-<span id="L12" class="LineNr">12 </span><span class="Comment">#</span>
-<span id="L13" class="LineNr">13 </span><span class="Comment"># Major note: byte strings are not null-terminated. Instead they're prefixed</span>
-<span id="L14" class="LineNr">14 </span><span class="Comment"># with a 32-bit length.</span>
-<span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span>== code
-<span id="L17" class="LineNr">17 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L18" class="LineNr">18 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L19" class="LineNr">19 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
-<span id="L20" class="LineNr">20 </span>
-<span id="L21" class="LineNr">21 </span><span class="Comment"># main:</span>
-<span id="L22" class="LineNr">22 </span>  <span class="Comment"># abort(&quot;Integer&quot;)</span>
-<span id="L23" class="LineNr">23 </span>    <span class="Comment"># push args</span>
-<span id="L24" class="LineNr">24 </span>  68/push  &quot;Integer&quot;/imm32
-<span id="L25" class="LineNr">25 </span>    <span class="Comment"># call</span>
-<span id="L26" class="LineNr">26 </span>  e8/call  abort/disp32
-<span id="L27" class="LineNr">27 </span>    <span class="Comment"># discard arg</span>
-<span id="L28" class="LineNr">28 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L29" class="LineNr">29 </span>  <span class="Comment"># syscall(exit, 0)</span>
-<span id="L30" class="LineNr">30 </span>  bb/copy-to-EBX  0/imm32
-<span id="L31" class="LineNr">31 </span>  b8/copy-to-EAX  1/imm32/exit
-<span id="L32" class="LineNr">32 </span>  cd/syscall  0x80/imm8
-<span id="L33" class="LineNr">33 </span>
-<span id="L34" class="LineNr">34 </span><span class="SalientComment">## helpers</span>
-<span id="L35" class="LineNr">35 </span>
-<span id="L36" class="LineNr">36 </span><span class="Comment"># print error message and exit</span>
-<span id="L37" class="LineNr">37 </span><span class="Comment"># really maps to the 'Expected' function in Crenshaw</span>
-<span id="L38" class="LineNr">38 </span>abort:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Comment"># error(s)</span>
-<span id="L40" class="LineNr">40 </span>    <span class="Comment"># push args</span>
-<span id="L41" class="LineNr">41 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
-<span id="L42" class="LineNr">42 </span>    <span class="Comment"># call</span>
-<span id="L43" class="LineNr">43 </span>  e8/call  error/disp32
-<span id="L44" class="LineNr">44 </span>    <span class="Comment"># discard arg</span>
-<span id="L45" class="LineNr">45 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
-<span id="L46" class="LineNr">46 </span>  <span class="Comment"># syscall(exit, 1)</span>
-<span id="L47" class="LineNr">47 </span>  bb/copy-to-EBX  1/imm32
-<span id="L48" class="LineNr">48 </span>  b8/copy-to-EAX  1/imm32/exit
-<span id="L49" class="LineNr">49 </span>  cd/syscall  0x80/imm8
-<span id="L50" class="LineNr">50 </span>
-<span id="L51" class="LineNr">51 </span><span class="Comment"># print out &quot;Error: #{s} expected\n&quot; to stderr</span>
-<span id="L52" class="LineNr">52 </span>error:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L53" class="LineNr">53 </span>  <span class="Comment"># write(2/stderr, &quot;Error: &quot;)</span>
-<span id="L54" class="LineNr">54 </span>    <span class="Comment"># push args</span>
-<span id="L55" class="LineNr">55 </span>  68/push  &quot;Error: &quot;/imm32
-<span id="L56" class="LineNr">56 </span>  68/push  2/imm32/stderr
-<span id="L57" class="LineNr">57 </span>    <span class="Comment"># call</span>
-<span id="L58" class="LineNr">58 </span>  e8/call  write/disp32
-<span id="L59" class="LineNr">59 </span>    <span class="Comment"># discard arg</span>
-<span id="L60" class="LineNr">60 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L61" class="LineNr">61 </span>  <span class="Comment"># write(2/stderr, s)</span>
-<span id="L62" class="LineNr">62 </span>    <span class="Comment"># push args</span>
-<span id="L63" class="LineNr">63 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(ESP+4)</span>
-<span id="L64" class="LineNr">64 </span>  68/push  2/imm32/stderr
-<span id="L65" class="LineNr">65 </span>    <span class="Comment"># call</span>
-<span id="L66" class="LineNr">66 </span>  e8/call  write/disp32
-<span id="L67" class="LineNr">67 </span>    <span class="Comment"># discard arg</span>
-<span id="L68" class="LineNr">68 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L69" class="LineNr">69 </span>  <span class="Comment"># write(2/stderr, &quot; expected&quot;)</span>
-<span id="L70" class="LineNr">70 </span>    <span class="Comment"># push args</span>
-<span id="L71" class="LineNr">71 </span>  68/push  &quot; expected&quot;/imm32
-<span id="L72" class="LineNr">72 </span>  68/push  2/imm32/stderr
-<span id="L73" class="LineNr">73 </span>    <span class="Comment"># call</span>
-<span id="L74" class="LineNr">74 </span>  e8/call  write/disp32
-<span id="L75" class="LineNr">75 </span>    <span class="Comment"># discard arg</span>
-<span id="L76" class="LineNr">76 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L77" class="LineNr">77 </span>  <span class="Comment"># write(2/stderr, &quot;\n&quot;)</span>
-<span id="L78" class="LineNr">78 </span>    <span class="Comment"># push args</span>
-<span id="L79" class="LineNr">79 </span>  68/push  Newline/imm32
-<span id="L80" class="LineNr">80 </span>  68/push  2/imm32/stderr
-<span id="L81" class="LineNr">81 </span>    <span class="Comment"># call</span>
-<span id="L82" class="LineNr">82 </span>  e8/call  write/disp32
-<span id="L83" class="LineNr">83 </span>    <span class="Comment"># discard arg</span>
-<span id="L84" class="LineNr">84 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
-<span id="L85" class="LineNr">85 </span>  <span class="Comment"># end</span>
-<span id="L86" class="LineNr">86 </span>  c3/return
-<span id="L87" class="LineNr">87 </span>
-<span id="L88" class="LineNr">88 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
+<span id="L1" class="LineNr">  1 </span><span class="SalientComment">## port of <a href="https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas">https://github.com/akkartik/crenshaw/blob/master/tutor2.1.pas</a></span>
+<span id="L2" class="LineNr">  2 </span><span class="Comment"># corresponds to the section &quot;single digits&quot; in <a href="https://compilers.iecc.com/crenshaw/tutor2.txt">https://compilers.iecc.com/crenshaw/tutor2.txt</a></span>
+<span id="L3" class="LineNr">  3 </span><span class="Comment">#</span>
+<span id="L4" class="LineNr">  4 </span><span class="Comment"># To run (from the subx directory):</span>
+<span id="L5" class="LineNr">  5 </span><span class="Comment">#   $ ./subx translate *.subx apps/crenshaw2-1.subx -o crenshaw2-1</span>
+<span id="L6" class="LineNr">  6 </span><span class="Comment">#   $ echo '3'  |./subx run apps/crenshaw2-1</span>
+<span id="L7" class="LineNr">  7 </span><span class="Comment"># Expected output (not working yet):</span>
+<span id="L8" class="LineNr">  8 </span><span class="Comment">#   # syscall(exit, 3)</span>
+<span id="L9" class="LineNr">  9 </span><span class="Comment">#   bb/copy-to-EBX  3/imm32</span>
+<span id="L10" class="LineNr"> 10 </span><span class="Comment">#   b8/copy-to-EAX  1/imm32/exit</span>
+<span id="L11" class="LineNr"> 11 </span><span class="Comment">#   cd/syscall  0x80/imm8</span>
+<span id="L12" class="LineNr"> 12 </span><span class="Comment">#</span>
+<span id="L13" class="LineNr"> 13 </span><span class="Comment"># To run the generated output:</span>
+<span id="L14" class="LineNr"> 14 </span><span class="Comment">#   $ echo '3'  |./subx run apps/crenshaw2-1 &gt; z1.subx</span>
+<span id="L15" class="LineNr"> 15 </span><span class="Comment">#   $ ./subx translate z1.subx -o z1</span>
+<span id="L16" class="LineNr"> 16 </span><span class="Comment">#   $ ./subx run z1</span>
+<span id="L17" class="LineNr"> 17 </span><span class="Comment">#   $ echo $?</span>
+<span id="L18" class="LineNr"> 18 </span><span class="Comment">#   3</span>
+<span id="L19" class="LineNr"> 19 </span><span class="Comment">#</span>
+<span id="L20" class="LineNr"> 20 </span><span class="Comment"># Stdin must contain just a single hex number. Other input will print an error:</span>
+<span id="L21" class="LineNr"> 21 </span><span class="Comment">#   $ echo 'xyz'  |./subx run apps/crenshaw2-1</span>
+<span id="L22" class="LineNr"> 22 </span><span class="Comment">#   Error: integer expected</span>
+<span id="L23" class="LineNr"> 23 </span>
+<span id="L24" class="LineNr"> 24 </span>== code
+<span id="L25" class="LineNr"> 25 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L26" class="LineNr"> 26 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L27" class="LineNr"> 27 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
+<span id="L28" class="LineNr"> 28 </span>
+<span id="L29" class="LineNr"> 29 </span><span class="Comment"># main:</span>
+<span id="L30" class="LineNr"> 30 </span>  <span class="Comment"># allocate space for an exit-descriptor</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Comment"># var ed/EAX : (address exit-descriptor)</span>
+<span id="L32" class="LineNr"> 32 </span>  81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># subtract from ESP</span>
+<span id="L33" class="LineNr"> 33 </span>  8d/copy-address                 0/mod/indirect  4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EAX</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># clear ed-&gt;target (so we really exit)</span>
+<span id="L35" class="LineNr"> 35 </span>  c7/copy                         0/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0/imm32           <span class="Comment"># copy to *EAX</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Comment"># expected(ed, 2/stderr, &quot;integer&quot;)</span>
+<span id="L37" class="LineNr"> 37 </span>    <span class="Comment"># push args</span>
+<span id="L38" class="LineNr"> 38 </span>  68/push  &quot;integer&quot;/imm32
+<span id="L39" class="LineNr"> 39 </span>  68/push  2/imm32/stderr
+<span id="L40" class="LineNr"> 40 </span>  50/push-EAX
+<span id="L41" class="LineNr"> 41 </span>    <span class="Comment"># call</span>
+<span id="L42" class="LineNr"> 42 </span>  e8/call  expected/disp32
+<span id="L43" class="LineNr"> 43 </span>    <span class="Comment"># discard args</span>
+<span id="L44" class="LineNr"> 44 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xc/imm32         <span class="Comment"># add to ESP</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Comment"># syscall(exit, 0)</span>
+<span id="L46" class="LineNr"> 46 </span>  bb/copy-to-EBX  0/imm32
+<span id="L47" class="LineNr"> 47 </span>  b8/copy-to-EAX  1/imm32/exit
+<span id="L48" class="LineNr"> 48 </span>  cd/syscall  0x80/imm8
+<span id="L49" class="LineNr"> 49 </span>
+<span id="L50" class="LineNr"> 50 </span><span class="SalientComment">## helpers</span>
+<span id="L51" class="LineNr"> 51 </span>
+<span id="L52" class="LineNr"> 52 </span>expected:  <span class="Comment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte)</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Comment"># prolog</span>
+<span id="L54" class="LineNr"> 54 </span>  55/push-EBP
+<span id="L55" class="LineNr"> 55 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L56" class="LineNr"> 56 </span>  <span class="Comment"># write(f, &quot;Error: &quot;)</span>
+<span id="L57" class="LineNr"> 57 </span>    <span class="Comment"># push args</span>
+<span id="L58" class="LineNr"> 58 </span>  68/push  &quot;Error: &quot;/imm32
+<span id="L59" class="LineNr"> 59 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
+<span id="L60" class="LineNr"> 60 </span>    <span class="Comment"># call</span>
+<span id="L61" class="LineNr"> 61 </span>  e8/call  write/disp32
+<span id="L62" class="LineNr"> 62 </span>    <span class="Comment"># discard args</span>
+<span id="L63" class="LineNr"> 63 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># write(f, s)</span>
+<span id="L65" class="LineNr"> 65 </span>    <span class="Comment"># push args</span>
+<span id="L66" class="LineNr"> 66 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0x10/disp8     <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+16)</span>
+<span id="L67" class="LineNr"> 67 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
+<span id="L68" class="LineNr"> 68 </span>    <span class="Comment"># call</span>
+<span id="L69" class="LineNr"> 69 </span>  e8/call  write/disp32
+<span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># discard args</span>
+<span id="L71" class="LineNr"> 71 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># write(f, &quot; expected&quot;)</span>
+<span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># push args</span>
+<span id="L74" class="LineNr"> 74 </span>  68/push  &quot; expected&quot;/imm32
+<span id="L75" class="LineNr"> 75 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Comment"># call</span>
+<span id="L77" class="LineNr"> 77 </span>  e8/call  write/disp32
+<span id="L78" class="LineNr"> 78 </span>    <span class="Comment"># discard args</span>
+<span id="L79" class="LineNr"> 79 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># write(f, Newline)</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="Comment"># push args</span>
+<span id="L82" class="LineNr"> 82 </span>  68/push  Newline/imm32
+<span id="L83" class="LineNr"> 83 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+12)</span>
+<span id="L84" class="LineNr"> 84 </span>    <span class="Comment"># call</span>
+<span id="L85" class="LineNr"> 85 </span>  e8/call  write/disp32
+<span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># discard args</span>
+<span id="L87" class="LineNr"> 87 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              8/imm32           <span class="Comment"># add to ESP</span>
+<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># stop(ed, 1)</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># push args</span>
+<span id="L90" class="LineNr"> 90 </span>  68/push  1/imm32
+<span id="L91" class="LineNr"> 91 </span>  ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># call</span>
+<span id="L93" class="LineNr"> 93 </span>  e8/call  stop/disp32
+<span id="L94" class="LineNr"> 94 </span>  <span class="SalientComment">## should never get past this point</span>
+<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># epilog</span>
+<span id="L96" class="LineNr"> 96 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<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="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 8e65e9cc..a30495cb 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -98,11 +98,11 @@ if ('onhashchange' in window) {
 <span id="L42" class="LineNr"> 42 </span>  eb/jump  $main:end/disp8  <span class="Comment"># where EAX will get copied to EBX</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Comment"># else EAX = factorial(5)</span>
 <span id="L44" class="LineNr"> 44 </span>$run-main:
-<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># push arg</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># push args</span>
 <span id="L46" class="LineNr"> 46 </span>  68/push  5/imm32
 <span id="L47" class="LineNr"> 47 </span>    <span class="Comment"># call</span>
 <span id="L48" class="LineNr"> 48 </span>  e8/call  factorial/disp32
-<span id="L49" class="LineNr"> 49 </span>    <span class="Comment"># discard arg</span>
+<span id="L49" class="LineNr"> 49 </span>    <span class="Comment"># discard args</span>
 <span id="L50" class="LineNr"> 50 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
 <span id="L51" class="LineNr"> 51 </span>$main:end:
 <span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># exit(EAX)</span>
@@ -129,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span>  53/push-EBX
 <span id="L74" class="LineNr"> 74 </span>    <span class="Comment"># call</span>
 <span id="L75" class="LineNr"> 75 </span>  e8/call  factorial/disp32
-<span id="L76" class="LineNr"> 76 </span>    <span class="Comment"># discard arg</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="Comment"># discard args</span>
 <span id="L77" class="LineNr"> 77 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Comment"># return n * factorial(n-1)</span>
 <span id="L79" class="LineNr"> 79 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(EBP+8) into EAX</span>
@@ -143,11 +143,11 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span>
 <span id="L88" class="LineNr"> 88 </span>test-factorial:
 <span id="L89" class="LineNr"> 89 </span>  <span class="Comment"># factorial(5)</span>
-<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># push arg</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="Comment"># push args</span>
 <span id="L91" class="LineNr"> 91 </span>  68/push  5/imm32
 <span id="L92" class="LineNr"> 92 </span>    <span class="Comment"># call</span>
 <span id="L93" class="LineNr"> 93 </span>  e8/call  factorial/disp32
-<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># discard arg</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># discard args</span>
 <span id="L95" class="LineNr"> 95 </span>  81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32           <span class="Comment"># add to ESP</span>
 <span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># check-ints-equal(EAX, 120, failure message)</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Comment"># push args</span>