about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
Diffstat (limited to 'html')
-rw-r--r--html/subx/052kernel_string_equal.subx.html2
-rw-r--r--html/subx/053new_segment.subx.html121
-rw-r--r--html/subx/apps/factorial.subx.html78
-rw-r--r--html/subx/examples/ex1.subx.html5
-rw-r--r--html/subx/examples/ex3.subx.html11
-rw-r--r--html/subx/examples/ex4.subx.html19
-rw-r--r--html/subx/examples/ex6.subx.html11
7 files changed, 187 insertions, 60 deletions
diff --git a/html/subx/052kernel_string_equal.subx.html b/html/subx/052kernel_string_equal.subx.html
index 5bf5d1d5..7e72aced 100644
--- a/html/subx/052kernel_string_equal.subx.html
+++ b/html/subx/052kernel_string_equal.subx.html
@@ -76,7 +76,7 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L21" class="LineNr"> 21 </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="L22" class="LineNr"> 22 </span>
-<span id="L23" class="LineNr"> 23 </span><span class="Comment"># main:  (if this is the last file loaded)</span>
+<span id="L23" class="LineNr"> 23 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
 <span id="L24" class="LineNr"> 24 </span>  e8/call  run_tests/disp32  <span class="Comment"># 'run_tests' is a function created automatically by SubX. It calls all functions that start with 'test_'.</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L26" class="LineNr"> 26 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EAX to EBX</span>
diff --git a/html/subx/053new_segment.subx.html b/html/subx/053new_segment.subx.html
new file mode 100644
index 00000000..49724d37
--- /dev/null
+++ b/html/subx/053new_segment.subx.html
@@ -0,0 +1,121 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/053new_segment.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
+body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+a { color:#eeeeee; text-decoration: none; }
+a:hover { text-decoration: underline; }
+* { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment"># Create a new segment (for data) using mmap().</span>
+<span id="L2" class="LineNr"> 2 </span>
+<span id="L3" class="LineNr"> 3 </span>== code
+<span id="L4" class="LineNr"> 4 </span>
+<span id="L5" class="LineNr"> 5 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L6" class="LineNr"> 6 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L7" class="LineNr"> 7 </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="L8" class="LineNr"> 8 </span>
+<span id="L9" class="LineNr"> 9 </span><span class="Comment"># main:  (manual test if this is the last file loaded)</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Comment"># EAX = new_segment(0x1000)</span>
+<span id="L11" class="LineNr">11 </span>    <span class="Comment"># push arg</span>
+<span id="L12" class="LineNr">12 </span>  68/push  0x1000/imm32
+<span id="L13" class="LineNr">13 </span>    <span class="Comment"># call</span>
+<span id="L14" class="LineNr">14 </span>  e8/call  new_segment/disp32
+<span id="L15" class="LineNr">15 </span>    <span class="Comment"># discard arg</span>
+<span id="L16" class="LineNr">16 </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="L17" class="LineNr">17 </span>
+<span id="L18" class="LineNr">18 </span>  <span class="Comment"># store to *EAX</span>
+<span id="L19" class="LineNr">19 </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>              0x34/imm32              <span class="Comment"># copy to *EAX</span>
+<span id="L20" class="LineNr">20 </span>
+<span id="L21" class="LineNr">21 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L22" class="LineNr">22 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to EBX</span>
+<span id="L23" class="LineNr">23 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy to EAX</span>
+<span id="L24" class="LineNr">24 </span>  cd/syscall  0x80/imm8
+<span id="L25" class="LineNr">25 </span>
+<span id="L26" class="LineNr">26 </span>new_segment:  <span class="Comment"># len : int -&gt; address</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Comment"># prolog</span>
+<span id="L28" class="LineNr">28 </span>  55/push-EBP
+<span id="L29" class="LineNr">29 </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="L30" class="LineNr">30 </span>  53/push-EBX
+<span id="L31" class="LineNr">31 </span>  <span class="Comment"># copy len to mmap_new_segment.len</span>
+<span id="L32" class="LineNr">32 </span>  <span class="Comment"># TODO: compute mmap_new_segment+4 before runtime</span>
+<span id="L33" class="LineNr">33 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   8/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L34" class="LineNr">34 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              mmap_new_segment/imm32  <span class="Comment"># copy to EBX</span>
+<span id="L35" class="LineNr">35 </span>  89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                      <span class="Comment"># copy EAX to *(EBX+4)</span>
+<span id="L36" class="LineNr">36 </span>  <span class="Comment"># mmap(mmap_new_segment)</span>
+<span id="L37" class="LineNr">37 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              mmap_new_segment/imm32  <span class="Comment"># copy to EBX</span>
+<span id="L38" class="LineNr">38 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x5a/imm32/mmap         <span class="Comment"># copy to EAX</span>
+<span id="L39" class="LineNr">39 </span>  cd/syscall  0x80/imm8
+<span id="L40" class="LineNr">40 </span>  <span class="Comment"># epilog</span>
+<span id="L41" class="LineNr">41 </span>  5b/pop-to-EBX
+<span id="L42" class="LineNr">42 </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="L43" class="LineNr">43 </span>  5d/pop-to-EBP
+<span id="L44" class="LineNr">44 </span>  c3/return
+<span id="L45" class="LineNr">45 </span>
+<span id="L46" class="LineNr">46 </span>== data
+<span id="L47" class="LineNr">47 </span><span class="Comment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
+<span id="L48" class="LineNr">48 </span>mmap_new_segment:  <span class="Comment"># type mmap_arg_struct</span>
+<span id="L49" class="LineNr">49 </span>  <span class="Comment"># addr</span>
+<span id="L50" class="LineNr">50 </span>  00 00 00 00  <span class="Comment"># null</span>
+<span id="L51" class="LineNr">51 </span>  <span class="Comment"># len</span>
+<span id="L52" class="LineNr">52 </span>  00 00 00 00  <span class="Comment"># 0x1000</span>
+<span id="L53" class="LineNr">53 </span>  <span class="Comment"># protection flags</span>
+<span id="L54" class="LineNr">54 </span>  03 00 00 00  <span class="Comment"># PROT_READ | PROT_WRITE</span>
+<span id="L55" class="LineNr">55 </span>  <span class="Comment"># sharing flags</span>
+<span id="L56" class="LineNr">56 </span>  22 00 00 00  <span class="Comment"># MAP_PRIVATE | MAP_ANONYMOUS</span>
+<span id="L57" class="LineNr">57 </span>  <span class="Comment"># fd</span>
+<span id="L58" class="LineNr">58 </span>  ff ff ff ff  <span class="Comment"># -1 since MAP_ANONYMOUS is specified</span>
+<span id="L59" class="LineNr">59 </span>  <span class="Comment"># offset</span>
+<span id="L60" class="LineNr">60 </span>  00 00 00 00  <span class="Comment"># 0 since MAP_ANONYMOUS is specified</span>
+<span id="L61" class="LineNr">61 </span>
+<span id="L62" class="LineNr">62 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index cbb66b9e..7111a908 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -95,11 +95,11 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr"> 39 </span>  <span class="Comment"># then</span>
 <span id="L40" class="LineNr"> 40 </span>  e8/call  run_tests/disp32
 <span id="L41" class="LineNr"> 41 </span>  eb/jump  $main_exit/disp8
-<span id="L42" class="LineNr"> 42 </span>  <span class="Comment"># else EAX &lt;- factorial(5)</span>
+<span id="L42" class="LineNr"> 42 </span>  <span class="Comment"># else EAX = factorial(5)</span>
 <span id="L43" class="LineNr"> 43 </span>$run_main:
 <span id="L44" class="LineNr"> 44 </span>    <span class="Comment"># push arg</span>
 <span id="L45" class="LineNr"> 45 </span>  68/push  5/imm32
-<span id="L46" class="LineNr"> 46 </span>    <span class="Comment"># EAX &lt;- call</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="Comment"># call</span>
 <span id="L47" class="LineNr"> 47 </span>  e8/call  factorial/disp32
 <span id="L48" class="LineNr"> 48 </span>    <span class="Comment"># discard arg</span>
 <span id="L49" class="LineNr"> 49 </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>
@@ -123,42 +123,44 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>  <span class="Comment"># EBX: n-1</span>
 <span id="L68" class="LineNr"> 68 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EBX</span>
 <span id="L69" class="LineNr"> 69 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract from EBX</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
-<span id="L71" class="LineNr"> 71 </span>  53/push-EBX
-<span id="L72" class="LineNr"> 72 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
-<span id="L73" class="LineNr"> 73 </span>  <span class="Comment"># discard arg</span>
-<span id="L74" class="LineNr"> 74 </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="L75" class="LineNr"> 75 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L76" class="LineNr"> 76 </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>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Comment"># TODO: check for overflow</span>
-<span id="L78" class="LineNr"> 78 </span>$factorial:exit:
-<span id="L79" class="LineNr"> 79 </span>  <span class="Comment"># epilog</span>
-<span id="L80" class="LineNr"> 80 </span>  5b/pop-to-EBX
-<span id="L81" class="LineNr"> 81 </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="L82" class="LineNr"> 82 </span>  5d/pop-to-EBP
-<span id="L83" class="LineNr"> 83 </span>  c3/return
-<span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span>test_factorial:
-<span id="L86" class="LineNr"> 86 </span>  <span class="Comment"># factorial(5)</span>
-<span id="L87" class="LineNr"> 87 </span>    <span class="Comment"># push arg</span>
-<span id="L88" class="LineNr"> 88 </span>  68/push  5/imm32
-<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># call</span>
-<span id="L90" class="LineNr"> 90 </span>  e8/call  factorial/disp32
-<span id="L91" class="LineNr"> 91 </span>    <span class="Comment"># discard arg</span>
-<span id="L92" class="LineNr"> 92 </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="L93" class="LineNr"> 93 </span>  <span class="Comment"># check_ints_equal(EAX, 120, failure message)</span>
-<span id="L94" class="LineNr"> 94 </span>    <span class="Comment"># push args</span>
-<span id="L95" class="LineNr"> 95 </span>  68/push  &quot;F - test_factorial&quot;/imm32
-<span id="L96" class="LineNr"> 96 </span>  68/push  0x78/imm32/expected-120
-<span id="L97" class="LineNr"> 97 </span>  50/push-EAX
-<span id="L98" class="LineNr"> 98 </span>    <span class="Comment"># call</span>
-<span id="L99" class="LineNr"> 99 </span>  e8/call  check_ints_equal/disp32
-<span id="L100" class="LineNr">100 </span>    <span class="Comment"># discard args</span>
-<span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </span>  <span class="Comment"># end</span>
-<span id="L103" class="LineNr">103 </span>  c3/return
-<span id="L104" class="LineNr">104 </span>
-<span id="L105" class="LineNr">105 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L70" class="LineNr"> 70 </span>  <span class="Comment"># EAX = factorial(n-1)</span>
+<span id="L71" class="LineNr"> 71 </span>    <span class="Comment"># push args</span>
+<span id="L72" class="LineNr"> 72 </span>  53/push-EBX
+<span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># call</span>
+<span id="L74" class="LineNr"> 74 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/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>              4/imm32           <span class="Comment"># add to ESP</span>
+<span id="L77" class="LineNr"> 77 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L78" class="LineNr"> 78 </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>
+<span id="L79" class="LineNr"> 79 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L80" class="LineNr"> 80 </span>$factorial:exit:
+<span id="L81" class="LineNr"> 81 </span>  <span class="Comment"># epilog</span>
+<span id="L82" class="LineNr"> 82 </span>  5b/pop-to-EBX
+<span id="L83" class="LineNr"> 83 </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="L84" class="LineNr"> 84 </span>  5d/pop-to-EBP
+<span id="L85" class="LineNr"> 85 </span>  c3/return
+<span id="L86" class="LineNr"> 86 </span>
+<span id="L87" class="LineNr"> 87 </span>test_factorial:
+<span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># factorial(5)</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="Comment"># push arg</span>
+<span id="L90" class="LineNr"> 90 </span>  68/push  5/imm32
+<span id="L91" class="LineNr"> 91 </span>    <span class="Comment"># call</span>
+<span id="L92" class="LineNr"> 92 </span>  e8/call  factorial/disp32
+<span id="L93" class="LineNr"> 93 </span>    <span class="Comment"># discard arg</span>
+<span id="L94" class="LineNr"> 94 </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="L95" class="LineNr"> 95 </span>  <span class="Comment"># check_ints_equal(EAX, 120, failure message)</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Comment"># push args</span>
+<span id="L97" class="LineNr"> 97 </span>  68/push  &quot;F - test_factorial&quot;/imm32
+<span id="L98" class="LineNr"> 98 </span>  68/push  0x78/imm32/expected-120
+<span id="L99" class="LineNr"> 99 </span>  50/push-EAX
+<span id="L100" class="LineNr">100 </span>    <span class="Comment"># call</span>
+<span id="L101" class="LineNr">101 </span>  e8/call  check_ints_equal/disp32
+<span id="L102" class="LineNr">102 </span>    <span class="Comment"># discard args</span>
+<span id="L103" class="LineNr">103 </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="L104" class="LineNr">104 </span>  <span class="Comment"># end</span>
+<span id="L105" class="LineNr">105 </span>  c3/return
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex1.subx.html b/html/subx/examples/ex1.subx.html
index 4ed9359e..2718523c 100644
--- a/html/subx/examples/ex1.subx.html
+++ b/html/subx/examples/ex1.subx.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -67,9 +68,9 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L14" class="LineNr">14 </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="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         2a/imm32          <span class="Comment"># copy 42 to EBX</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              2a/imm32          <span class="Comment"># copy 42 to EBX</span>
 <span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L17" class="LineNr">17 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy to EAX</span>
+<span id="L17" class="LineNr">17 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
 <span id="L18" class="LineNr">18 </span>  cd/syscall  0x80/imm8
 <span id="L19" class="LineNr">19 </span>
 <span id="L20" class="LineNr">20 </span><span class="Comment"># vim&#0058;ft=subx</span>
diff --git a/html/subx/examples/ex3.subx.html b/html/subx/examples/ex3.subx.html
index 08832eed..b6b6d21b 100644
--- a/html/subx/examples/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -67,16 +68,16 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </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="L14" class="LineNr">14 </span>  <span class="Comment"># result: EBX = 0</span>
-<span id="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         0/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <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 EBX</span>
 <span id="L16" class="LineNr">16 </span>  <span class="Comment"># counter: ECX = 1</span>
-<span id="L17" class="LineNr">17 </span>  b9/copy                                                                                                                         1/imm32           <span class="Comment"># copy to ECX</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span>$loop:
 <span id="L20" class="LineNr">20 </span>  <span class="Comment"># while (counter &lt;= 10)</span>
-<span id="L21" class="LineNr">21 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX                                                                      0xa/imm32         <span class="Comment"># compare ECX</span>
+<span id="L21" class="LineNr">21 </span>  81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0xa/imm32         <span class="Comment"># compare ECX</span>
 <span id="L22" class="LineNr">22 </span>  7f/jump-if-greater  $exit/disp8
 <span id="L23" class="LineNr">23 </span>  <span class="Comment"># result += counter</span>
-<span id="L24" class="LineNr">24 </span>  01/add                          3/mod/direct    3/rm32/EBX                                          1/r32/ECX                                     <span class="Comment"># add ECX to EBX</span>
+<span id="L24" class="LineNr">24 </span>  01/add                          3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          1/r32/ECX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># add ECX to EBX</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Comment"># ++counter</span>
 <span id="L26" class="LineNr">26 </span>  41/inc-ECX
 <span id="L27" class="LineNr">27 </span>  <span class="Comment"># loop</span>
@@ -84,7 +85,7 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr">29 </span>
 <span id="L30" class="LineNr">30 </span>$exit:
 <span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L32" class="LineNr">32 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy to EAX</span>
+<span id="L32" class="LineNr">32 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EAX</span>
 <span id="L33" class="LineNr">33 </span>  cd/syscall  0x80/imm8
 <span id="L34" class="LineNr">34 </span>
 <span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index 377949ae..fda4338b 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -66,28 +67,28 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span>
 <span id="L12" class="LineNr">12 </span>  <span class="Comment"># read(stdin, x, 1)</span>
 <span id="L13" class="LineNr">13 </span>    <span class="Comment"># fd = 0 (stdin)</span>
-<span id="L14" class="LineNr">14 </span>  bb/copy                                                                                                                         0/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L14" class="LineNr">14 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <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 EBX</span>
 <span id="L15" class="LineNr">15 </span>    <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L16" class="LineNr">16 </span>  b9/copy                                                                                                                         x/imm32           <span class="Comment"># copy to ECX</span>
+<span id="L16" class="LineNr">16 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              x/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L17" class="LineNr">17 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L18" class="LineNr">18 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy to EDX</span>
+<span id="L18" class="LineNr">18 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EDX</span>
 <span id="L19" class="LineNr">19 </span>    <span class="Comment"># read(fd, x, size)</span>
-<span id="L20" class="LineNr">20 </span>  b8/copy                                                                                                                         3/imm32/read      <span class="Comment"># copy to EAX</span>
+<span id="L20" class="LineNr">20 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              3/imm32/read      <span class="Comment"># copy to EAX</span>
 <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="Comment"># write(stdout, x, 1)</span>
 <span id="L24" class="LineNr">24 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L25" class="LineNr">25 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L25" class="LineNr">25 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># initialize x (location to read from)</span>
-<span id="L27" class="LineNr">27 </span>  b9/copy                                                                                                                         x/imm32           <span class="Comment"># copy to ECX</span>
+<span id="L27" class="LineNr">27 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              x/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L29" class="LineNr">29 </span>  ba/copy                                                                                                                         1/imm32           <span class="Comment"># copy to EDX</span>
+<span id="L29" class="LineNr">29 </span>  ba/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EDX</span>
 <span id="L30" class="LineNr">30 </span>    <span class="Comment"># write(fd, x, size)</span>
-<span id="L31" class="LineNr">31 </span>  b8/copy                                                                                                                         4/imm32/write     <span class="Comment"># copy to EAX</span>
+<span id="L31" class="LineNr">31 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
 <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="Comment"># exit(EBX)</span>
-<span id="L35" class="LineNr">35 </span>  b8/copy                                                                                                                         1/imm32/exit      <span class="Comment"># copy to EAX</span>
+<span id="L35" class="LineNr">35 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
 <span id="L36" class="LineNr">36 </span>  cd/syscall  0x80/imm8
 <span id="L37" class="LineNr">37 </span>
 <span id="L38" class="LineNr">38 </span>== data
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index 8ad44018..ef41ba15 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -16,6 +16,7 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 .SalientComment { color: #00ffff; }
@@ -67,17 +68,17 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span>
 <span id="L13" class="LineNr">13 </span>  <span class="Comment"># write(stdout, x, size)</span>
 <span id="L14" class="LineNr">14 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L15" class="LineNr">15 </span>  bb/copy                                                                                                                         1/imm32           <span class="Comment"># copy to EBX</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy to EBX</span>
 <span id="L16" class="LineNr">16 </span>    <span class="Comment"># initialize x (location to write result to)</span>
-<span id="L17" class="LineNr">17 </span>  b9/copy                                                                                                                         x/imm32           <span class="Comment"># copy to ECX</span>
+<span id="L17" class="LineNr">17 </span>  b9/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              x/imm32           <span class="Comment"># copy to ECX</span>
 <span id="L18" class="LineNr">18 </span>    <span class="Comment"># initialize size</span>
-<span id="L19" class="LineNr">19 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32                                      2/r32/EDX   size/disp32                       <span class="Comment"># copy *size to EDX</span>
+<span id="L19" class="LineNr">19 </span>  8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX   size/disp32    <span class="Delimiter"> . </span>                <span class="Comment"># copy *size to EDX</span>
 <span id="L20" class="LineNr">20 </span>    <span class="Comment"># write(fd, x, size)</span>
-<span id="L21" class="LineNr">21 </span>  b8/copy                                                                                                                         4/imm32/write     <span class="Comment"># copy to EAX</span>
+<span id="L21" class="LineNr">21 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              4/imm32/write     <span class="Comment"># copy to EAX</span>
 <span id="L22" class="LineNr">22 </span>  cd/syscall  0x80/imm8
 <span id="L23" class="LineNr">23 </span>
 <span id="L24" class="LineNr">24 </span>  <span class="Comment"># exit(EBX)</span>
-<span id="L25" class="LineNr">25 </span>  b8/copy                                                                                                                         1/imm32/exit      <span class="Comment"># copy to EAX</span>
+<span id="L25" class="LineNr">25 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit      <span class="Comment"># copy to EAX</span>
 <span id="L26" class="LineNr">26 </span>  cd/syscall  0x80/imm8
 <span id="L27" class="LineNr">27 </span>
 <span id="L28" class="LineNr">28 </span>== data