about summary refs log tree commit diff stats
path: root/html/subx/examples
diff options
context:
space:
mode:
Diffstat (limited to 'html/subx/examples')
-rw-r--r--html/subx/examples/ex1.subx.html20
-rw-r--r--html/subx/examples/ex10.subx.html45
-rw-r--r--html/subx/examples/ex11.subx.html545
-rw-r--r--html/subx/examples/ex12.subx.html14
-rw-r--r--html/subx/examples/ex2.subx.html22
-rw-r--r--html/subx/examples/ex3.subx.html8
-rw-r--r--html/subx/examples/ex4.subx.html63
-rw-r--r--html/subx/examples/ex5.subx.html26
-rw-r--r--html/subx/examples/ex6.subx.html16
-rw-r--r--html/subx/examples/ex7.subx.html92
-rw-r--r--html/subx/examples/ex8.subx.html26
-rw-r--r--html/subx/examples/ex9.subx.html14
12 files changed, 443 insertions, 448 deletions
diff --git a/html/subx/examples/ex1.subx.html b/html/subx/examples/ex1.subx.html
index 2718523c..df3bcacb 100644
--- a/html/subx/examples/ex1.subx.html
+++ b/html/subx/examples/ex1.subx.html
@@ -6,17 +6,16 @@
 <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,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<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 { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+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; }
 .SalientComment { color: #00ffff; }
@@ -65,15 +64,12 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
 <span id="L11" class="LineNr">11 </span>== code
-<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                        <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                        <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>
+<span id="L12" class="LineNr">12 </span>bb/copy-to-EBX  2a/imm32
+<span id="L13" class="LineNr">13 </span><span class="Comment"># exit(EBX)</span>
+<span id="L14" class="LineNr">14 </span>b8/copy-to-EAX  1/imm32
+<span id="L15" class="LineNr">15 </span>cd/syscall  0x80/imm8
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index 074cd0e8..ed2d959b 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -6,11 +6,11 @@
 <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,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<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 { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+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; }
@@ -68,7 +68,7 @@ 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 id="L15" class="LineNr">15 </span><span class="Comment"># main: return argv_equal(argv[1], argv[2])</span>
+<span id="L15" class="LineNr">15 </span><span class="Comment"># main: return argv-equal(argv[1], argv[2])</span>
 <span id="L16" class="LineNr">16 </span><span class="Comment">#       At the start of a SubX program:</span>
 <span id="L17" class="LineNr">17 </span><span class="Comment">#         argc: *ESP</span>
 <span id="L18" class="LineNr">18 </span><span class="Comment">#         argv[0]: *(ESP+4)</span>
@@ -76,53 +76,56 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span><span class="Comment">#         ...</span>
 <span id="L21" class="LineNr">21 </span>  <span class="Comment"># prolog</span>
 <span id="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>  <span class="Comment"># call argv_equal(argv[1], argv[2])</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call argv-equal(argv[1], argv[2])</span>
 <span id="L24" class="LineNr">24 </span>    <span class="Comment"># push argv[2]</span>
 <span id="L25" class="LineNr">25 </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="L26" class="LineNr">26 </span>    <span class="Comment"># push argv[1]</span>
 <span id="L27" class="LineNr">27 </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>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># call</span>
-<span id="L29" class="LineNr">29 </span>  e8/call argv_equal/disp32
+<span id="L29" class="LineNr">29 </span>  e8/call argv-equal/disp32
 <span id="L30" class="LineNr">30 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L31" class="LineNr">31 </span>$exit:
 <span id="L32" class="LineNr">32 </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="L33" class="LineNr">33 </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>  b8/copy-to-EAX  1/imm32
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
 <span id="L35" class="LineNr">35 </span>
 <span id="L36" class="LineNr">36 </span><span class="Comment"># compare two null-terminated ascii strings</span>
 <span id="L37" class="LineNr">37 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L38" class="LineNr">38 </span>argv_equal:  <span class="Comment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
+<span id="L38" class="LineNr">38 </span>argv-equal:  <span class="Comment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Comment"># initialize s1 (ECX) and s2 (EDX)</span>
 <span id="L40" class="LineNr">40 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to ECX</span>
 <span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+8) to EDX</span>
 <span id="L42" class="LineNr">42 </span>  <span class="Comment"># while (true)</span>
-<span id="L43" class="LineNr">43 </span>$argv_loop:
+<span id="L43" class="LineNr">43 </span>$argv-equal:loop:
 <span id="L44" class="LineNr">44 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s1, *s2</span>
-<span id="L45" class="LineNr">45 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L45" class="LineNr">45 </span>  b8/copy-to-EAX  0/imm32
 <span id="L46" class="LineNr">46 </span>  8a/copy                         0/mod/indirect  1/rm32/ECX   <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 byte at *ECX to lower byte of EAX</span>
-<span id="L47" class="LineNr">47 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
+<span id="L47" class="LineNr">47 </span>  bb/copy-to-EBX  0/imm32
 <span id="L48" class="LineNr">48 </span>  8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *EDX to lower byte of EBX</span>
 <span id="L49" class="LineNr">49 </span>    <span class="Comment"># if (c1 == 0) break</span>
 <span id="L50" class="LineNr">50 </span>  3d/compare-EAX  0/imm32
-<span id="L51" class="LineNr">51 </span>  74/jump-if-equal  $argv_break/disp8
+<span id="L51" class="LineNr">51 </span>  74/jump-if-equal  $argv-equal:break/disp8
 <span id="L52" class="LineNr">52 </span>    <span class="Comment"># if (c1 != c2) return false</span>
 <span id="L53" class="LineNr">53 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
-<span id="L54" class="LineNr">54 </span>  75/jump-if-not-equal  $argv_fail/disp8
+<span id="L54" class="LineNr">54 </span>  75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L55" class="LineNr">55 </span>    <span class="Comment"># ++s1, ++s2</span>
 <span id="L56" class="LineNr">56 </span>  41/inc-ECX
 <span id="L57" class="LineNr">57 </span>  42/inc-EDX
 <span id="L58" class="LineNr">58 </span>  <span class="Comment"># end while</span>
-<span id="L59" class="LineNr">59 </span>  eb/jump  $argv_loop/disp8
-<span id="L60" class="LineNr">60 </span>$argv_break:
+<span id="L59" class="LineNr">59 </span>  eb/jump  $argv-equal:loop/disp8
+<span id="L60" class="LineNr">60 </span>$argv-equal:break:
 <span id="L61" class="LineNr">61 </span>  <span class="Comment"># if (c2 == 0) return true</span>
 <span id="L62" class="LineNr">62 </span>  81          7/subop/compare     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>              0/imm32           <span class="Comment"># compare EBX</span>
-<span id="L63" class="LineNr">63 </span>  75/jump-if-not-equal  $argv_fail/disp8
-<span id="L64" class="LineNr">64 </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="L65" class="LineNr">65 </span>  c3/return
-<span id="L66" class="LineNr">66 </span>  <span class="Comment"># return false</span>
-<span id="L67" class="LineNr">67 </span>$argv_fail:
-<span id="L68" class="LineNr">68 </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>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L69" class="LineNr">69 </span>  c3/return
+<span id="L63" class="LineNr">63 </span>  75/jump-if-not-equal  $argv-equal:false/disp8
+<span id="L64" class="LineNr">64 </span>$argv-equal:success:
+<span id="L65" class="LineNr">65 </span>  b8/copy-to-EAX  1/imm32
+<span id="L66" class="LineNr">66 </span>  c3/return
+<span id="L67" class="LineNr">67 </span>  <span class="Comment"># return false</span>
+<span id="L68" class="LineNr">68 </span>$argv-equal:false:
+<span id="L69" class="LineNr">69 </span>  b8/copy-to-EAX  0/imm32
+<span id="L70" class="LineNr">70 </span>  c3/return
+<span id="L71" class="LineNr">71 </span>
+<span id="L72" class="LineNr">72 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index 3273b21a..1cab461e 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -77,15 +77,15 @@ if ('onhashchange' in window) {
 <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:</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="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"># syscall(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>
-<span id="L27" class="LineNr"> 27 </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="L27" class="LineNr"> 27 </span>  b8/copy-to-EAX  1/imm32
 <span id="L28" class="LineNr"> 28 </span>  cd/syscall  0x80/imm8
 <span id="L29" class="LineNr"> 29 </span>
 <span id="L30" class="LineNr"> 30 </span><span class="Comment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
 <span id="L31" class="LineNr"> 31 </span><span class="Comment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L32" class="LineNr"> 32 </span>kernel_string_equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L32" class="LineNr"> 32 </span>kernel-string-equal:  <span class="Comment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
 <span id="L33" class="LineNr"> 33 </span>  <span class="Comment"># prolog</span>
 <span id="L34" class="LineNr"> 34 </span>  55/push-EBP
 <span id="L35" class="LineNr"> 35 </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>
@@ -118,291 +118,292 @@ if ('onhashchange' in window) {
 <span id="L62" class="LineNr"> 62 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          6/r32/ESI   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to ESI</span>
 <span id="L63" class="LineNr"> 63 </span>  81          0/subop/add         3/mod/direct    6/rm32/ESI   <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 ESI</span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment"># initialize loop counter i into ECX</span>
-<span id="L65" class="LineNr"> 65 </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>              0/imm32/exit      <span class="Comment"># copy to ECX</span>
+<span id="L65" class="LineNr"> 65 </span>  b9/copy-to-ECX  0/imm32/exit
 <span id="L66" class="LineNr"> 66 </span>  <span class="Comment"># while (i/ECX &lt; n/EDX)</span>
-<span id="L67" class="LineNr"> 67 </span>$kernel_string_loop:
+<span id="L67" class="LineNr"> 67 </span>$kernel-string-equal:loop:
 <span id="L68" class="LineNr"> 68 </span>  39/compare                      3/mod/direct    1/rm32/ECX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare ECX with EDX</span>
-<span id="L69" class="LineNr"> 69 </span>  74/jump-if-equal  $kernel_string_break/disp8
+<span id="L69" class="LineNr"> 69 </span>  74/jump-if-equal  $kernel-string-equal:break/disp8
 <span id="L70" class="LineNr"> 70 </span>    <span class="Comment"># c1/EAX, c2/EBX = *s, *benchmark</span>
-<span id="L71" class="LineNr"> 71 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L71" class="LineNr"> 71 </span>  b8/copy-to-EAX  0/imm32
 <span id="L72" class="LineNr"> 72 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <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 byte at *EDI to lower byte of EAX</span>
-<span id="L73" class="LineNr"> 73 </span>  bb/copy  0/imm32  <span class="Comment"># clear EBX</span>
+<span id="L73" class="LineNr"> 73 </span>  bb/copy-to-EBX  0/imm32
 <span id="L74" class="LineNr"> 74 </span>  8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy byte at *ESI to lower byte of EBX</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="Comment"># if (c1 == 0) return false</span>
 <span id="L76" class="LineNr"> 76 </span>  3d/compare-EAX  0/imm32
-<span id="L77" class="LineNr"> 77 </span>  74/jump-if-equal  $kernel_string_fail/disp8
+<span id="L77" class="LineNr"> 77 </span>  74/jump-if-equal  $kernel-string-equal:false/disp8
 <span id="L78" class="LineNr"> 78 </span>    <span class="Comment"># if (c1 != c2) return false</span>
 <span id="L79" class="LineNr"> 79 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX with EBX</span>
-<span id="L80" class="LineNr"> 80 </span>  75/jump-if-not-equal  $kernel_string_fail/disp8
+<span id="L80" class="LineNr"> 80 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L81" class="LineNr"> 81 </span>    <span class="Comment"># ++s1, ++s2, ++i</span>
 <span id="L82" class="LineNr"> 82 </span>  41/inc-ECX
 <span id="L83" class="LineNr"> 83 </span>  46/inc-ESI
 <span id="L84" class="LineNr"> 84 </span>  47/inc-EDI
 <span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># end while</span>
-<span id="L86" class="LineNr"> 86 </span>  eb/jump  $kernel_string_loop/disp8
-<span id="L87" class="LineNr"> 87 </span>$kernel_string_break:
+<span id="L86" class="LineNr"> 86 </span>  eb/jump  $kernel-string-equal:loop/disp8
+<span id="L87" class="LineNr"> 87 </span>$kernel-string-equal:break:
 <span id="L88" class="LineNr"> 88 </span>  <span class="Comment"># if (*s/EDI == 0) return true</span>
-<span id="L89" class="LineNr"> 89 </span>  b8/copy  0/imm32  <span class="Comment"># clear EAX</span>
+<span id="L89" class="LineNr"> 89 </span>  b8/copy-to-EAX  0/imm32
 <span id="L90" class="LineNr"> 90 </span>  8a/copy                         0/mod/indirect  7/rm32/EDI   <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 byte at *EDI to lower byte of EAX</span>
 <span id="L91" class="LineNr"> 91 </span>  81          7/subop/compare     3/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"># compare EAX</span>
-<span id="L92" class="LineNr"> 92 </span>  75/jump-if-not-equal  $kernel_string_fail/disp8
-<span id="L93" class="LineNr"> 93 </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="L94" class="LineNr"> 94 </span>  eb/jump  $kernel_string_end/disp8
-<span id="L95" class="LineNr"> 95 </span>  <span class="Comment"># return false</span>
-<span id="L96" class="LineNr"> 96 </span>$kernel_string_fail:
-<span id="L97" class="LineNr"> 97 </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>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L98" class="LineNr"> 98 </span>
-<span id="L99" class="LineNr"> 99 </span>$kernel_string_end:
-<span id="L100" class="LineNr">100 </span>  <span class="Comment"># restore registers</span>
-<span id="L101" class="LineNr">101 </span>  5f/pop-to-EDI
-<span id="L102" class="LineNr">102 </span>  5e/pop-to-ESI
-<span id="L103" class="LineNr">103 </span>  5b/pop-to-EBX
-<span id="L104" class="LineNr">104 </span>  5a/pop-to-EDX
-<span id="L105" class="LineNr">105 </span>  59/pop-to-ECX
-<span id="L106" class="LineNr">106 </span>  <span class="Comment"># end</span>
-<span id="L107" class="LineNr">107 </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="L108" class="LineNr">108 </span>  5d/pop-to-EBP
-<span id="L109" class="LineNr">109 </span>  c3/return
-<span id="L110" class="LineNr">110 </span>
-<span id="L111" class="LineNr">111 </span><span class="SalientComment">## tests</span>
-<span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span>test_compare_null_kernel_string_with_empty_array:
-<span id="L114" class="LineNr">114 </span>  <span class="Comment"># EAX = kernel_string_equal(Null_kernel_string, &quot;&quot;)</span>
-<span id="L115" class="LineNr">115 </span>    <span class="Comment"># push args</span>
-<span id="L116" class="LineNr">116 </span>  68/push  &quot;&quot;/imm32
-<span id="L117" class="LineNr">117 </span>  68/push  Null_kernel_string/imm32
-<span id="L118" class="LineNr">118 </span>    <span class="Comment"># call</span>
-<span id="L119" class="LineNr">119 </span>  e8/call  kernel_string_equal/disp32
-<span id="L120" class="LineNr">120 </span>    <span class="Comment"># discard args</span>
-<span id="L121" class="LineNr">121 </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="L122" class="LineNr">122 </span>  <span class="Comment"># call check_ints_equal(EAX, 1, msg)</span>
-<span id="L123" class="LineNr">123 </span>    <span class="Comment"># push args</span>
-<span id="L124" class="LineNr">124 </span>  68/push  &quot;F - test_compare_null_kernel_string_with_empty_array&quot;/imm32
-<span id="L125" class="LineNr">125 </span>  68/push  1/imm32/true
-<span id="L126" class="LineNr">126 </span>  50/push-EAX
-<span id="L127" class="LineNr">127 </span>    <span class="Comment"># call</span>
-<span id="L128" class="LineNr">128 </span>  e8/call  check_ints_equal/disp32
-<span id="L129" class="LineNr">129 </span>    <span class="Comment"># discard args</span>
-<span id="L130" class="LineNr">130 </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="L131" class="LineNr">131 </span>  c3/return
-<span id="L132" class="LineNr">132 </span>
-<span id="L133" class="LineNr">133 </span>test_compare_null_kernel_string_with_non_empty_array:
-<span id="L134" class="LineNr">134 </span>  <span class="Comment"># EAX = kernel_string_equal(Null_kernel_string, &quot;Abc&quot;)</span>
-<span id="L135" class="LineNr">135 </span>    <span class="Comment"># push args</span>
-<span id="L136" class="LineNr">136 </span>  68/push  &quot;Abc&quot;/imm32
-<span id="L137" class="LineNr">137 </span>  68/push  Null_kernel_string/imm32
-<span id="L138" class="LineNr">138 </span>    <span class="Comment"># call</span>
-<span id="L139" class="LineNr">139 </span>  e8/call  kernel_string_equal/disp32
-<span id="L140" class="LineNr">140 </span>    <span class="Comment"># discard args</span>
-<span id="L141" class="LineNr">141 </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="L142" class="LineNr">142 </span>  <span class="Comment"># call check_ints_equal(EAX, 0, msg)</span>
-<span id="L143" class="LineNr">143 </span>    <span class="Comment"># push args</span>
-<span id="L144" class="LineNr">144 </span>  68/push  &quot;F - test_compare_null_kernel_string_with_non_empty_array&quot;/imm32
-<span id="L145" class="LineNr">145 </span>  68/push  0/imm32/false
-<span id="L146" class="LineNr">146 </span>  50/push-EAX
-<span id="L147" class="LineNr">147 </span>    <span class="Comment"># call</span>
-<span id="L148" class="LineNr">148 </span>  e8/call  check_ints_equal/disp32
-<span id="L149" class="LineNr">149 </span>    <span class="Comment"># discard args</span>
-<span id="L150" class="LineNr">150 </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="L151" class="LineNr">151 </span>  c3/return
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span>test_compare_kernel_string_with_equal_array:
-<span id="L154" class="LineNr">154 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Abc&quot;)</span>
-<span id="L155" class="LineNr">155 </span>    <span class="Comment"># push args</span>
-<span id="L156" class="LineNr">156 </span>  68/push  &quot;Abc&quot;/imm32
-<span id="L157" class="LineNr">157 </span>  68/push  Abc_kernel_string/imm32
-<span id="L158" class="LineNr">158 </span>    <span class="Comment"># call</span>
-<span id="L159" class="LineNr">159 </span>  e8/call  kernel_string_equal/disp32
-<span id="L160" class="LineNr">160 </span>    <span class="Comment"># discard args</span>
-<span id="L161" class="LineNr">161 </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="L162" class="LineNr">162 </span>  <span class="Comment"># call check_ints_equal(EAX, 1, msg)</span>
-<span id="L163" class="LineNr">163 </span>    <span class="Comment"># push args</span>
-<span id="L164" class="LineNr">164 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L165" class="LineNr">165 </span>  68/push  1/imm32/true
-<span id="L166" class="LineNr">166 </span>  50/push-EAX
-<span id="L167" class="LineNr">167 </span>    <span class="Comment"># call</span>
-<span id="L168" class="LineNr">168 </span>  e8/call  check_ints_equal/disp32
-<span id="L169" class="LineNr">169 </span>    <span class="Comment"># discard args</span>
-<span id="L170" class="LineNr">170 </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="L171" class="LineNr">171 </span>  c3/return
-<span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span>test_compare_kernel_string_with_inequal_array:
-<span id="L174" class="LineNr">174 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Adc&quot;)</span>
-<span id="L175" class="LineNr">175 </span>    <span class="Comment"># push args</span>
-<span id="L176" class="LineNr">176 </span>  68/push  &quot;Adc&quot;/imm32
-<span id="L177" class="LineNr">177 </span>  68/push  Abc_kernel_string/imm32
-<span id="L178" class="LineNr">178 </span>    <span class="Comment"># call</span>
-<span id="L179" class="LineNr">179 </span>  e8/call  kernel_string_equal/disp32
-<span id="L180" class="LineNr">180 </span>    <span class="Comment"># discard args</span>
-<span id="L181" class="LineNr">181 </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="L182" class="LineNr">182 </span>  <span class="Comment"># call check_ints_equal(EAX, 0, msg)</span>
-<span id="L183" class="LineNr">183 </span>    <span class="Comment"># push args</span>
-<span id="L184" class="LineNr">184 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L185" class="LineNr">185 </span>  68/push  0/imm32/false
-<span id="L186" class="LineNr">186 </span>  50/push-EAX
-<span id="L187" class="LineNr">187 </span>    <span class="Comment"># call</span>
-<span id="L188" class="LineNr">188 </span>  e8/call  check_ints_equal/disp32
-<span id="L189" class="LineNr">189 </span>    <span class="Comment"># discard args</span>
-<span id="L190" class="LineNr">190 </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="L191" class="LineNr">191 </span>  c3/return
-<span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span>test_compare_kernel_string_with_empty_array:
-<span id="L194" class="LineNr">194 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;&quot;)</span>
-<span id="L195" class="LineNr">195 </span>    <span class="Comment"># push args</span>
-<span id="L196" class="LineNr">196 </span>  68/push  &quot;&quot;/imm32
-<span id="L197" class="LineNr">197 </span>  68/push  Abc_kernel_string/imm32
-<span id="L198" class="LineNr">198 </span>    <span class="Comment"># call</span>
-<span id="L199" class="LineNr">199 </span>  e8/call  kernel_string_equal/disp32
-<span id="L200" class="LineNr">200 </span>    <span class="Comment"># discard args</span>
-<span id="L201" class="LineNr">201 </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="L202" class="LineNr">202 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Comment"># push args</span>
-<span id="L204" class="LineNr">204 </span>  68/push  &quot;F - test_compare_kernel_string_with_equal_array&quot;/imm32
-<span id="L205" class="LineNr">205 </span>  68/push  0/imm32/false
-<span id="L206" class="LineNr">206 </span>  50/push-EAX
-<span id="L207" class="LineNr">207 </span>    <span class="Comment"># call</span>
-<span id="L208" class="LineNr">208 </span>  e8/call  check_ints_equal/disp32
-<span id="L209" class="LineNr">209 </span>    <span class="Comment"># discard args</span>
-<span id="L210" class="LineNr">210 </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="L211" class="LineNr">211 </span>  c3/return
-<span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span>test_compare_kernel_string_with_shorter_array:
-<span id="L214" class="LineNr">214 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Ab&quot;)</span>
-<span id="L215" class="LineNr">215 </span>    <span class="Comment"># push args</span>
-<span id="L216" class="LineNr">216 </span>  68/push  &quot;Ab&quot;/imm32
-<span id="L217" class="LineNr">217 </span>  68/push  Abc_kernel_string/imm32
-<span id="L218" class="LineNr">218 </span>    <span class="Comment"># call</span>
-<span id="L219" class="LineNr">219 </span>  e8/call  kernel_string_equal/disp32
-<span id="L220" class="LineNr">220 </span>    <span class="Comment"># discard args</span>
-<span id="L221" class="LineNr">221 </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="L222" class="LineNr">222 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L223" class="LineNr">223 </span>    <span class="Comment"># push args</span>
-<span id="L224" class="LineNr">224 </span>  68/push  &quot;F - test_compare_kernel_string_with_shorter_array&quot;/imm32
-<span id="L225" class="LineNr">225 </span>  68/push  0/imm32/false
-<span id="L226" class="LineNr">226 </span>  50/push-EAX
-<span id="L227" class="LineNr">227 </span>    <span class="Comment"># call</span>
-<span id="L228" class="LineNr">228 </span>  e8/call  check_ints_equal/disp32
-<span id="L229" class="LineNr">229 </span>    <span class="Comment"># discard args</span>
-<span id="L230" class="LineNr">230 </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="L231" class="LineNr">231 </span>  c3/return
-<span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span>test_compare_kernel_string_with_longer_array:
-<span id="L234" class="LineNr">234 </span>  <span class="Comment"># EAX = kernel_string_equal(Abc_kernel_string, &quot;Abcd&quot;)</span>
-<span id="L235" class="LineNr">235 </span>    <span class="Comment"># push args</span>
-<span id="L236" class="LineNr">236 </span>  68/push  &quot;Abcd&quot;/imm32
-<span id="L237" class="LineNr">237 </span>  68/push  Abc_kernel_string/imm32
-<span id="L238" class="LineNr">238 </span>    <span class="Comment"># call</span>
-<span id="L239" class="LineNr">239 </span>  e8/call  kernel_string_equal/disp32
-<span id="L240" class="LineNr">240 </span>    <span class="Comment"># discard args</span>
-<span id="L241" class="LineNr">241 </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="L242" class="LineNr">242 </span>  <span class="Comment"># call check_ints_equal(EAX, 0)</span>
-<span id="L243" class="LineNr">243 </span>    <span class="Comment"># push args</span>
-<span id="L244" class="LineNr">244 </span>  68/push  &quot;F - test_compare_kernel_string_with_longer_array&quot;/imm32
-<span id="L245" class="LineNr">245 </span>  68/push  0/imm32/false
-<span id="L246" class="LineNr">246 </span>  50/push-EAX
-<span id="L247" class="LineNr">247 </span>    <span class="Comment"># call</span>
-<span id="L248" class="LineNr">248 </span>  e8/call  check_ints_equal/disp32
-<span id="L249" class="LineNr">249 </span>    <span class="Comment"># discard args</span>
-<span id="L250" class="LineNr">250 </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="L251" class="LineNr">251 </span>  c3/return
-<span id="L252" class="LineNr">252 </span>
-<span id="L253" class="LineNr">253 </span><span class="SalientComment">## helpers</span>
-<span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L256" class="LineNr">256 </span>check_ints_equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
-<span id="L257" class="LineNr">257 </span>  <span class="Comment"># prolog</span>
-<span id="L258" class="LineNr">258 </span>  55/push-EBP
-<span id="L259" class="LineNr">259 </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="L260" class="LineNr">260 </span>  <span class="Comment"># save registers</span>
-<span id="L261" class="LineNr">261 </span>  51/push-ECX
-<span id="L262" class="LineNr">262 </span>  53/push-EBX
-<span id="L263" class="LineNr">263 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
-<span id="L264" class="LineNr">264 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
-<span id="L265" class="LineNr">265 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
-<span id="L266" class="LineNr">266 </span>  <span class="Comment"># if EAX == b/EBX</span>
-<span id="L267" class="LineNr">267 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
-<span id="L268" class="LineNr">268 </span>  75/jump-if-unequal  $check_ints_equal:else/disp8
-<span id="L269" class="LineNr">269 </span>    <span class="Comment"># print('.')</span>
-<span id="L270" class="LineNr">270 </span>      <span class="Comment"># push args</span>
-<span id="L271" class="LineNr">271 </span>  68/push  &quot;.&quot;/imm32
-<span id="L272" class="LineNr">272 </span>      <span class="Comment"># call</span>
-<span id="L273" class="LineNr">273 </span>  e8/call  write_stderr/disp32
-<span id="L274" class="LineNr">274 </span>      <span class="Comment"># discard arg</span>
-<span id="L275" class="LineNr">275 </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="L276" class="LineNr">276 </span>    <span class="Comment"># return</span>
-<span id="L277" class="LineNr">277 </span>  eb/jump  $check_ints_equal:end/disp8
-<span id="L278" class="LineNr">278 </span>  <span class="Comment"># else:</span>
-<span id="L279" class="LineNr">279 </span>$check_ints_equal:else:
-<span id="L280" class="LineNr">280 </span>  <span class="Comment"># copy msg into ECX</span>
-<span id="L281" class="LineNr">281 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
-<span id="L282" class="LineNr">282 </span>    <span class="Comment"># print(ECX)</span>
-<span id="L283" class="LineNr">283 </span>      <span class="Comment"># push args</span>
-<span id="L284" class="LineNr">284 </span>  51/push-ECX
-<span id="L285" class="LineNr">285 </span>      <span class="Comment"># call</span>
-<span id="L286" class="LineNr">286 </span>  e8/call  write_stderr/disp32
-<span id="L287" class="LineNr">287 </span>      <span class="Comment"># discard arg</span>
-<span id="L288" class="LineNr">288 </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="L289" class="LineNr">289 </span>    <span class="Comment"># print newline</span>
-<span id="L290" class="LineNr">290 </span>      <span class="Comment"># push args</span>
-<span id="L291" class="LineNr">291 </span>  68/push  Newline/imm32
-<span id="L292" class="LineNr">292 </span>      <span class="Comment"># call</span>
-<span id="L293" class="LineNr">293 </span>  e8/call  write_stderr/disp32
-<span id="L294" class="LineNr">294 </span>      <span class="Comment"># discard arg</span>
-<span id="L295" class="LineNr">295 </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="L296" class="LineNr">296 </span>$check_ints_equal:end:
-<span id="L297" class="LineNr">297 </span>  <span class="Comment"># restore registers</span>
-<span id="L298" class="LineNr">298 </span>  5b/pop-to-EBX
-<span id="L299" class="LineNr">299 </span>  59/pop-to-ECX
-<span id="L300" class="LineNr">300 </span>  <span class="Comment"># end</span>
-<span id="L301" class="LineNr">301 </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="L302" class="LineNr">302 </span>  5d/pop-to-EBP
-<span id="L303" class="LineNr">303 </span>  c3/return
-<span id="L304" class="LineNr">304 </span>
-<span id="L305" class="LineNr">305 </span>write_stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Comment"># prolog</span>
-<span id="L307" class="LineNr">307 </span>  55/push-EBP
-<span id="L308" class="LineNr">308 </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="L309" class="LineNr">309 </span>  <span class="Comment"># save registers</span>
-<span id="L310" class="LineNr">310 </span>  50/push-EAX
-<span id="L311" class="LineNr">311 </span>  51/push-ECX
-<span id="L312" class="LineNr">312 </span>  52/push-EDX
-<span id="L313" class="LineNr">313 </span>  53/push-EBX
-<span id="L314" class="LineNr">314 </span>  <span class="Comment"># write(2/stderr, (data) s+4, (size) *s)</span>
-<span id="L315" class="LineNr">315 </span>    <span class="Comment"># fd = 2 (stderr)</span>
-<span id="L316" class="LineNr">316 </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>              2/imm32           <span class="Comment"># copy to EBX</span>
-<span id="L317" class="LineNr">317 </span>    <span class="Comment"># x = s+4</span>
-<span id="L318" class="LineNr">318 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
-<span id="L319" class="LineNr">319 </span>  81          0/subop/add         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>              4/imm32           <span class="Comment"># add to ECX</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Comment"># size = *s</span>
-<span id="L321" class="LineNr">321 </span>  8b/copy                         1/mod/*+disp8   4/rm32/SIB    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDX</span>
-<span id="L322" class="LineNr">322 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
-<span id="L323" class="LineNr">323 </span>    <span class="Comment"># call write()</span>
-<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>  cd/syscall  0x80/imm8
-<span id="L326" class="LineNr">326 </span>  <span class="Comment"># restore registers</span>
-<span id="L327" class="LineNr">327 </span>  5b/pop-to-EBX
-<span id="L328" class="LineNr">328 </span>  5a/pop-to-EDX
-<span id="L329" class="LineNr">329 </span>  59/pop-to-ECX
-<span id="L330" class="LineNr">330 </span>  58/pop-to-EAX
-<span id="L331" class="LineNr">331 </span>  <span class="Comment"># end</span>
-<span id="L332" class="LineNr">332 </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="L333" class="LineNr">333 </span>  5d/pop-to-EBP
-<span id="L334" class="LineNr">334 </span>  c3/return
-<span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span>== data
-<span id="L337" class="LineNr">337 </span>Newline:
-<span id="L338" class="LineNr">338 </span>  <span class="Comment"># size</span>
-<span id="L339" class="LineNr">339 </span>  01 00 00 00
-<span id="L340" class="LineNr">340 </span>  <span class="Comment"># data</span>
-<span id="L341" class="LineNr">341 </span>  0a/newline
-<span id="L342" class="LineNr">342 </span>
-<span id="L343" class="LineNr">343 </span><span class="Comment"># for kernel_string_equal tests</span>
-<span id="L344" class="LineNr">344 </span>Null_kernel_string:
-<span id="L345" class="LineNr">345 </span>  00/null
-<span id="L346" class="LineNr">346 </span>Abc_kernel_string:
-<span id="L347" class="LineNr">347 </span>  41/A 62/b 63/c 00/null
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L92" class="LineNr"> 92 </span>  75/jump-if-not-equal  $kernel-string-equal:false/disp8
+<span id="L93" class="LineNr"> 93 </span>  b8/copy-to-EAX  1/imm32
+<span id="L94" class="LineNr"> 94 </span>$kernel-string-equal:true:
+<span id="L95" class="LineNr"> 95 </span>  eb/jump  $kernel-string-equal:end/disp8
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment"># return false</span>
+<span id="L97" class="LineNr"> 97 </span>$kernel-string-equal:false:
+<span id="L98" class="LineNr"> 98 </span>  b8/copy-to-EAX  0/imm32
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span>$kernel-string-equal:end:
+<span id="L101" class="LineNr">101 </span>  <span class="Comment"># restore registers</span>
+<span id="L102" class="LineNr">102 </span>  5f/pop-to-EDI
+<span id="L103" class="LineNr">103 </span>  5e/pop-to-ESI
+<span id="L104" class="LineNr">104 </span>  5b/pop-to-EBX
+<span id="L105" class="LineNr">105 </span>  5a/pop-to-EDX
+<span id="L106" class="LineNr">106 </span>  59/pop-to-ECX
+<span id="L107" class="LineNr">107 </span>  <span class="Comment"># end</span>
+<span id="L108" class="LineNr">108 </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="L109" class="LineNr">109 </span>  5d/pop-to-EBP
+<span id="L110" class="LineNr">110 </span>  c3/return
+<span id="L111" class="LineNr">111 </span>
+<span id="L112" class="LineNr">112 </span><span class="SalientComment">## tests</span>
+<span id="L113" class="LineNr">113 </span>
+<span id="L114" class="LineNr">114 </span>test-compare-null-kernel-string-with-empty-array:
+<span id="L115" class="LineNr">115 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Comment"># push args</span>
+<span id="L117" class="LineNr">117 </span>  68/push  &quot;&quot;/imm32
+<span id="L118" class="LineNr">118 </span>  68/push  Null-kernel-string/imm32
+<span id="L119" class="LineNr">119 </span>    <span class="Comment"># call</span>
+<span id="L120" class="LineNr">120 </span>  e8/call  kernel-string-equal/disp32
+<span id="L121" class="LineNr">121 </span>    <span class="Comment"># discard args</span>
+<span id="L122" class="LineNr">122 </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="L123" class="LineNr">123 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L124" class="LineNr">124 </span>    <span class="Comment"># push args</span>
+<span id="L125" class="LineNr">125 </span>  68/push  &quot;F - test-compare-null-kernel-string-with-empty-array&quot;/imm32
+<span id="L126" class="LineNr">126 </span>  68/push  1/imm32/true
+<span id="L127" class="LineNr">127 </span>  50/push-EAX
+<span id="L128" class="LineNr">128 </span>    <span class="Comment"># call</span>
+<span id="L129" class="LineNr">129 </span>  e8/call  check-ints-equal/disp32
+<span id="L130" class="LineNr">130 </span>    <span class="Comment"># discard args</span>
+<span id="L131" class="LineNr">131 </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="L132" class="LineNr">132 </span>  c3/return
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span>test-compare-null-kernel-string-with-non-empty-array:
+<span id="L135" class="LineNr">135 </span>  <span class="Comment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
+<span id="L136" class="LineNr">136 </span>    <span class="Comment"># push args</span>
+<span id="L137" class="LineNr">137 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L138" class="LineNr">138 </span>  68/push  Null-kernel-string/imm32
+<span id="L139" class="LineNr">139 </span>    <span class="Comment"># call</span>
+<span id="L140" class="LineNr">140 </span>  e8/call  kernel-string-equal/disp32
+<span id="L141" class="LineNr">141 </span>    <span class="Comment"># discard args</span>
+<span id="L142" class="LineNr">142 </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="L143" class="LineNr">143 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Comment"># push args</span>
+<span id="L145" class="LineNr">145 </span>  68/push  &quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;/imm32
+<span id="L146" class="LineNr">146 </span>  68/push  0/imm32/false
+<span id="L147" class="LineNr">147 </span>  50/push-EAX
+<span id="L148" class="LineNr">148 </span>    <span class="Comment"># call</span>
+<span id="L149" class="LineNr">149 </span>  e8/call  check-ints-equal/disp32
+<span id="L150" class="LineNr">150 </span>    <span class="Comment"># discard args</span>
+<span id="L151" class="LineNr">151 </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="L152" class="LineNr">152 </span>  c3/return
+<span id="L153" class="LineNr">153 </span>
+<span id="L154" class="LineNr">154 </span>test-compare-kernel-string-with-equal-array:
+<span id="L155" class="LineNr">155 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
+<span id="L156" class="LineNr">156 </span>    <span class="Comment"># push args</span>
+<span id="L157" class="LineNr">157 </span>  68/push  &quot;Abc&quot;/imm32
+<span id="L158" class="LineNr">158 </span>  68/push  Abc-kernel-string/imm32
+<span id="L159" class="LineNr">159 </span>    <span class="Comment"># call</span>
+<span id="L160" class="LineNr">160 </span>  e8/call  kernel-string-equal/disp32
+<span id="L161" class="LineNr">161 </span>    <span class="Comment"># discard args</span>
+<span id="L162" class="LineNr">162 </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="L163" class="LineNr">163 </span>  <span class="Comment"># call check-ints-equal(EAX, 1, msg)</span>
+<span id="L164" class="LineNr">164 </span>    <span class="Comment"># push args</span>
+<span id="L165" class="LineNr">165 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L166" class="LineNr">166 </span>  68/push  1/imm32/true
+<span id="L167" class="LineNr">167 </span>  50/push-EAX
+<span id="L168" class="LineNr">168 </span>    <span class="Comment"># call</span>
+<span id="L169" class="LineNr">169 </span>  e8/call  check-ints-equal/disp32
+<span id="L170" class="LineNr">170 </span>    <span class="Comment"># discard args</span>
+<span id="L171" class="LineNr">171 </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="L172" class="LineNr">172 </span>  c3/return
+<span id="L173" class="LineNr">173 </span>
+<span id="L174" class="LineNr">174 </span>test-compare-kernel-string-with-inequal-array:
+<span id="L175" class="LineNr">175 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
+<span id="L176" class="LineNr">176 </span>    <span class="Comment"># push args</span>
+<span id="L177" class="LineNr">177 </span>  68/push  &quot;Adc&quot;/imm32
+<span id="L178" class="LineNr">178 </span>  68/push  Abc-kernel-string/imm32
+<span id="L179" class="LineNr">179 </span>    <span class="Comment"># call</span>
+<span id="L180" class="LineNr">180 </span>  e8/call  kernel-string-equal/disp32
+<span id="L181" class="LineNr">181 </span>    <span class="Comment"># discard args</span>
+<span id="L182" class="LineNr">182 </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="L183" class="LineNr">183 </span>  <span class="Comment"># call check-ints-equal(EAX, 0, msg)</span>
+<span id="L184" class="LineNr">184 </span>    <span class="Comment"># push args</span>
+<span id="L185" class="LineNr">185 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L186" class="LineNr">186 </span>  68/push  0/imm32/false
+<span id="L187" class="LineNr">187 </span>  50/push-EAX
+<span id="L188" class="LineNr">188 </span>    <span class="Comment"># call</span>
+<span id="L189" class="LineNr">189 </span>  e8/call  check-ints-equal/disp32
+<span id="L190" class="LineNr">190 </span>    <span class="Comment"># discard args</span>
+<span id="L191" class="LineNr">191 </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="L192" class="LineNr">192 </span>  c3/return
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span>test-compare-kernel-string-with-empty-array:
+<span id="L195" class="LineNr">195 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
+<span id="L196" class="LineNr">196 </span>    <span class="Comment"># push args</span>
+<span id="L197" class="LineNr">197 </span>  68/push  &quot;&quot;/imm32
+<span id="L198" class="LineNr">198 </span>  68/push  Abc-kernel-string/imm32
+<span id="L199" class="LineNr">199 </span>    <span class="Comment"># call</span>
+<span id="L200" class="LineNr">200 </span>  e8/call  kernel-string-equal/disp32
+<span id="L201" class="LineNr">201 </span>    <span class="Comment"># discard args</span>
+<span id="L202" class="LineNr">202 </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="L203" class="LineNr">203 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L204" class="LineNr">204 </span>    <span class="Comment"># push args</span>
+<span id="L205" class="LineNr">205 </span>  68/push  &quot;F - test-compare-kernel-string-with-equal-array&quot;/imm32
+<span id="L206" class="LineNr">206 </span>  68/push  0/imm32/false
+<span id="L207" class="LineNr">207 </span>  50/push-EAX
+<span id="L208" class="LineNr">208 </span>    <span class="Comment"># call</span>
+<span id="L209" class="LineNr">209 </span>  e8/call  check-ints-equal/disp32
+<span id="L210" class="LineNr">210 </span>    <span class="Comment"># discard args</span>
+<span id="L211" class="LineNr">211 </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="L212" class="LineNr">212 </span>  c3/return
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span>test-compare-kernel-string-with-shorter-array:
+<span id="L215" class="LineNr">215 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
+<span id="L216" class="LineNr">216 </span>    <span class="Comment"># push args</span>
+<span id="L217" class="LineNr">217 </span>  68/push  &quot;Ab&quot;/imm32
+<span id="L218" class="LineNr">218 </span>  68/push  Abc-kernel-string/imm32
+<span id="L219" class="LineNr">219 </span>    <span class="Comment"># call</span>
+<span id="L220" class="LineNr">220 </span>  e8/call  kernel-string-equal/disp32
+<span id="L221" class="LineNr">221 </span>    <span class="Comment"># discard args</span>
+<span id="L222" class="LineNr">222 </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="L223" class="LineNr">223 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L224" class="LineNr">224 </span>    <span class="Comment"># push args</span>
+<span id="L225" class="LineNr">225 </span>  68/push  &quot;F - test-compare-kernel-string-with-shorter-array&quot;/imm32
+<span id="L226" class="LineNr">226 </span>  68/push  0/imm32/false
+<span id="L227" class="LineNr">227 </span>  50/push-EAX
+<span id="L228" class="LineNr">228 </span>    <span class="Comment"># call</span>
+<span id="L229" class="LineNr">229 </span>  e8/call  check-ints-equal/disp32
+<span id="L230" class="LineNr">230 </span>    <span class="Comment"># discard args</span>
+<span id="L231" class="LineNr">231 </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="L232" class="LineNr">232 </span>  c3/return
+<span id="L233" class="LineNr">233 </span>
+<span id="L234" class="LineNr">234 </span>test-compare-kernel-string-with-longer-array:
+<span id="L235" class="LineNr">235 </span>  <span class="Comment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
+<span id="L236" class="LineNr">236 </span>    <span class="Comment"># push args</span>
+<span id="L237" class="LineNr">237 </span>  68/push  &quot;Abcd&quot;/imm32
+<span id="L238" class="LineNr">238 </span>  68/push  Abc-kernel-string/imm32
+<span id="L239" class="LineNr">239 </span>    <span class="Comment"># call</span>
+<span id="L240" class="LineNr">240 </span>  e8/call  kernel-string-equal/disp32
+<span id="L241" class="LineNr">241 </span>    <span class="Comment"># discard args</span>
+<span id="L242" class="LineNr">242 </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="L243" class="LineNr">243 </span>  <span class="Comment"># call check-ints-equal(EAX, 0)</span>
+<span id="L244" class="LineNr">244 </span>    <span class="Comment"># push args</span>
+<span id="L245" class="LineNr">245 </span>  68/push  &quot;F - test-compare-kernel-string-with-longer-array&quot;/imm32
+<span id="L246" class="LineNr">246 </span>  68/push  0/imm32/false
+<span id="L247" class="LineNr">247 </span>  50/push-EAX
+<span id="L248" class="LineNr">248 </span>    <span class="Comment"># call</span>
+<span id="L249" class="LineNr">249 </span>  e8/call  check-ints-equal/disp32
+<span id="L250" class="LineNr">250 </span>    <span class="Comment"># discard args</span>
+<span id="L251" class="LineNr">251 </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="L252" class="LineNr">252 </span>  c3/return
+<span id="L253" class="LineNr">253 </span>
+<span id="L254" class="LineNr">254 </span><span class="SalientComment">## helpers</span>
+<span id="L255" class="LineNr">255 </span>
+<span id="L256" class="LineNr">256 </span><span class="Comment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
+<span id="L257" class="LineNr">257 </span>check-ints-equal:  <span class="Comment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L258" class="LineNr">258 </span>  <span class="Comment"># prolog</span>
+<span id="L259" class="LineNr">259 </span>  55/push-EBP
+<span id="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>  <span class="Comment"># save registers</span>
+<span id="L262" class="LineNr">262 </span>  51/push-ECX
+<span id="L263" class="LineNr">263 </span>  53/push-EBX
+<span id="L264" class="LineNr">264 </span>  <span class="Comment"># load args into EAX, EBX and ECX</span>
+<span id="L265" class="LineNr">265 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          0/r32/EAX   0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EAX</span>
+<span id="L266" class="LineNr">266 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          3/r32/EBX   0xc/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+12) to EBX</span>
+<span id="L267" class="LineNr">267 </span>  <span class="Comment"># if EAX == b/EBX</span>
+<span id="L268" class="LineNr">268 </span>  39/compare                      3/mod/direct    0/rm32/EAX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># compare EAX and EBX</span>
+<span id="L269" class="LineNr">269 </span>  75/jump-if-unequal  $check-ints-equal:else/disp8
+<span id="L270" class="LineNr">270 </span>    <span class="Comment"># print('.')</span>
+<span id="L271" class="LineNr">271 </span>      <span class="Comment"># push args</span>
+<span id="L272" class="LineNr">272 </span>  68/push  &quot;.&quot;/imm32
+<span id="L273" class="LineNr">273 </span>      <span class="Comment"># call</span>
+<span id="L274" class="LineNr">274 </span>  e8/call  write-stderr/disp32
+<span id="L275" class="LineNr">275 </span>      <span class="Comment"># discard arg</span>
+<span id="L276" class="LineNr">276 </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="L277" class="LineNr">277 </span>    <span class="Comment"># return</span>
+<span id="L278" class="LineNr">278 </span>  eb/jump  $check-ints-equal:end/disp8
+<span id="L279" class="LineNr">279 </span>  <span class="Comment"># else:</span>
+<span id="L280" class="LineNr">280 </span>$check-ints-equal:else:
+<span id="L281" class="LineNr">281 </span>  <span class="Comment"># copy msg into ECX</span>
+<span id="L282" class="LineNr">282 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   0x10/disp8      <span class="Delimiter"> . </span>               <span class="Comment"># copy *(EBP+16) to ECX</span>
+<span id="L283" class="LineNr">283 </span>    <span class="Comment"># print(ECX)</span>
+<span id="L284" class="LineNr">284 </span>      <span class="Comment"># push args</span>
+<span id="L285" class="LineNr">285 </span>  51/push-ECX
+<span id="L286" class="LineNr">286 </span>      <span class="Comment"># call</span>
+<span id="L287" class="LineNr">287 </span>  e8/call  write-stderr/disp32
+<span id="L288" class="LineNr">288 </span>      <span class="Comment"># discard arg</span>
+<span id="L289" class="LineNr">289 </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="L290" class="LineNr">290 </span>    <span class="Comment"># print newline</span>
+<span id="L291" class="LineNr">291 </span>      <span class="Comment"># push args</span>
+<span id="L292" class="LineNr">292 </span>  68/push  Newline/imm32
+<span id="L293" class="LineNr">293 </span>      <span class="Comment"># call</span>
+<span id="L294" class="LineNr">294 </span>  e8/call  write-stderr/disp32
+<span id="L295" class="LineNr">295 </span>      <span class="Comment"># discard arg</span>
+<span id="L296" class="LineNr">296 </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="L297" class="LineNr">297 </span>$check-ints-equal:end:
+<span id="L298" class="LineNr">298 </span>  <span class="Comment"># restore registers</span>
+<span id="L299" class="LineNr">299 </span>  5b/pop-to-EBX
+<span id="L300" class="LineNr">300 </span>  59/pop-to-ECX
+<span id="L301" class="LineNr">301 </span>  <span class="Comment"># end</span>
+<span id="L302" class="LineNr">302 </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="L303" class="LineNr">303 </span>  5d/pop-to-EBP
+<span id="L304" class="LineNr">304 </span>  c3/return
+<span id="L305" class="LineNr">305 </span>
+<span id="L306" class="LineNr">306 </span>write-stderr:  <span class="Comment"># s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Comment"># prolog</span>
+<span id="L308" class="LineNr">308 </span>  55/push-EBP
+<span id="L309" class="LineNr">309 </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="L310" class="LineNr">310 </span>  <span class="Comment"># save registers</span>
+<span id="L311" class="LineNr">311 </span>  50/push-EAX
+<span id="L312" class="LineNr">312 </span>  51/push-ECX
+<span id="L313" class="LineNr">313 </span>  52/push-EDX
+<span id="L314" class="LineNr">314 </span>  53/push-EBX
+<span id="L315" class="LineNr">315 </span>  <span class="Comment"># syscall(write, 2/stderr, (data) s+4, (size) *s)</span>
+<span id="L316" class="LineNr">316 </span>    <span class="Comment"># fd = 2 (stderr)</span>
+<span id="L317" class="LineNr">317 </span>  bb/copy-to-EBX  2/imm32
+<span id="L318" class="LineNr">318 </span>    <span class="Comment"># x = s+4</span>
+<span id="L319" class="LineNr">319 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          1/r32/ECX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to ECX</span>
+<span id="L320" class="LineNr">320 </span>  81          0/subop/add         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>              4/imm32           <span class="Comment"># add to ECX</span>
+<span id="L321" class="LineNr">321 </span>    <span class="Comment"># size = *s</span>
+<span id="L322" class="LineNr">322 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   8/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(EBP+8) to EDX</span>
+<span id="L323" class="LineNr">323 </span>  8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy *EDX to EDX</span>
+<span id="L324" class="LineNr">324 </span>    <span class="Comment"># syscall</span>
+<span id="L325" class="LineNr">325 </span>  b8/copy-to-EAX  4/imm32/write
+<span id="L326" class="LineNr">326 </span>  cd/syscall  0x80/imm8
+<span id="L327" class="LineNr">327 </span>  <span class="Comment"># restore registers</span>
+<span id="L328" class="LineNr">328 </span>  5b/pop-to-EBX
+<span id="L329" class="LineNr">329 </span>  5a/pop-to-EDX
+<span id="L330" class="LineNr">330 </span>  59/pop-to-ECX
+<span id="L331" class="LineNr">331 </span>  58/pop-to-EAX
+<span id="L332" class="LineNr">332 </span>  <span class="Comment"># end</span>
+<span id="L333" class="LineNr">333 </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="L334" class="LineNr">334 </span>  5d/pop-to-EBP
+<span id="L335" class="LineNr">335 </span>  c3/return
+<span id="L336" class="LineNr">336 </span>
+<span id="L337" class="LineNr">337 </span>== data
+<span id="L338" class="LineNr">338 </span>Newline:
+<span id="L339" class="LineNr">339 </span>  <span class="Comment"># size</span>
+<span id="L340" class="LineNr">340 </span>  01 00 00 00
+<span id="L341" class="LineNr">341 </span>  <span class="Comment"># data</span>
+<span id="L342" class="LineNr">342 </span>  0a/newline
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Comment"># for kernel-string-equal tests</span>
+<span id="L345" class="LineNr">345 </span>Null-kernel-string:
+<span id="L346" class="LineNr">346 </span>  00/null
+<span id="L347" class="LineNr">347 </span>Abc-kernel-string:
+<span id="L348" class="LineNr">348 </span>  41/A 62/b 63/c 00/null
+<span id="L349" class="LineNr">349 </span>
+<span id="L350" class="LineNr">350 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex12.subx.html b/html/subx/examples/ex12.subx.html
index 93feff8c..b4ad239c 100644
--- a/html/subx/examples/ex12.subx.html
+++ b/html/subx/examples/ex12.subx.html
@@ -67,22 +67,22 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L12" class="LineNr">12 </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="L13" class="LineNr">13 </span>
-<span id="L14" class="LineNr">14 </span>  <span class="Comment"># mmap(0x1000)</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>              mmap_new_segment/imm32  <span class="Comment"># copy to EBX</span>
-<span id="L16" class="LineNr">16 </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="L14" class="LineNr">14 </span>  <span class="Comment"># syscall(mmap, 0x1000)</span>
+<span id="L15" class="LineNr">15 </span>  bb/copy-to-EBX  mmap-new-segment/imm32
+<span id="L16" class="LineNr">16 </span>  b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L17" class="LineNr">17 </span>  cd/syscall  0x80/imm8
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span>  <span class="Comment"># store to *EAX</span>
 <span id="L20" class="LineNr">20 </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="L21" class="LineNr">21 </span>
-<span id="L22" class="LineNr">22 </span>  <span class="Comment"># exit(EAX)</span>
+<span id="L22" class="LineNr">22 </span>  <span class="Comment"># syscall(exit, EAX)</span>
 <span id="L23" class="LineNr">23 </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="L24" class="LineNr">24 </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>  b8/copy-to-EAX  1/imm32/exit
 <span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
 <span id="L26" class="LineNr">26 </span>
 <span id="L27" class="LineNr">27 </span>== data
 <span id="L28" class="LineNr">28 </span><span class="Comment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L29" class="LineNr">29 </span>mmap_new_segment:  <span class="Comment"># type mmap_arg_struct</span>
+<span id="L29" class="LineNr">29 </span>mmap-new-segment:  <span class="Comment"># type mmap_arg_struct</span>
 <span id="L30" class="LineNr">30 </span>  <span class="Comment"># addr</span>
 <span id="L31" class="LineNr">31 </span>  00 00 00 00  <span class="Comment"># null</span>
 <span id="L32" class="LineNr">32 </span>  <span class="Comment"># len</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L40" class="LineNr">40 </span>  <span class="Comment"># offset</span>
 <span id="L41" class="LineNr">41 </span>  00 00 00 00  <span class="Comment"># 0 since MAP_ANONYMOUS is specified</span>
 <span id="L42" class="LineNr">42 </span>
-<span id="L43" class="LineNr">43 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L43" class="LineNr">43 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex2.subx.html b/html/subx/examples/ex2.subx.html
index 81cce37f..640e0bdf 100644
--- a/html/subx/examples/ex2.subx.html
+++ b/html/subx/examples/ex2.subx.html
@@ -6,17 +6,16 @@
 <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,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<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 { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+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; }
 .SalientComment { color: #00ffff; }
@@ -64,16 +63,13 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   2</span>
 <span id="L9" class="LineNr"> 9 </span>
 <span id="L10" class="LineNr">10 </span>== code
-<span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<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>  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="L15" class="LineNr">15 </span>  43/inc-EBX
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># exit(EBX)</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>
+<span id="L11" class="LineNr">11 </span>bb/copy-to-EBX  1/imm32
+<span id="L12" class="LineNr">12 </span>43/inc-EBX
+<span id="L13" class="LineNr">13 </span><span class="Comment"># exit(EBX)</span>
+<span id="L14" class="LineNr">14 </span>b8/copy-to-EAX  1/imm32
+<span id="L15" class="LineNr">15 </span>cd/syscall  0x80/imm8
+<span id="L16" class="LineNr">16 </span>
+<span id="L17" class="LineNr">17 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex3.subx.html b/html/subx/examples/ex3.subx.html
index b6b6d21b..140d9224 100644
--- a/html/subx/examples/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -68,9 +68,9 @@ 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                        <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>  bb/copy-to-EBX  0/imm32
 <span id="L16" class="LineNr">16 </span>  <span class="Comment"># counter: ECX = 1</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="L17" class="LineNr">17 </span>  b9/copy-to-ECX  1/imm32
 <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>
@@ -85,10 +85,10 @@ 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                        <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="L32" class="LineNr">32 </span>  b8/copy-to-EAX  1/imm32
 <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>
+<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index fda4338b..ba639cde 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -16,7 +16,6 @@ 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; }
@@ -61,41 +60,37 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run examples/ex4</span>
 <span id="L6" class="LineNr"> 6 </span>
 <span id="L7" class="LineNr"> 7 </span>== code
-<span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L10" class="LineNr">10 </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="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                        <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                        <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                        <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                        <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                        <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                        <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                        <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                        <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="L8" class="LineNr"> 8 </span><span class="Comment"># syscall(read, stdin, x, 1)</span>
+<span id="L9" class="LineNr"> 9 </span>  <span class="Comment"># fd = 0 (stdin)</span>
+<span id="L10" class="LineNr">10 </span>bb/copy-to-EBX  0/imm32
+<span id="L11" class="LineNr">11 </span>  <span class="Comment"># initialize x (location to write result to)</span>
+<span id="L12" class="LineNr">12 </span>b9/copy-to-ECX  x/imm32
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L14" class="LineNr">14 </span>ba/copy-to-EDX  1/imm32
+<span id="L15" class="LineNr">15 </span>  <span class="Comment"># syscall</span>
+<span id="L16" class="LineNr">16 </span>b8/copy-to-EAX  3/imm32/read
+<span id="L17" class="LineNr">17 </span>cd/syscall  0x80/imm8
+<span id="L18" class="LineNr">18 </span>
+<span id="L19" class="LineNr">19 </span><span class="Comment"># syscall(write, stdout, x, 1)</span>
+<span id="L20" class="LineNr">20 </span>  <span class="Comment"># fd = 1 (stdout)</span>
+<span id="L21" class="LineNr">21 </span>bb/copy-to-EBX  1/imm32
+<span id="L22" class="LineNr">22 </span>  <span class="Comment"># initialize x (location to read from)</span>
+<span id="L23" class="LineNr">23 </span>b9/copy-to-ECX  x/imm32
+<span id="L24" class="LineNr">24 </span>  <span class="Comment"># size = 1 character</span>
+<span id="L25" class="LineNr">25 </span>ba/copy-to-EDX  1/imm32
+<span id="L26" class="LineNr">26 </span>  <span class="Comment"># syscall</span>
+<span id="L27" class="LineNr">27 </span>b8/copy-to-EAX  4/imm32/write
+<span id="L28" class="LineNr">28 </span>cd/syscall  0x80/imm8
+<span id="L29" class="LineNr">29 </span>
+<span id="L30" class="LineNr">30 </span><span class="Comment"># syscall(exit, EBX)</span>
+<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="Comment"># exit(EBX)</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="L34" class="LineNr">34 </span>== data
+<span id="L35" class="LineNr">35 </span>x:
+<span id="L36" class="LineNr">36 </span>  00 00 00 00  <span class="Comment"># space for read() to write to</span>
 <span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>== data
-<span id="L39" class="LineNr">39 </span>x:
-<span id="L40" class="LineNr">40 </span>  00 00 00 00  <span class="Comment"># space for read() to write to</span>
-<span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L38" class="LineNr">38 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index 4392d9e2..bc727faf 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -69,33 +69,33 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span>  <span class="Comment"># allocate x on the stack</span>
 <span id="L14" class="LineNr">14 </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>              4/imm32           <span class="Comment"># subtract from ESP</span>
 <span id="L15" class="LineNr">15 </span>
-<span id="L16" class="LineNr">16 </span>  <span class="Comment"># read(stdin, x, 1)</span>
+<span id="L16" class="LineNr">16 </span>  <span class="Comment"># syscall(read, stdin, x, 1)</span>
 <span id="L17" class="LineNr">17 </span>    <span class="Comment"># fd = 0 (stdin)</span>
-<span id="L18" class="LineNr">18 </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="L18" class="LineNr">18 </span>  bb/copy-to-EBX  0/imm32
 <span id="L19" class="LineNr">19 </span>    <span class="Comment"># initialize x (location to write result to)</span>
 <span id="L20" class="LineNr">20 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
 <span id="L21" class="LineNr">21 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>    <span class="Comment"># read(fd, x, size)</span>
-<span id="L24" class="LineNr">24 </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="L22" class="LineNr">22 </span>  ba/copy-to-EDX  1/imm32
+<span id="L23" class="LineNr">23 </span>    <span class="Comment"># syscall</span>
+<span id="L24" class="LineNr">24 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L25" class="LineNr">25 </span>  cd/syscall  0x80/imm8
 <span id="L26" class="LineNr">26 </span>
-<span id="L27" class="LineNr">27 </span>  <span class="Comment"># write(stdout, x, 1)</span>
+<span id="L27" class="LineNr">27 </span>  <span class="Comment"># syscall(write, stdout, x, 1)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># fd = 1 (stdout)</span>
-<span id="L29" class="LineNr">29 </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="L29" class="LineNr">29 </span>  bb/copy-to-EBX  1/imm32
 <span id="L30" class="LineNr">30 </span>    <span class="Comment"># initialize x (location to read from)</span>
 <span id="L31" class="LineNr">31 </span>  8d/copy-address                 1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP+4 to ECX</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Comment"># size = 1 character</span>
-<span id="L33" class="LineNr">33 </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="L34" class="LineNr">34 </span>    <span class="Comment"># write(fd, x, size)</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>              4/imm32/write     <span class="Comment"># copy to EAX</span>
+<span id="L33" class="LineNr">33 </span>  ba/copy-to-EDX  1/imm32
+<span id="L34" class="LineNr">34 </span>    <span class="Comment"># syscall</span>
+<span id="L35" class="LineNr">35 </span>  b8/copy-to-EAX  4/imm32/write
 <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>  <span class="Comment"># exit(EBX)</span>
-<span id="L39" class="LineNr">39 </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="L38" class="LineNr">38 </span>  <span class="Comment"># syscall(exit, EBX)</span>
+<span id="L39" class="LineNr">39 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L40" class="LineNr">40 </span>  cd/syscall  0x80/imm8
 <span id="L41" class="LineNr">41 </span>
-<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L42" class="LineNr">42 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index ef41ba15..5df92a48 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -66,19 +66,19 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L11" class="LineNr">11 </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="L12" class="LineNr">12 </span>
-<span id="L13" class="LineNr">13 </span>  <span class="Comment"># write(stdout, x, size)</span>
+<span id="L13" class="LineNr">13 </span>  <span class="Comment"># syscall(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                        <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="L15" class="LineNr">15 </span>  bb/copy-to-EBX  1/imm32
 <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                        <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>  b9/copy-to-ECX  x/imm32
 <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           <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                        <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="L20" class="LineNr">20 </span>    <span class="Comment"># syscall</span>
+<span id="L21" class="LineNr">21 </span>  b8/copy-to-EAX  4/imm32/write
 <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                        <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>  <span class="Comment"># syscall(exit, EBX)</span>
+<span id="L25" class="LineNr">25 </span>  b8/copy-to-EAX  1/imm32/exit
 <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
@@ -88,7 +88,7 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr">32 </span>  48 65 6c 6c 6f 2c 20 77 6f 72 6c 64 21 0a       00
 <span id="L33" class="LineNr">33 </span><span class="Comment"># H  e  l  l  o  ,  ␣  w  o  r  l  d  !  newline  null</span>
 <span id="L34" class="LineNr">34 </span>
-<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;ft=subx:nowrap</span>
+<span id="L35" class="LineNr">35 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
index d5ef4a99..3ffc6a49 100644
--- a/html/subx/examples/ex7.subx.html
+++ b/html/subx/examples/ex7.subx.html
@@ -71,79 +71,79 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L16" class="LineNr"> 16 </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="L17" class="LineNr"> 17 </span>
-<span id="L18" class="LineNr"> 18 </span>  <span class="Comment"># creat(filename)</span>
-<span id="L19" class="LineNr"> 19 </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>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L20" class="LineNr"> 20 </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>              0x180/imm32/fixed-perms <span class="Comment"># copy to ECX</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>              8/imm32/creat           <span class="Comment"># copy to EAX</span>
+<span id="L18" class="LineNr"> 18 </span>  <span class="Comment"># syscall(creat, filename)</span>
+<span id="L19" class="LineNr"> 19 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L20" class="LineNr"> 20 </span>  b9/copy-to-ECX  0x180/imm32/fixed-perms
+<span id="L21" class="LineNr"> 21 </span>  b8/copy-to-EAX  8/imm32/creat
 <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"># stream = open(filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</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>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L26" class="LineNr"> 26 </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/wronly          <span class="Comment"># copy to ECX</span>
-<span id="L27" class="LineNr"> 27 </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>              0x180/imm32/fixed-perms <span class="Comment"># copy to EDX</span>
-<span id="L28" class="LineNr"> 28 </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>              5/imm32/open            <span class="Comment"># copy to EAX</span>
+<span id="L24" class="LineNr"> 24 </span>  <span class="Comment"># stream = syscall(open, filename, O_WRONLY, 0)  # we can't use 'fd' because it looks like a hex byte</span>
+<span id="L25" class="LineNr"> 25 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L26" class="LineNr"> 26 </span>  b9/copy-to-ECX  1/imm32/wronly
+<span id="L27" class="LineNr"> 27 </span>  ba/copy-to-EDX  0x180/imm32/fixed-perms
+<span id="L28" class="LineNr"> 28 </span>  b8/copy-to-EAX  5/imm32/open
 <span id="L29" class="LineNr"> 29 </span>  cd/syscall  0x80/imm8
 <span id="L30" class="LineNr"> 30 </span>    <span class="Comment"># save stream</span>
-<span id="L31" class="LineNr"> 31 </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>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
+<span id="L31" class="LineNr"> 31 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L32" class="LineNr"> 32 </span>  89/copy                         0/mod/indirect  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="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># write(stream, &quot;a&quot;, 1)</span>
+<span id="L34" class="LineNr"> 34 </span>  <span class="Comment"># syscall(write, stream, &quot;a&quot;, 1)</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="Comment"># load stream</span>
-<span id="L36" class="LineNr"> 36 </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>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L36" class="LineNr"> 36 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L37" class="LineNr"> 37 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="Comment">#</span>
-<span id="L39" class="LineNr"> 39 </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>              a/imm32                 <span class="Comment"># copy to ECX</span>
-<span id="L40" class="LineNr"> 40 </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/size            <span class="Comment"># copy to EDX</span>
-<span id="L41" class="LineNr"> 41 </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="L39" class="LineNr"> 39 </span>  b9/copy-to-ECX  a/imm32
+<span id="L40" class="LineNr"> 40 </span>  ba/copy-to-EDX  1/imm32/size
+<span id="L41" class="LineNr"> 41 </span>  b8/copy-to-EAX  4/imm32/write
 <span id="L42" class="LineNr"> 42 </span>  cd/syscall  0x80/imm8
 <span id="L43" class="LineNr"> 43 </span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># close(stream)</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Comment"># syscall(close, stream)</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="Comment"># load stream</span>
-<span id="L46" class="LineNr"> 46 </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>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L46" class="LineNr"> 46 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L47" class="LineNr"> 47 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="Comment">#</span>
-<span id="L49" class="LineNr"> 49 </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>              6/imm32/close           <span class="Comment"># copy to EAX</span>
+<span id="L49" class="LineNr"> 49 </span>  b8/copy-to-EAX  6/imm32/close
 <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="Comment"># stream = open(filename, O_RDONLY, 0)</span>
-<span id="L53" class="LineNr"> 53 </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>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L54" class="LineNr"> 54 </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>              0/imm32/rdonly          <span class="Comment"># copy to ECX</span>
-<span id="L55" class="LineNr"> 55 </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>              0x180/imm32/fixed-perms <span class="Comment"># copy to EDX</span>
-<span id="L56" class="LineNr"> 56 </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>              5/imm32/open            <span class="Comment"># copy to EAX</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Comment"># stream = syscall(open, filename, O_RDONLY, 0)</span>
+<span id="L53" class="LineNr"> 53 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L54" class="LineNr"> 54 </span>  b9/copy-to-ECX  0/imm32/rdonly
+<span id="L55" class="LineNr"> 55 </span>  ba/copy-to-EDX  0x180/imm32/fixed-perms
+<span id="L56" class="LineNr"> 56 </span>  b8/copy-to-EAX  5/imm32/open
 <span id="L57" class="LineNr"> 57 </span>  cd/syscall  0x80/imm8
 <span id="L58" class="LineNr"> 58 </span>    <span class="Comment"># save stream</span>
-<span id="L59" class="LineNr"> 59 </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>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  3/rm32/EBX                                          0/r32/EAX                                           <span class="Comment"># copy EAX to *EBX</span>
+<span id="L59" class="LineNr"> 59 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L60" class="LineNr"> 60 </span>  89/copy                         0/mod/indirect  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="L61" class="LineNr"> 61 </span>
-<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># read(stream, b, 1)</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Comment"># syscall(read, stream, b, 1)</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="Comment"># load stream</span>
-<span id="L64" class="LineNr"> 64 </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>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L64" class="LineNr"> 64 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L65" class="LineNr"> 65 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L66" class="LineNr"> 66 </span>    <span class="Comment">#</span>
-<span id="L67" class="LineNr"> 67 </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>              b/imm32                 <span class="Comment"># copy to ECX</span>
-<span id="L68" class="LineNr"> 68 </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/size            <span class="Comment"># copy to EDX</span>
-<span id="L69" class="LineNr"> 69 </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="L67" class="LineNr"> 67 </span>  b9/copy-to-ECX  b/imm32
+<span id="L68" class="LineNr"> 68 </span>  ba/copy-to-EDX  1/imm32/size
+<span id="L69" class="LineNr"> 69 </span>  b8/copy-to-EAX  3/imm32/read
 <span id="L70" class="LineNr"> 70 </span>  cd/syscall  0x80/imm8
 <span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># close(stream)</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Comment"># syscall(close, stream)</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="Comment"># load stream</span>
-<span id="L74" class="LineNr"> 74 </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>              stream/imm32            <span class="Comment"># copy to EBX</span>
-<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L74" class="LineNr"> 74 </span>  bb/copy-to-EBX  stream/imm32
+<span id="L75" class="LineNr"> 75 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L76" class="LineNr"> 76 </span>    <span class="Comment">#</span>
-<span id="L77" class="LineNr"> 77 </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>              6/imm32/close           <span class="Comment"># copy to EAX</span>
+<span id="L77" class="LineNr"> 77 </span>  b8/copy-to-EAX  6/imm32/close
 <span id="L78" class="LineNr"> 78 </span>  cd/syscall  0x80/imm8
 <span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># unlink(filename)</span>
-<span id="L81" class="LineNr"> 81 </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>              filename/imm32          <span class="Comment"># copy to EBX</span>
-<span id="L82" class="LineNr"> 82 </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>              0xa/imm32/unlink        <span class="Comment"># copy to EAX</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Comment"># syscall(unlink, filename)</span>
+<span id="L81" class="LineNr"> 81 </span>  bb/copy-to-EBX  filename/imm32
+<span id="L82" class="LineNr"> 82 </span>  b8/copy-to-EAX  0xa/imm32/unlink
 <span id="L83" class="LineNr"> 83 </span>  cd/syscall  0x80/imm8
 <span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># exit(b)</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Comment"># syscall(exit, b)</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="Comment"># load b</span>
-<span id="L87" class="LineNr"> 87 </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>              b/imm32                 <span class="Comment"># copy to EBX</span>
-<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX                                          3/r32/EBX                                           <span class="Comment"># copy *EBX to EBX</span>
+<span id="L87" class="LineNr"> 87 </span>  bb/copy-to-EBX  b/imm32
+<span id="L88" class="LineNr"> 88 </span>  8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          3/r32/EBX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                      <span class="Comment"># copy *EBX to EBX</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="Comment">#</span>
-<span id="L90" class="LineNr"> 90 </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="L90" class="LineNr"> 90 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L91" class="LineNr"> 91 </span>  cd/syscall  0x80/imm8
 <span id="L92" class="LineNr"> 92 </span>
 <span id="L93" class="LineNr"> 93 </span>== data
@@ -156,7 +156,7 @@ if ('onhashchange' in window) {
 <span id="L100" class="LineNr">100 </span>filename:
 <span id="L101" class="LineNr">101 </span>  2e 66 6f 6f 00 00 00 00
 <span id="L102" class="LineNr">102 </span>
-<span id="L103" class="LineNr">103 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:tw&amp;</span>
+<span id="L103" class="LineNr">103 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
index abb09b84..f0770c2f 100644
--- a/html/subx/examples/ex8.subx.html
+++ b/html/subx/examples/ex8.subx.html
@@ -6,11 +6,11 @@
 <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,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<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 { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+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; }
@@ -76,39 +76,41 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </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="L21" class="LineNr">21 </span>  <span class="Comment"># prolog</span>
 <span id="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>  <span class="Comment"># call ascii_length(argv[1])</span>
+<span id="L23" class="LineNr">23 </span>  <span class="Comment"># call ascii-length(argv[1])</span>
 <span id="L24" class="LineNr">24 </span>    <span class="Comment"># push args</span>
 <span id="L25" class="LineNr">25 </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>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># call</span>
-<span id="L27" class="LineNr">27 </span>  e8/call  ascii_length/disp32
+<span id="L27" class="LineNr">27 </span>  e8/call  ascii-length/disp32
 <span id="L28" class="LineNr">28 </span>    <span class="Comment"># discard args</span>
 <span id="L29" class="LineNr">29 </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="L30" class="LineNr">30 </span>
 <span id="L31" class="LineNr">31 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L32" class="LineNr">32 </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="L33" class="LineNr">33 </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="L33" class="LineNr">33 </span>  b8/copy-to-EAX  1/imm32/exit
 <span id="L34" class="LineNr">34 </span>  cd/syscall  0x80/imm8
 <span id="L35" class="LineNr">35 </span>
-<span id="L36" class="LineNr">36 </span>ascii_length:  <span class="Comment"># (s)</span>
+<span id="L36" class="LineNr">36 </span>ascii-length:  <span class="Comment"># (s)</span>
 <span id="L37" class="LineNr">37 </span>  <span class="Comment"># initialize s (EDX)</span>
-<span id="L38" class="LineNr">38 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8                           <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L38" class="LineNr">38 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>          2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
 <span id="L39" class="LineNr">39 </span>  <span class="Comment"># var result = 0 (EAX)</span>
-<span id="L40" class="LineNr">40 </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>              0/imm32           <span class="Comment"># copy to EAX</span>
-<span id="L41" class="LineNr">41 </span>$ascii_length_loop:
+<span id="L40" class="LineNr">40 </span>  b8/copy-to-EAX  0/imm32
+<span id="L41" class="LineNr">41 </span>$ascii-length-loop:
 <span id="L42" class="LineNr">42 </span>  <span class="Comment"># var c = *s (ECX)</span>
 <span id="L43" class="LineNr">43 </span>  8a/copy                         0/mod/*         2/rm32/EDX   <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"># copy byte at *EDX to lower byte of ECX</span>
 <span id="L44" class="LineNr">44 </span>  <span class="Comment"># if c == '\0' break</span>
 <span id="L45" class="LineNr">45 </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>              0/imm32           <span class="Comment"># compare ECX</span>
-<span id="L46" class="LineNr">46 </span>  74/jump-if-equal  $ascii_length_ret/disp8
+<span id="L46" class="LineNr">46 </span>  74/jump-if-equal  $ascii-length-ret/disp8
 <span id="L47" class="LineNr">47 </span>  <span class="Comment"># ++s</span>
 <span id="L48" class="LineNr">48 </span>  81          0/subop/add         3/mod/direct    2/rm32/EDX   <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"># add to EDX</span>
 <span id="L49" class="LineNr">49 </span>  <span class="Comment"># ++result</span>
 <span id="L50" class="LineNr">50 </span>  40/inc-EAX
 <span id="L51" class="LineNr">51 </span>  <span class="Comment"># loop</span>
-<span id="L52" class="LineNr">52 </span>  eb/jump  $ascii_length_loop/disp8
-<span id="L53" class="LineNr">53 </span>$ascii_length_ret:
+<span id="L52" class="LineNr">52 </span>  eb/jump  $ascii-length-loop/disp8
+<span id="L53" class="LineNr">53 </span>$ascii-length-ret:
 <span id="L54" class="LineNr">54 </span>  <span class="Comment"># return (result in EAX)</span>
 <span id="L55" class="LineNr">55 </span>  c3/return
+<span id="L56" class="LineNr">56 </span>
+<span id="L57" class="LineNr">57 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex9.subx.html b/html/subx/examples/ex9.subx.html
index 882f6b51..32f81d1c 100644
--- a/html/subx/examples/ex9.subx.html
+++ b/html/subx/examples/ex9.subx.html
@@ -6,11 +6,11 @@
 <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,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<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 { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
+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; }
@@ -78,21 +78,21 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr">22 </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="L23" class="LineNr">23 </span>  <span class="Comment"># prolog</span>
 <span id="L24" class="LineNr">24 </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="L25" class="LineNr">25 </span>  <span class="Comment"># call ascii_difference(argv[1], argv[2])</span>
+<span id="L25" class="LineNr">25 </span>  <span class="Comment"># call ascii-difference(argv[1], argv[2])</span>
 <span id="L26" class="LineNr">26 </span>    <span class="Comment"># push argv[2]</span>
 <span id="L27" class="LineNr">27 </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="L28" class="LineNr">28 </span>    <span class="Comment"># push argv[1]</span>
 <span id="L29" class="LineNr">29 </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>          0x8/disp8      <span class="Delimiter"> . </span>                <span class="Comment"># push *(EBP+8)</span>
 <span id="L30" class="LineNr">30 </span>    <span class="Comment"># call</span>
-<span id="L31" class="LineNr">31 </span>  e8/call  ascii_difference/disp32
+<span id="L31" class="LineNr">31 </span>  e8/call  ascii-difference/disp32
 <span id="L32" class="LineNr">32 </span>    <span class="Comment"># discard args</span>
 <span id="L33" class="LineNr">33 </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="L34" class="LineNr">34 </span>  <span class="Comment"># exit(EAX)</span>
 <span id="L35" class="LineNr">35 </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="L36" class="LineNr">36 </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>  b8/copy-to-EAX  1/imm32/exit
 <span id="L37" class="LineNr">37 </span>  cd/syscall  0x80/imm8
 <span id="L38" class="LineNr">38 </span>
-<span id="L39" class="LineNr">39 </span>ascii_difference:  <span class="Comment"># (s1, s2) : null-terminated ascii strings</span>
+<span id="L39" class="LineNr">39 </span>ascii-difference:  <span class="Comment"># (s1, s2) : null-terminated ascii strings</span>
 <span id="L40" class="LineNr">40 </span>  <span class="Comment"># a = first letter of s1 (ECX)</span>
 <span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EAX</span>
 <span id="L42" class="LineNr">42 </span>  8b/copy                         0/mod/indirect  0/rm32/EAX   <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 EAX</span>
@@ -102,6 +102,8 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr">46 </span>  <span class="Comment"># a-b</span>
 <span id="L47" class="LineNr">47 </span>  29/subtract                     3/mod/direct    0/rm32/EAX   <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"># subtract ECX from EAX</span>
 <span id="L48" class="LineNr">48 </span>  c3/return
+<span id="L49" class="LineNr">49 </span>
+<span id="L50" class="LineNr">50 </span><span class="Comment"># vim&#0058;nowrap:textwidth=0</span>
 </pre>
 </body>
 </html>