4890 - new html renderings

a) Switch to a light background.
b) Linkify calls in .subx files.
c) Keep all colorization in the Vim colorscheme, get rid of hacky special-cases
   in update_html.

188 files changed, 5330 insertions, 5651 deletions

diff --git a/html/000organization.cc.html b/html/000organization.cc.html
index 8337c477..02cfda19 100644
--- a/html/000organization.cc.html
+++ b/html/000organization.cc.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/001help.cc.html b/html/001help.cc.html
index 06c577a5..b9e8ee63 100644
--- a/html/001help.cc.html
+++ b/html/001help.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Delimiter { color:#800080; }
-.SalientComment { color: #00ffff; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Delimiter { color: #c000c0; }
+.SalientComment { color: #0000af; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/002test.cc.html b/html/002test.cc.html
index 2d7d3ff7..7f8480b5 100644
--- a/html/002test.cc.html
+++ b/html/002test.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/003trace.cc.html b/html/003trace.cc.html
index cbda9303..65e52bd8 100644
--- a/html/003trace.cc.html
+++ b/html/003trace.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/003trace.test.cc.html b/html/003trace.test.cc.html
index 09607bbd..94edfd69 100644
--- a/html/003trace.test.cc.html
+++ b/html/003trace.test.cc.html
@@ -7,22 +7,17 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index 5ecaa30d..3e397ee9 100644
--- a/html/010vm.cc.html
+++ b/html/010vm.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.CommentedCode { color: #6c6c6c; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.CommentedCode { color: #8a8a8a; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/011load.cc.html b/html/011load.cc.html
index 1f42e841..d5b220a1 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/012transform.cc.html b/html/012transform.cc.html
index bd67993f..5ecc5f53 100644
--- a/html/012transform.cc.html
+++ b/html/012transform.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/013update_operation.cc.html b/html/013update_operation.cc.html
index 4358e5f6..05dfdde2 100644
--- a/html/013update_operation.cc.html
+++ b/html/013update_operation.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index b28b9049..cda5b517 100644
--- a/html/014literal_string.cc.html
+++ b/html/014literal_string.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/015literal_noninteger.cc.html b/html/015literal_noninteger.cc.html
index c99848b5..b9b162c5 100644
--- a/html/015literal_noninteger.cc.html
+++ b/html/015literal_noninteger.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html
index ff49e974..f7f3b4f4 100644
--- a/html/016dilated_reagent.cc.html
+++ b/html/016dilated_reagent.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/017parse_tree.cc.html b/html/017parse_tree.cc.html
index eb683b99..3975a9d8 100644
--- a/html/017parse_tree.cc.html
+++ b/html/017parse_tree.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/018constant.cc.html b/html/018constant.cc.html
index 3b91c860..101e87b3 100644
--- a/html/018constant.cc.html
+++ b/html/018constant.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/019type_abbreviations.cc.html b/html/019type_abbreviations.cc.html
index e5f55721..d7c2b939 100644
--- a/html/019type_abbreviations.cc.html
+++ b/html/019type_abbreviations.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.Identifier { color:#c0a020; }
-.LineNr { color:#444444; }
+.Identifier { color: #af5f00; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.SalientComment { color: #00ffff; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.SalientComment { color: #0000af; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/020run.cc.html b/html/020run.cc.html
index bc61e5f7..db5a30e4 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.SalientComment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .traceAbsent { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
 .cSpecial { color: #008000; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index 9a805f3b..2f9d971a 100644
--- a/html/021check_instruction.cc.html
+++ b/html/021check_instruction.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index 7c92b039..da4d5670 100644
--- a/html/022arithmetic.cc.html
+++ b/html/022arithmetic.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/023boolean.cc.html b/html/023boolean.cc.html
index 1f73953a..9d2b6fc9 100644
--- a/html/023boolean.cc.html
+++ b/html/023boolean.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/024jump.cc.html b/html/024jump.cc.html
index a0ccdc06..23e42a33 100644
--- a/html/024jump.cc.html
+++ b/html/024jump.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/025compare.cc.html b/html/025compare.cc.html
index 14586345..725f3be4 100644
--- a/html/025compare.cc.html
+++ b/html/025compare.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/026call.cc.html b/html/026call.cc.html
index b0db4565..797160be 100644
--- a/html/026call.cc.html
+++ b/html/026call.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.Identifier { color:#c0a020; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.CommentedCode { color: #8a8a8a; }
+.Identifier { color: #af5f00; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.SalientComment { color: #00ffff; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.SalientComment { color: #0000af; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html
index e8c7bee2..66c4a058 100644
--- a/html/027call_ingredient.cc.html
+++ b/html/027call_ingredient.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index ec56773e..2497678f 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/029tools.cc.html b/html/029tools.cc.html
index ec7d9a3b..8ff38973 100644
--- a/html/029tools.cc.html
+++ b/html/029tools.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 6b0c1910..8c7943e2 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.SalientComment { color: #0000af; }
 .traceAbsent { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
 .cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index a2e757bd..8fad431a 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/032array.cc.html b/html/032array.cc.html
index 8e3b58b5..988ce1a5 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index df0d79c3..2b3da1f6 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/034address.cc.html b/html/034address.cc.html
index a7b5ad1d..db6243cb 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index cd8f9007..2490a9e9 100644
--- a/html/035lookup.cc.html
+++ b/html/035lookup.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
-.SalientComment { color: #00ffff; }
+.SalientComment { color: #0000af; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.CommentedCode { color: #8a8a8a; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/036abandon.cc.html b/html/036abandon.cc.html
index 76f3c89a..310690f5 100644
--- a/html/036abandon.cc.html
+++ b/html/036abandon.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.CommentedCode { color: #8a8a8a; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html
index c862a8a7..5cbcf789 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.CommentedCode { color: #8a8a8a; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/040brace.cc.html b/html/040brace.cc.html
index 2b5062ae..20962583 100644
--- a/html/040brace.cc.html
+++ b/html/040brace.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html
index fc0e7f03..9f4feb6d 100644
--- a/html/041jump_target.cc.html
+++ b/html/041jump_target.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/042name.cc.html b/html/042name.cc.html
index 66a88b77..28042893 100644
--- a/html/042name.cc.html
+++ b/html/042name.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/043space.cc.html b/html/043space.cc.html
index 6cb70219..1183c78b 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.LineNr { color:#444444; }
+.SalientComment { color: #0000af; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index af203016..a2881be4 100644
--- a/html/044space_surround.cc.html
+++ b/html/044space_surround.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index 01ba2125..a1fe4a61 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index c3f5e5f2..6bda9467 100644
--- a/html/046check_type_by_name.cc.html
+++ b/html/046check_type_by_name.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index c52cc378..8cd0ec7a 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.SalientComment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.traceContains { color: #008000; }
-.Comment { color: #8080ff; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.traceContains { color: #005f00; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/051scenario_test.mu.html b/html/051scenario_test.mu.html
index 0503e8a3..07587ae3 100644
--- a/html/051scenario_test.mu.html
+++ b/html/051scenario_test.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html
index ab68c1f3..14f2e9f4 100644
--- a/html/052tangle.cc.html
+++ b/html/052tangle.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index 79c0dc60..7750a88e 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.SalientComment { color: #0000af; }
 .traceAbsent { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 .cSpecial { color: #008000; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index d5280b10..20d8c037 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.CommentedCode { color: #6c6c6c; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.CommentedCode { color: #8a8a8a; }
 .traceAbsent { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
 .cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index e8730f55..ee541eef 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.SalientComment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
 .cSpecial { color: #008000; }
 .muData { color: #ffff00; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index c7af3430..c1a392c8 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.SalientComment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.traceContains { color: #008000; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.traceContains { color: #005f00; }
 .muData { color: #ffff00; }
-.Comment { color: #8080ff; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index e329f342..4d75b349 100644
--- a/html/057immutable.cc.html
+++ b/html/057immutable.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html
index 7e8ee807..89be8a5c 100644
--- a/html/058to_text.cc.html
+++ b/html/058to_text.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/059to_text.mu.html b/html/059to_text.mu.html
index d67beef2..8503c6b9 100644
--- a/html/059to_text.mu.html
+++ b/html/059to_text.mu.html
@@ -7,23 +7,18 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html
index 5f9adcea..b6f23b84 100644
--- a/html/060rewrite_literal_string.cc.html
+++ b/html/060rewrite_literal_string.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/061text.mu.html b/html/061text.mu.html
index 5446ae1d..eafea092 100644
--- a/html/061text.mu.html
+++ b/html/061text.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index 520a7688..27f9f045 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/063array.mu.html b/html/063array.mu.html
index fcd6e922..5596a253 100644
--- a/html/063array.mu.html
+++ b/html/063array.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/064list.mu.html b/html/064list.mu.html
index b8ec8d6b..fea2663e 100644
--- a/html/064list.mu.html
+++ b/html/064list.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html
index b1512e4b..bb92bed3 100644
--- a/html/065duplex_list.mu.html
+++ b/html/065duplex_list.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/066stream.mu.html b/html/066stream.mu.html
index d24bb97e..8f5bf3cb 100644
--- a/html/066stream.mu.html
+++ b/html/066stream.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/067random.cc.html b/html/067random.cc.html
index c91fbaaa..112063c3 100644
--- a/html/067random.cc.html
+++ b/html/067random.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/068random.mu.html b/html/068random.mu.html
index c42e1085..880d746d 100644
--- a/html/068random.mu.html
+++ b/html/068random.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index e58c2b13..d042abde 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
+.CommentedCode { color: #8a8a8a; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/070table.mu.html b/html/070table.mu.html
index 89382920..8db1f3ba 100644
--- a/html/070table.mu.html
+++ b/html/070table.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 4521995f..22ac5831 100644
--- a/html/072recipe.cc.html
+++ b/html/072recipe.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index 2f53f0bb..4bf23ad2 100644
--- a/html/073scheduler.cc.html
+++ b/html/073scheduler.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index 96938e74..5a5ad451 100644
--- a/html/074wait.cc.html
+++ b/html/074wait.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.traceContains { color: #008000; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/075channel.mu.html b/html/075channel.mu.html
index 497c51f3..3822b511 100644
--- a/html/075channel.mu.html
+++ b/html/075channel.mu.html
@@ -7,28 +7,23 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.muControl { color:#c0a020; }
+.CommentedCode { color: #8a8a8a; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index e8bf5be6..31822cbe 100644
--- a/html/076continuation.cc.html
+++ b/html/076continuation.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/080display.cc.html b/html/080display.cc.html
index 389f8327..fa5fcbe2 100644
--- a/html/080display.cc.html
+++ b/html/080display.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/081print.mu.html b/html/081print.mu.html
index 05439c1c..92912c7c 100644
--- a/html/081print.mu.html
+++ b/html/081print.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.muControl { color:#c0a020; }
+.CommentedCode { color: #8a8a8a; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index 918437cf..9a6e261d 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.CommentedCode { color: #6c6c6c; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.CommentedCode { color: #8a8a8a; }
 .traceAbsent { color: #c00000; }
 .muScenario { color: #00af00; }
 .muRecipe { color: #ff8700; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
 .cSpecial { color: #008000; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/083scenario_screen_test.mu.html b/html/083scenario_screen_test.mu.html
index 086a28e6..9a9e8911 100644
--- a/html/083scenario_screen_test.mu.html
+++ b/html/083scenario_screen_test.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/084console.mu.html b/html/084console.mu.html
index 7ceba3b2..fb63f968 100644
--- a/html/084console.mu.html
+++ b/html/084console.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index cb298e77..c33bbf85 100644
--- a/html/085scenario_console.cc.html
+++ b/html/085scenario_console.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Delimiter { color:#800080; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Delimiter { color: #c000c0; }
 .muScenario { color: #00af00; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/086scenario_console_test.mu.html b/html/086scenario_console_test.mu.html
index 01bc35e8..f6454548 100644
--- a/html/086scenario_console_test.mu.html
+++ b/html/086scenario_console_test.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/087file.cc.html b/html/087file.cc.html
index a4ed028c..9d18c556 100644
--- a/html/087file.cc.html
+++ b/html/087file.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/088file.mu.html b/html/088file.mu.html
index 09b70b47..f7b1cd4c 100644
--- a/html/088file.mu.html
+++ b/html/088file.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 27a82783..816b58c7 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.Constant { color:#00a0a0; }
-.LineNr { color:#444444; }
+.Constant { color: #008787; }
+.LineNr { }
 .muScenario { color: #00af00; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/090scenario_filesystem_test.mu.html b/html/090scenario_filesystem_test.mu.html
index 40005592..a10a92c0 100644
--- a/html/090scenario_filesystem_test.mu.html
+++ b/html/090scenario_filesystem_test.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/091socket.cc.html b/html/091socket.cc.html
index f4f06882..75502060 100644
--- a/html/091socket.cc.html
+++ b/html/091socket.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/092socket.mu.html b/html/092socket.mu.html
index 68d6be5d..db9af578 100644
--- a/html/092socket.mu.html
+++ b/html/092socket.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index 679e4113..42ab5ccc 100644
--- a/html/099hardware_checks.cc.html
+++ b/html/099hardware_checks.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/100trace_browser.cc.html b/html/100trace_browser.cc.html
index 4f8bbd64..2393221c 100644
--- a/html/100trace_browser.cc.html
+++ b/html/100trace_browser.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index 69560c91..ad597659 100644
--- a/html/101run_sandboxed.cc.html
+++ b/html/101run_sandboxed.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
 .muRecipe { color: #ff8700; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
diff --git a/html/998check_type_pointers.cc.html b/html/998check_type_pointers.cc.html
index 4c809828..a62241b7 100644
--- a/html/998check_type_pointers.cc.html
+++ b/html/998check_type_pointers.cc.html
@@ -7,20 +7,15 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Comment { color: #8080ff; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/999spaces.cc.html b/html/999spaces.cc.html
index bffc759a..f18d4faa 100644
--- a/html/999spaces.cc.html
+++ b/html/999spaces.cc.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/channel.mu.html b/html/channel.mu.html
index 98e30a8a..68531966 100644
--- a/html/channel.mu.html
+++ b/html/channel.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 6c4d882a..5e3f2ee0 100644
--- a/html/chessboard.mu.html
+++ b/html/chessboard.mu.html
@@ -7,28 +7,23 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.muControl { color:#c0a020; }
+.CommentedCode { color: #8a8a8a; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/console.mu.html b/html/console.mu.html
index 6943a358..75c96012 100644
--- a/html/console.mu.html
+++ b/html/console.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/continuation1.mu.html b/html/continuation1.mu.html
index 29efdcbd..8cfb80b0 100644
--- a/html/continuation1.mu.html
+++ b/html/continuation1.mu.html
@@ -7,23 +7,18 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/continuation2.mu.html b/html/continuation2.mu.html
index b447d0cb..f1ac293c 100644
--- a/html/continuation2.mu.html
+++ b/html/continuation2.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/continuation3.mu.html b/html/continuation3.mu.html
index 2c244a36..f75c9b14 100644
--- a/html/continuation3.mu.html
+++ b/html/continuation3.mu.html
@@ -7,23 +7,18 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/continuation4.mu.html b/html/continuation4.mu.html
index 928260c0..c6ccee25 100644
--- a/html/continuation4.mu.html
+++ b/html/continuation4.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/continuation5.mu.html b/html/continuation5.mu.html
index 0d0fdf49..6cc2f1c7 100644
--- a/html/continuation5.mu.html
+++ b/html/continuation5.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/counters.mu.html b/html/counters.mu.html
index 530eec3c..3582b0f0 100644
--- a/html/counters.mu.html
+++ b/html/counters.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/display.mu.html b/html/display.mu.html
index 13ae0e6e..184e8b5c 100644
--- a/html/display.mu.html
+++ b/html/display.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html
index 2646fefc..55d657c3 100644
--- a/html/edit/001-editor.mu.html
+++ b/html/edit/001-editor.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html
index 518644c2..b1d91e07 100644
--- a/html/edit/002-typing.mu.html
+++ b/html/edit/002-typing.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html
index e4bb3480..4381f107 100644
--- a/html/edit/003-shortcuts.mu.html
+++ b/html/edit/003-shortcuts.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html
index f84126d0..c46650db 100644
--- a/html/edit/004-programming-environment.mu.html
+++ b/html/edit/004-programming-environment.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html
index fd7ce4a1..7e484efe 100644
--- a/html/edit/005-sandbox.mu.html
+++ b/html/edit/005-sandbox.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html
index c80bcf91..0feafeef 100644
--- a/html/edit/006-sandbox-copy.mu.html
+++ b/html/edit/006-sandbox-copy.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html
index cdfaf71c..588c2b8e 100644
--- a/html/edit/007-sandbox-delete.mu.html
+++ b/html/edit/007-sandbox-delete.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html
index ded40eeb..d20780a9 100644
--- a/html/edit/008-sandbox-edit.mu.html
+++ b/html/edit/008-sandbox-edit.mu.html
@@ -7,26 +7,21 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html
index 7d8b5d8d..cd853990 100644
--- a/html/edit/009-sandbox-test.mu.html
+++ b/html/edit/009-sandbox-test.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html
index 1507f1f8..45fa21e9 100644
--- a/html/edit/010-sandbox-trace.mu.html
+++ b/html/edit/010-sandbox-trace.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html
index 1bf4330a..7a265f32 100644
--- a/html/edit/011-errors.mu.html
+++ b/html/edit/011-errors.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html
index 7a9143bf..fc29d146 100644
--- a/html/edit/012-editor-undo.mu.html
+++ b/html/edit/012-editor-undo.mu.html
@@ -7,27 +7,22 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/example1.mu.html b/html/example1.mu.html
index 55b307fa..a4895842 100644
--- a/html/example1.mu.html
+++ b/html/example1.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/exception1.mu.html b/html/exception1.mu.html
index a7fa5d3e..6d399d03 100644
--- a/html/exception1.mu.html
+++ b/html/exception1.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/exception2.mu.html b/html/exception2.mu.html
index b55cc547..10e17b82 100644
--- a/html/exception2.mu.html
+++ b/html/exception2.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/factorial.mu.html b/html/factorial.mu.html
index c7f1393d..f5c3b470 100644
--- a/html/factorial.mu.html
+++ b/html/factorial.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/filesystem.mu.html b/html/filesystem.mu.html
index e0c25e71..d9be42a2 100644
--- a/html/filesystem.mu.html
+++ b/html/filesystem.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/fork.mu.html b/html/fork.mu.html
index 474c45b6..275f1266 100644
--- a/html/fork.mu.html
+++ b/html/fork.mu.html
@@ -7,23 +7,18 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/http-client.mu.html b/html/http-client.mu.html
index 2fadc54b..e2b16c30 100644
--- a/html/http-client.mu.html
+++ b/html/http-client.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/http-server.mu.html b/html/http-server.mu.html
index a8673975..4fb36aef 100644
--- a/html/http-server.mu.html
+++ b/html/http-server.mu.html
@@ -7,23 +7,18 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/immutable-error.mu.html b/html/immutable-error.mu.html
index 1f52693f..ee9a99e0 100644
--- a/html/immutable-error.mu.html
+++ b/html/immutable-error.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/lambda-to-mu.mu.html b/html/lambda-to-mu.mu.html
index 6e3554d0..06e32048 100644
--- a/html/lambda-to-mu.mu.html
+++ b/html/lambda-to-mu.mu.html
@@ -7,28 +7,23 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.muControl { color:#c0a020; }
+.CommentedCode { color: #8a8a8a; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
 .muScenario { color: #00af00; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/mutable.mu.html b/html/mutable.mu.html
index 9992c26d..9afdabbf 100644
--- a/html/mutable.mu.html
+++ b/html/mutable.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/nqueens.mu.html b/html/nqueens.mu.html
index f427f7fe..a0138e66 100644
--- a/html/nqueens.mu.html
+++ b/html/nqueens.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/real-files.mu.html b/html/real-files.mu.html
index 10d67c90..d52ce3d2 100644
--- a/html/real-files.mu.html
+++ b/html/real-files.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/same-fringe.mu.html b/html/same-fringe.mu.html
index 8308a150..58095bee 100644
--- a/html/same-fringe.mu.html
+++ b/html/same-fringe.mu.html
@@ -7,25 +7,20 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
+.LineNr { }
 .muData { color: #ffff00; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/screen.mu.html b/html/screen.mu.html
index 0fbb3956..3f79bc5d 100644
--- a/html/screen.mu.html
+++ b/html/screen.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/static-dispatch.mu.html b/html/static-dispatch.mu.html
index dd0e9e76..24a85327 100644
--- a/html/static-dispatch.mu.html
+++ b/html/static-dispatch.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index f367ee9e..9c9a197b 100644
--- a/html/subx/000organization.cc.html
+++ b/html/subx/000organization.cc.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index 563d890f..20f81f64 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
index ebfcba7b..bde6050b 100644
--- a/html/subx/002test.cc.html
+++ b/html/subx/002test.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index f341f57b..4e0923e7 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index 7a608391..2129f4fd 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -7,22 +7,17 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/subx/010---vm.cc.html b/html/subx/010---vm.cc.html
index 4c5f114b..8bb2121e 100644
--- a/html/subx/010---vm.cc.html
+++ b/html/subx/010---vm.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.CommentedCode { color: #6c6c6c; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.LineNr { }
+.Constant { color: #008787; }
+.CommentedCode { color: #8a8a8a; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index 2155c2cf..03ffbc97 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.PreProc { color:#800080; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
+.SalientComment { color: #0000af; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -140,7 +135,7 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span><span class="traceContains">+load: 0x00000003 -&gt; 0b</span>
 <span id="L75" class="LineNr"> 75 </span><span class="traceContains">+load: 0x00000004 -&gt; 0c</span>
 <span id="L76" class="LineNr"> 76 </span><span class="traceContains">+load: 0x00000005 -&gt; 0d</span>
-<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+run: add <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L78" class="LineNr"> 78 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
 <span id="L79" class="LineNr"> 79 </span>
 <span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(code)</span>
@@ -393,13 +388,13 @@ if ('onhashchange' in window) {
 <span id="L327" class="LineNr">327 </span><span class="SalientComment">//:: run</span>
 <span id="L328" class="LineNr">328 </span>
 <span id="L329" class="LineNr">329 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
+<span id="L330" class="LineNr">330 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L13'>EAX</a> (add)&quot;</span><span class="Delimiter">);</span>
 <span id="L331" class="LineNr">331 </span>
 <span id="L332" class="LineNr">332 </span><span class="Comment">//: our first opcode</span>
 <span id="L333" class="LineNr">333 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L334" class="LineNr">334 </span><span class="Normal">case</span> <span class="Constant">0x05</span>: <span class="Delimiter">{</span>  <span class="Comment">// add imm32 to EAX</span>
 <span id="L335" class="LineNr">335 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;add <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to <a href='010---vm.cc.html#L23'>reg</a> EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L337" class="LineNr">337 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L338" class="LineNr">338 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L339" class="LineNr">339 </span><span class="Delimiter">}</span>
diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html
index af99bfab..79e50909 100644
--- a/html/subx/012elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -196,7 +191,7 @@ if ('onhashchange' in window) {
 <span id="L133" class="LineNr">133 </span><span class="Comment">//   data/heap: 0x0a000000 -&gt; 0x0affffff</span>
 <span id="L134" class="LineNr">134 </span><span class="Comment">//   stack: 0x0b000ffc -&gt; 0x0b000000 (downward)</span>
 <span id="L135" class="LineNr">135 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L135'>CODE_SEGMENT</a> = <span class="Constant">0x09000000</span><span class="Delimiter">;</span>
-<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L136'>DATA_SEGMENT</a> = <span class="Constant">0x0a000000</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L136'>DATA_SEGMENT</a> = <span class="Constant">0x0a000000</span><span class="Delimiter">;</span>  <span class="Comment">// keep sync'd with `Heap.limit` in allocate.subx</span>
 <span id="L137" class="LineNr">137 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L137'>STACK_SEGMENT</a> = <span class="Constant">0x0b000000</span><span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L138'>AFTER_STACK</a> = <span class="Constant">0x0c000000</span><span class="Delimiter">;</span>
 <span id="L139" class="LineNr">139 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L139'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x0c000000</span><span class="Delimiter">;</span>
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 787350c4..a9aab198 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -7,30 +7,25 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
+.traceContains { color: #005f00; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.CommentedCode { color: #6c6c6c; }
-.PreProc { color:#800080; }
+.LineNr { }
+.Constant { color: #008787; }
+.SalientComment { color: #0000af; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.CommentedCode { color: #8a8a8a; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -202,7 +197,7 @@ if ('onhashchange' in window) {
 <span id="L134" class="LineNr">134 </span>  <span class="Delimiter">}</span>
 <span id="L135" class="LineNr">135 </span>  <span class="Comment">// End Op f7 Subops</span>
 <span id="L136" class="LineNr">136 </span>  <span class="Normal">default</span>:
-<span id="L137" class="LineNr">137 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L137" class="LineNr">137 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L138" class="LineNr">138 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L139" class="LineNr">139 </span>  <span class="Delimiter">}</span>
 <span id="L140" class="LineNr">140 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -318,7 +313,7 @@ if ('onhashchange' in window) {
 <span id="L250" class="LineNr">250 </span>  <span class="Delimiter">}</span>
 <span id="L251" class="LineNr">251 </span>  <span class="Comment">// End Op d3 Subops</span>
 <span id="L252" class="LineNr">252 </span>  <span class="Normal">default</span>:
-<span id="L253" class="LineNr">253 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after d3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L253" class="LineNr">253 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode d3: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L254" class="LineNr">254 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
 <span id="L256" class="LineNr">256 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index bd8f7e4d..8b7a7250 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
+.traceContains { color: #005f00; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.PreProc { color:#800080; }
+.Constant { color: #008787; }
+.SalientComment { color: #0000af; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index 989e30a5..11597b73 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.SalientComment { color: #0000af; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.CommentedCode { color: #8a8a8a; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
@@ -68,7 +63,7 @@ if ('onhashchange' in window) {
 <span id="L1" class="LineNr">  1 </span><span class="Comment">//: instructions that (immediately) contain an argument to act with</span>
 <span id="L2" class="LineNr">  2 </span>
 <span id="L3" class="LineNr">  3 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with imm32 based on subop (add/sub/and/or/xor/cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop (add/sub/and/or/xor/cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario add_imm32_to_r32)</span>
 <span id="L7" class="LineNr">  7 </span><span class="Special">% Reg[EBX].i = 1;</span>
@@ -76,15 +71,15 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr">  9 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Constant">81</span>  c3                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to EBX</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (add imm32) 011 (dest EBX)</span>
-<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L13" class="LineNr"> 13 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: subop add</span>
 <span id="L16" class="LineNr"> 16 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
 <span id="L17" class="LineNr"> 17 </span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L19" class="LineNr"> 19 </span><span class="Normal">case</span> <span class="Constant">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
-<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine imm32 with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L20" class="LineNr"> 20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int32_t</span>* arg1 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
@@ -97,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Comment">// End Op 81 Subops</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Normal">default</span>:
-<span id="L33" class="LineNr"> 33 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L33" class="LineNr"> 33 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L34" class="LineNr"> 34 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -113,29 +108,29 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr"> 46 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (add imm32) 011 (dest EBX)</span>
 <span id="L47" class="LineNr"> 47 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L48" class="LineNr"> 48 </span><span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 1</span>
-<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L52" class="LineNr"> 52 </span><span class="traceContains">+run: subop add</span>
 <span id="L53" class="LineNr"> 53 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
 <span id="L54" class="LineNr"> 54 </span>
 <span id="L55" class="LineNr"> 55 </span><span class="SalientComment">//:: subtract</span>
 <span id="L56" class="LineNr"> 56 </span>
 <span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 from <a href='010---vm.cc.html#L13'>EAX</a> (sub)&quot;</span><span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='037heap.cc.html#L23'>imm32</a> from <a href='010---vm.cc.html#L13'>EAX</a> (sub)&quot;</span><span class="Delimiter">);</span>
 <span id="L59" class="LineNr"> 59 </span>
 <span id="L60" class="LineNr"> 60 </span><span class="Delimiter">:(scenario subtract_imm32_from_eax)</span>
 <span id="L61" class="LineNr"> 61 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
 <span id="L62" class="LineNr"> 62 </span>== <span class="Constant">0x1</span>
 <span id="L63" class="LineNr"> 63 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L64" class="LineNr"> 64 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX</span>
-<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+run: subtract imm32 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L65" class="LineNr"> 65 </span><span class="traceContains">+run: subtract <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L66" class="LineNr"> 66 </span><span class="traceContains">+run: storing 0x000000a0</span>
 <span id="L67" class="LineNr"> 67 </span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L69" class="LineNr"> 69 </span><span class="Normal">case</span> <span class="Constant">0x2d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;subtract <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L72" class="LineNr"> 72 </span>  <a href='010---vm.cc.html#L91'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L73" class="LineNr"> 73 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L74" class="LineNr"> 74 </span><span class="Delimiter">}</span>
@@ -150,9 +145,9 @@ if ('onhashchange' in window) {
 <span id="L83" class="LineNr"> 83 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 101 (subtract imm32) 011 (dest EBX)</span>
 <span id="L84" class="LineNr"> 84 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L85" class="LineNr"> 85 </span>0a <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 10</span>
-<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L87" class="LineNr"> 87 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: imm32 is 0x00000001</span>
+<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x00000001</span>
 <span id="L89" class="LineNr"> 89 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L90" class="LineNr"> 90 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L91" class="LineNr"> 91 </span>
@@ -171,9 +166,9 @@ if ('onhashchange' in window) {
 <span id="L104" class="LineNr">104 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L105" class="LineNr">105 </span>  <span class="Constant">81</span>  eb                          <span class="PreProc">0</span><span class="Constant">1</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># subtract 1 from EBX</span>
 <span id="L106" class="LineNr">106 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L107" class="LineNr">107 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L107" class="LineNr">107 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L108" class="LineNr">108 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L109" class="LineNr">109 </span><span class="traceContains">+run: imm32 is 0x00000001</span>
+<span id="L109" class="LineNr">109 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x00000001</span>
 <span id="L110" class="LineNr">110 </span><span class="traceContains">+run: subop subtract</span>
 <span id="L111" class="LineNr">111 </span><span class="traceContains">+run: storing 0x00000009</span>
 <span id="L112" class="LineNr">112 </span>
@@ -217,7 +212,7 @@ if ('onhashchange' in window) {
 <span id="L150" class="LineNr">150 </span>  <span class="Delimiter">}</span>
 <span id="L151" class="LineNr">151 </span>  <span class="Comment">// End Op c1 Subops</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">default</span>:
-<span id="L153" class="LineNr">153 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after c1: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L153" class="LineNr">153 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c1: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L154" class="LineNr">154 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
 <span id="L156" class="LineNr">156 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -331,20 +326,20 @@ if ('onhashchange' in window) {
 <span id="L264" class="LineNr">264 </span><span class="SalientComment">//:: and</span>
 <span id="L265" class="LineNr">265 </span>
 <span id="L266" class="LineNr">266 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
+<span id="L267" class="LineNr">267 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise AND of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (and)&quot;</span><span class="Delimiter">);</span>
 <span id="L268" class="LineNr">268 </span>
 <span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
 <span id="L270" class="LineNr">270 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
 <span id="L271" class="LineNr">271 </span>== <span class="Constant">0x1</span>
 <span id="L272" class="LineNr">272 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L273" class="LineNr">273 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
-<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: and imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L275" class="LineNr">275 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L276" class="LineNr">276 </span>
 <span id="L277" class="LineNr">277 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L278" class="LineNr">278 </span><span class="Normal">case</span> <span class="Constant">0x25</span>: <span class="Delimiter">{</span>  <span class="Comment">// and imm32 with EAX</span>
 <span id="L279" class="LineNr">279 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L280" class="LineNr">280 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;and <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L281" class="LineNr">281 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L282" class="LineNr">282 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
@@ -359,9 +354,9 @@ if ('onhashchange' in window) {
 <span id="L292" class="LineNr">292 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
 <span id="L293" class="LineNr">293 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L294" class="LineNr">294 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># 0xff</span>
-<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L295" class="LineNr">295 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L296" class="LineNr">296 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L298" class="LineNr">298 </span><span class="traceContains">+run: subop and</span>
 <span id="L299" class="LineNr">299 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L300" class="LineNr">300 </span>
@@ -380,29 +375,29 @@ if ('onhashchange' in window) {
 <span id="L313" class="LineNr">313 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L314" class="LineNr">314 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
 <span id="L315" class="LineNr">315 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L317" class="LineNr">317 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L318" class="LineNr">318 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L318" class="LineNr">318 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L319" class="LineNr">319 </span><span class="traceContains">+run: subop and</span>
 <span id="L320" class="LineNr">320 </span><span class="traceContains">+run: storing 0x0000000a</span>
 <span id="L321" class="LineNr">321 </span>
 <span id="L322" class="LineNr">322 </span><span class="SalientComment">//:: or</span>
 <span id="L323" class="LineNr">323 </span>
 <span id="L324" class="LineNr">324 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L325" class="LineNr">325 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
+<span id="L325" class="LineNr">325 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise OR of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (or)&quot;</span><span class="Delimiter">);</span>
 <span id="L326" class="LineNr">326 </span>
 <span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
 <span id="L328" class="LineNr">328 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
 <span id="L329" class="LineNr">329 </span>== <span class="Constant">0x1</span>
 <span id="L330" class="LineNr">330 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L331" class="LineNr">331 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
-<span id="L332" class="LineNr">332 </span><span class="traceContains">+run: or imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L332" class="LineNr">332 </span><span class="traceContains">+run: or <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L333" class="LineNr">333 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L334" class="LineNr">334 </span>
 <span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L336" class="LineNr">336 </span><span class="Normal">case</span> <span class="Constant">0x0d</span>: <span class="Delimiter">{</span>  <span class="Comment">// or imm32 with EAX</span>
 <span id="L337" class="LineNr">337 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;or <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L339" class="LineNr">339 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L340" class="LineNr">340 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L341" class="LineNr">341 </span><span class="Delimiter">}</span>
@@ -417,9 +412,9 @@ if ('onhashchange' in window) {
 <span id="L350" class="LineNr">350 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
 <span id="L351" class="LineNr">351 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L352" class="LineNr">352 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L354" class="LineNr">354 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L356" class="LineNr">356 </span><span class="traceContains">+run: subop or</span>
 <span id="L357" class="LineNr">357 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L358" class="LineNr">358 </span>
@@ -436,29 +431,29 @@ if ('onhashchange' in window) {
 <span id="L369" class="LineNr">369 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L370" class="LineNr">370 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
 <span id="L371" class="LineNr">371 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L373" class="LineNr">373 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L374" class="LineNr">374 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L375" class="LineNr">375 </span><span class="traceContains">+run: subop or</span>
 <span id="L376" class="LineNr">376 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L377" class="LineNr">377 </span>
 <span id="L378" class="LineNr">378 </span><span class="SalientComment">//:: xor</span>
 <span id="L379" class="LineNr">379 </span>
 <span id="L380" class="LineNr">380 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of imm32 with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;EAX = bitwise XOR of <a href='037heap.cc.html#L23'>imm32</a> with <a href='010---vm.cc.html#L13'>EAX</a> (xor)&quot;</span><span class="Delimiter">);</span>
 <span id="L382" class="LineNr">382 </span>
 <span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
 <span id="L384" class="LineNr">384 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
 <span id="L385" class="LineNr">385 </span>== <span class="Constant">0x1</span>
 <span id="L386" class="LineNr">386 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L387" class="LineNr">387 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
-<span id="L388" class="LineNr">388 </span><span class="traceContains">+run: xor imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L388" class="LineNr">388 </span><span class="traceContains">+run: xor <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L389" class="LineNr">389 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
 <span id="L390" class="LineNr">390 </span>
 <span id="L391" class="LineNr">391 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L392" class="LineNr">392 </span><span class="Normal">case</span> <span class="Constant">0x35</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor imm32 with EAX</span>
 <span id="L393" class="LineNr">393 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L394" class="LineNr">394 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;xor <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L395" class="LineNr">395 </span>  <a href='010---vm.cc.html#L103'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L396" class="LineNr">396 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L397" class="LineNr">397 </span><span class="Delimiter">}</span>
@@ -473,9 +468,9 @@ if ('onhashchange' in window) {
 <span id="L406" class="LineNr">406 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
 <span id="L407" class="LineNr">407 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L408" class="LineNr">408 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L410" class="LineNr">410 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L412" class="LineNr">412 </span><span class="traceContains">+run: subop xor</span>
 <span id="L413" class="LineNr">413 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L414" class="LineNr">414 </span>
@@ -492,30 +487,30 @@ if ('onhashchange' in window) {
 <span id="L425" class="LineNr">425 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L426" class="LineNr">426 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
 <span id="L427" class="LineNr">427 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L429" class="LineNr">429 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L431" class="LineNr">431 </span><span class="traceContains">+run: subop xor</span>
 <span id="L432" class="LineNr">432 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
 <span id="L433" class="LineNr">433 </span>
 <span id="L434" class="LineNr">434 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L435" class="LineNr">435 </span>
 <span id="L436" class="LineNr">436 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L437" class="LineNr">437 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; imm32 (cmp)&quot;</span><span class="Delimiter">);</span>
+<span id="L437" class="LineNr">437 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;compare: set SF if <a href='010---vm.cc.html#L13'>EAX</a> &lt; <a href='037heap.cc.html#L23'>imm32</a> (cmp)&quot;</span><span class="Delimiter">);</span>
 <span id="L438" class="LineNr">438 </span>
 <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
 <span id="L440" class="LineNr">440 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
 <span id="L441" class="LineNr">441 </span>== <span class="Constant">0x1</span>
 <span id="L442" class="LineNr">442 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L443" class="LineNr">443 </span>  3d                              <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EAX</span>
-<span id="L444" class="LineNr">444 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b07</span>
+<span id="L444" class="LineNr">444 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b07</span>
 <span id="L445" class="LineNr">445 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L446" class="LineNr">446 </span>
 <span id="L447" class="LineNr">447 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L448" class="LineNr">448 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// compare EAX with imm32</span>
 <span id="L449" class="LineNr">449 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg1 = <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
 <span id="L450" class="LineNr">450 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L451" class="LineNr">451 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L452" class="LineNr">452 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
 <span id="L453" class="LineNr">453 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L454" class="LineNr">454 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
@@ -530,7 +525,7 @@ if ('onhashchange' in window) {
 <span id="L463" class="LineNr">463 </span>== <span class="Constant">0x1</span>
 <span id="L464" class="LineNr">464 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L465" class="LineNr">465 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L466" class="LineNr">466 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
+<span id="L466" class="LineNr">466 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a</span>
 <span id="L467" class="LineNr">467 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L468" class="LineNr">468 </span>
 <span id="L469" class="LineNr">469 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
@@ -538,7 +533,7 @@ if ('onhashchange' in window) {
 <span id="L471" class="LineNr">471 </span>== <span class="Constant">0x1</span>
 <span id="L472" class="LineNr">472 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L473" class="LineNr">473 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L474" class="LineNr">474 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
+<span id="L474" class="LineNr">474 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a</span>
 <span id="L475" class="LineNr">475 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L476" class="LineNr">476 </span>
 <span id="L477" class="LineNr">477 </span><span class="Comment">//:</span>
@@ -549,9 +544,9 @@ if ('onhashchange' in window) {
 <span id="L482" class="LineNr">482 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L483" class="LineNr">483 </span>  <span class="Constant">81</span>  fb                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with EBX</span>
 <span id="L484" class="LineNr">484 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L485" class="LineNr">485 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L486" class="LineNr">486 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L487" class="LineNr">487 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
+<span id="L487" class="LineNr">487 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b07</span>
 <span id="L488" class="LineNr">488 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L489" class="LineNr">489 </span>
 <span id="L490" class="LineNr">490 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
@@ -572,9 +567,9 @@ if ('onhashchange' in window) {
 <span id="L505" class="LineNr">505 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L506" class="LineNr">506 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
 <span id="L507" class="LineNr">507 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L508" class="LineNr">508 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L508" class="LineNr">508 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L509" class="LineNr">509 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L510" class="LineNr">510 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L510" class="LineNr">510 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L511" class="LineNr">511 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L512" class="LineNr">512 </span>
 <span id="L513" class="LineNr">513 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
@@ -583,9 +578,9 @@ if ('onhashchange' in window) {
 <span id="L516" class="LineNr">516 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L517" class="LineNr">517 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
 <span id="L518" class="LineNr">518 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L519" class="LineNr">519 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L519" class="LineNr">519 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L520" class="LineNr">520 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L522" class="LineNr">522 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L523" class="LineNr">523 </span>
 <span id="L524" class="LineNr">524 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
@@ -596,9 +591,9 @@ if ('onhashchange' in window) {
 <span id="L529" class="LineNr">529 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
 <span id="L530" class="LineNr">530 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L531" class="LineNr">531 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L532" class="LineNr">532 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L532" class="LineNr">532 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L533" class="LineNr">533 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L534" class="LineNr">534 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
+<span id="L534" class="LineNr">534 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b07</span>
 <span id="L535" class="LineNr">535 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L536" class="LineNr">536 </span>
 <span id="L537" class="LineNr">537 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
@@ -609,9 +604,9 @@ if ('onhashchange' in window) {
 <span id="L542" class="LineNr">542 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
 <span id="L543" class="LineNr">543 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L544" class="LineNr">544 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
-<span id="L545" class="LineNr">545 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L545" class="LineNr">545 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L546" class="LineNr">546 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L547" class="LineNr">547 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L548" class="LineNr">548 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
 <span id="L549" class="LineNr">549 </span>
 <span id="L550" class="LineNr">550 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
@@ -623,28 +618,28 @@ if ('onhashchange' in window) {
 <span id="L556" class="LineNr">556 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
 <span id="L557" class="LineNr">557 </span>== <span class="Constant">0x2000</span>  <span class="Comment"># data segment</span>
 <span id="L558" class="LineNr">558 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L559" class="LineNr">559 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L559" class="LineNr">559 </span><span class="traceContains">+run: combine <a href='037heap.cc.html#L23'>imm32</a> with r/m32</span>
 <span id="L560" class="LineNr">560 </span><span class="traceContains">+run: effective address is 0x00002000 (EBX)</span>
-<span id="L561" class="LineNr">561 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L561" class="LineNr">561 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L562" class="LineNr">562 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
 <span id="L563" class="LineNr">563 </span>
 <span id="L564" class="LineNr">564 </span><span class="SalientComment">//:: copy (mov)</span>
 <span id="L565" class="LineNr">565 </span>
 <span id="L566" class="LineNr">566 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L567" class="LineNr">567 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L568" class="LineNr">568 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L569" class="LineNr">569 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L570" class="LineNr">570 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L571" class="LineNr">571 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L572" class="LineNr">572 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L573" class="LineNr">573 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
-<span id="L574" class="LineNr">574 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L567" class="LineNr">567 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L13'>EAX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L568" class="LineNr">568 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L14'>ECX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L569" class="LineNr">569 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L15'>EDX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L570" class="LineNr">570 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L16'>EBX</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L571" class="LineNr">571 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L17'>ESP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L572" class="LineNr">572 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L18'>EBP</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L573" class="LineNr">573 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L19'>ESI</a> (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L574" class="LineNr">574 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to <a href='010---vm.cc.html#L20'>EDI</a> (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L575" class="LineNr">575 </span>
 <span id="L576" class="LineNr">576 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
 <span id="L577" class="LineNr">577 </span>== <span class="Constant">0x1</span>
 <span id="L578" class="LineNr">578 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L579" class="LineNr">579 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
-<span id="L580" class="LineNr">580 </span><span class="traceContains">+run: copy imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L580" class="LineNr">580 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L581" class="LineNr">581 </span>
 <span id="L582" class="LineNr">582 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L583" class="LineNr">583 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
@@ -657,7 +652,7 @@ if ('onhashchange' in window) {
 <span id="L590" class="LineNr">590 </span><span class="Normal">case</span> <span class="Constant">0xbf</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L591" class="LineNr">591 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> rdest = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
 <span id="L592" class="LineNr">592 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L593" class="LineNr">593 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L593" class="LineNr">593 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L62'>rname</a><span class="Delimiter">(</span>rdest<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L594" class="LineNr">594 </span>  <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[rdest]<span class="Delimiter">.</span>i = src<span class="Delimiter">;</span>
 <span id="L595" class="LineNr">595 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L596" class="LineNr">596 </span><span class="Delimiter">}</span>
@@ -665,7 +660,7 @@ if ('onhashchange' in window) {
 <span id="L598" class="LineNr">598 </span><span class="Comment">//:</span>
 <span id="L599" class="LineNr">599 </span>
 <span id="L600" class="LineNr">600 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L601" class="LineNr">601 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
+<span id="L601" class="LineNr">601 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to rm32 (mov)&quot;</span><span class="Delimiter">);</span>
 <span id="L602" class="LineNr">602 </span>
 <span id="L603" class="LineNr">603 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
 <span id="L604" class="LineNr">604 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
@@ -673,45 +668,50 @@ if ('onhashchange' in window) {
 <span id="L606" class="LineNr">606 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L607" class="LineNr">607 </span>  c7  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to *EBX</span>
 <span id="L608" class="LineNr">608 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: copy imm32 to r/m32</span>
+<span id="L609" class="LineNr">609 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> to r/m32</span>
 <span id="L610" class="LineNr">610 </span><span class="traceContains">+run: effective address is 0x00000060 (EBX)</span>
-<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L611" class="LineNr">611 </span><span class="traceContains">+run: <a href='037heap.cc.html#L23'>imm32</a> is 0x0d0c0b0a</span>
 <span id="L612" class="LineNr">612 </span>
 <span id="L613" class="LineNr">613 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L614" class="LineNr">614 </span><span class="Normal">case</span> <span class="Constant">0xc7</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy imm32 to r32</span>
 <span id="L615" class="LineNr">615 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L364'>next</a><span class="Delimiter">();</span>
-<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy imm32 to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L617" class="LineNr">617 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L618" class="LineNr">618 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L619" class="LineNr">619 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L620" class="LineNr">620 </span>  *dest = src<span class="Delimiter">;</span>
-<span id="L621" class="LineNr">621 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L622" class="LineNr">622 </span><span class="Delimiter">}</span>
-<span id="L623" class="LineNr">623 </span>
-<span id="L624" class="LineNr">624 </span><span class="SalientComment">//:: push</span>
-<span id="L625" class="LineNr">625 </span>
-<span id="L626" class="LineNr">626 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
-<span id="L627" class="LineNr">627 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L616" class="LineNr">616 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;copy <a href='037heap.cc.html#L23'>imm32</a> to r/m32&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L617" class="LineNr">617 </span>  <span class="Normal">const</span> <span class="Normal">uint8_t</span> subop = <span class="Delimiter">(</span>modrm&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>  <span class="Comment">// middle 3 'reg opcode' bits</span>
+<span id="L618" class="LineNr">618 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>subop != <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L619" class="LineNr">619 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized subop for opcode c7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L415'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; (only 0/copy currently implemented)\n&quot;</span><span class="Delimiter">;</span>
+<span id="L620" class="LineNr">620 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L621" class="LineNr">621 </span>  <span class="Delimiter">}</span>
+<span id="L622" class="LineNr">622 </span>  <span class="Normal">int32_t</span>* dest = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L623" class="LineNr">623 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> src = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
+<span id="L624" class="LineNr">624 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;imm32 is 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; src &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L625" class="LineNr">625 </span>  *dest = src<span class="Delimiter">;</span>
+<span id="L626" class="LineNr">626 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L627" class="LineNr">627 </span><span class="Delimiter">}</span>
 <span id="L628" class="LineNr">628 </span>
-<span id="L629" class="LineNr">629 </span><span class="Delimiter">:(scenario push_imm32)</span>
-<span id="L630" class="LineNr">630 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L631" class="LineNr">631 </span>== <span class="Constant">0x1</span>
-<span id="L632" class="LineNr">632 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L633" class="LineNr">633 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX to stack</span>
-<span id="L634" class="LineNr">634 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> imm32 0x000000af</span>
-<span id="L635" class="LineNr">635 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
-<span id="L636" class="LineNr">636 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span>
-<span id="L637" class="LineNr">637 </span>
-<span id="L638" class="LineNr">638 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L639" class="LineNr">639 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L640" class="LineNr">640 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
-<span id="L641" class="LineNr">641 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L642" class="LineNr">642 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L643" class="LineNr">643 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L644" class="LineNr">644 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L645" class="LineNr">645 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L646" class="LineNr">646 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L647" class="LineNr">647 </span><span class="Delimiter">}</span>
+<span id="L629" class="LineNr">629 </span><span class="SalientComment">//:: push</span>
+<span id="L630" class="LineNr">630 </span>
+<span id="L631" class="LineNr">631 </span><span class="Delimiter">:(before &quot;End Initialize Op Names&quot;)</span>
+<span id="L632" class="LineNr">632 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='037heap.cc.html#L23'>imm32</a> to stack (push)&quot;</span><span class="Delimiter">);</span>
+<span id="L633" class="LineNr">633 </span>
+<span id="L634" class="LineNr">634 </span><span class="Delimiter">:(scenario push_imm32)</span>
+<span id="L635" class="LineNr">635 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L636" class="LineNr">636 </span>== <span class="Constant">0x1</span>
+<span id="L637" class="LineNr">637 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L638" class="LineNr">638 </span>  <span class="Constant">68</span>                              af <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># push *EAX to stack</span>
+<span id="L639" class="LineNr">639 </span><span class="traceContains">+run: <a href='012elf.cc.html#L89'>push</a> <a href='037heap.cc.html#L23'>imm32</a> 0x000000af</span>
+<span id="L640" class="LineNr">640 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
+<span id="L641" class="LineNr">641 </span><span class="traceContains">+run: <a href='003trace.cc.html#L74'>contents</a> at <a href='010---vm.cc.html#L17'>ESP</a>: 0x000000af</span>
+<span id="L642" class="LineNr">642 </span>
+<span id="L643" class="LineNr">643 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L644" class="LineNr">644 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
+<span id="L645" class="LineNr">645 </span>  <span class="Normal">const</span> <span class="Normal">uint32_t</span> val = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span><a href='011run.cc.html#L343'>next32</a><span class="Delimiter">());</span>
+<span id="L646" class="LineNr">646 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;push <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; val &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L647" class="LineNr">647 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; val &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L648" class="LineNr">648 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L649" class="LineNr">649 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ESP is now 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L650" class="LineNr">650 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;contents at <a href='010---vm.cc.html#L17'>ESP</a>: 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L209'>read_mem_u32</a><span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L28'>Reg</a></span>[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L651" class="LineNr">651 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L652" class="LineNr">652 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/016index_addressing.cc.html b/html/subx/016index_addressing.cc.html
index daab35a8..be363047 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.PreProc { color:#800080; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
diff --git a/html/subx/017jump_disp8.cc.html b/html/subx/017jump_disp8.cc.html
index a88e01ab..be345391 100644
--- a/html/subx/017jump_disp8.cc.html
+++ b/html/subx/017jump_disp8.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
-.traceContains { color: #008000; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.traceContains { color: #005f00; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/subx/018jump_disp32.cc.html b/html/subx/018jump_disp32.cc.html
index 9b1e6a95..68993154 100644
--- a/html/subx/018jump_disp32.cc.html
+++ b/html/subx/018jump_disp32.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .traceAbsent { color: #c00000; }
-.traceContains { color: #008000; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.traceContains { color: #005f00; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index a9143ecb..c745409a 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
+.CommentedCode { color: #8a8a8a; }
+.traceContains { color: #005f00; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
@@ -75,7 +70,7 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
 <span id="L10" class="LineNr">10 </span>  e8                              a0 <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>  <span class="Comment"># call function offset at 0x000000a0</span>
 <span id="L11" class="LineNr">11 </span>  <span class="Comment"># next EIP is 6</span>
-<span id="L12" class="LineNr">12 </span><span class="traceContains">+run: call imm32 0x000000a0</span>
+<span id="L12" class="LineNr">12 </span><span class="traceContains">+run: call <a href='037heap.cc.html#L23'>imm32</a> 0x000000a0</span>
 <span id="L13" class="LineNr">13 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
 <span id="L14" class="LineNr">14 </span><span class="traceContains">+run: pushing value 0x00000006</span>
 <span id="L15" class="LineNr">15 </span><span class="traceContains">+run: jumping to 0x000000a6</span>
@@ -83,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L17" class="LineNr">17 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L18" class="LineNr">18 </span><span class="Normal">case</span> <span class="Constant">0xe8</span>: <span class="Delimiter">{</span>  <span class="Comment">// call disp32 relative to next EIP</span>
 <span id="L19" class="LineNr">19 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L343'>next32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call imm32 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;run&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;call <a href='037heap.cc.html#L23'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; offset &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L21" class="LineNr">21 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: EIP: &quot; &lt;&lt; EIP &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
 <span id="L22" class="LineNr">22 </span>  <a href='012elf.cc.html#L89'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L23" class="LineNr">23 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += offset<span class="Delimiter">;</span>
diff --git a/html/subx/020syscalls.cc.html b/html/subx/020syscalls.cc.html
index 0313f5c3..49aae7f8 100644
--- a/html/subx/020syscalls.cc.html
+++ b/html/subx/020syscalls.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/021byte_addressing.cc.html b/html/subx/021byte_addressing.cc.html
index 4ae685a0..b4c8c4ee 100644
--- a/html/subx/021byte_addressing.cc.html
+++ b/html/subx/021byte_addressing.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index 5b727ba7..7e62d763 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Delimiter { color:#800080; }
-.SalientComment { color: #00ffff; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #d70000; }
+.Delimiter { color: #c000c0; }
+.SalientComment { color: #0000af; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/029transforms.cc.html b/html/subx/029transforms.cc.html
index 7a72cec6..17658522 100644
--- a/html/subx/029transforms.cc.html
+++ b/html/subx/029transforms.cc.html
@@ -7,20 +7,15 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index 25f176ce..95add670 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.Identifier { color:#c0a020; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.SalientComment { color: #00ffff; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Identifier { color: #af5f00; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.SalientComment { color: #0000af; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
@@ -83,7 +78,7 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span>  <span class="Constant">&quot;Each operand has a type. An instruction won't have more than one operand of\n&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.\n&quot;</span>
 <span id="L21" class="LineNr"> 21 </span>  <span class="Constant">&quot;Each instruction has some set of allowed operand types. It'll reject others.\n&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L433'>types</a>: mod, subop, r32 (register), rm32\n&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L434'>types</a>: mod, subop, r32 (register), rm32\n&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,\n&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.\n&quot;</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">&quot;Each of these has its own help page. Try reading 'subx help mod' next.\n&quot;</span>
@@ -96,7 +91,7 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr"> 32 </span>bb  <span class="Constant">0x2a</span>/imm32
 <span id="L33" class="LineNr"> 33 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
 <span id="L34" class="LineNr"> 34 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L35" class="LineNr"> 35 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L36" class="LineNr"> 36 </span>
 <span id="L37" class="LineNr"> 37 </span><span class="Comment">//: complete set of valid operand types</span>
 <span id="L38" class="LineNr"> 38 </span>
@@ -419,7 +414,7 @@ if ('onhashchange' in window) {
 <span id="L355" class="LineNr">355 </span>b9  <span class="Constant">0x2a</span>/imm32
 <span id="L356" class="LineNr">356 </span><span class="traceContains">+transform: packing instruction 'b9 0x2a/imm32'</span>
 <span id="L357" class="LineNr">357 </span><span class="traceContains">+transform: instruction after packing: 'b9 2a 00 00 00'</span>
-<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: copy <a href='037heap.cc.html#L23'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L14'>ECX</a></span>
 <span id="L359" class="LineNr">359 </span>
 <span id="L360" class="LineNr">360 </span><span class="Delimiter">:(scenarios transform)</span>
 <span id="L361" class="LineNr">361 </span><span class="Delimiter">:(scenario pack_silently_ignores_non_hex)</span>
diff --git a/html/subx/031check_operands.cc.html b/html/subx/031check_operands.cc.html
index 31e4307f..e7622e5c 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.SalientComment { color: #00ffff; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.CommentedCode { color: #8a8a8a; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.SalientComment { color: #0000af; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
@@ -89,18 +84,18 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L24" class="LineNr"> 24 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L26" class="LineNr"> 26 </span>    <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L26" class="LineNr"> 26 </span>    check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L27" class="LineNr"> 27 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Delimiter">}</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>    <a href='031check_operands.cc.html#L493'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L30" class="LineNr"> 30 </span>    <a href='031check_operands.cc.html#L500'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Delimiter">}</span>
 <span id="L33" class="LineNr"> 33 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span><span class="Delimiter">}</span>
 <span id="L35" class="LineNr"> 35 </span>
 <span id="L36" class="LineNr"> 36 </span><a href='011run.cc.html#L123'>word</a> <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L37" class="LineNr"> 37 </span>  op<span class="Delimiter">.</span>data = <a href='031check_operands.cc.html#L565'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L38" class="LineNr"> 38 </span>  <span class="Comment">// opcodes can't be negative</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L102'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span>data<span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
 <span id="L40" class="LineNr"> 40 </span>    op<span class="Delimiter">.</span>data = op<span class="Delimiter">.</span>data<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -117,523 +112,530 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span>
 <span id="L52" class="LineNr"> 52 </span><span class="Comment">//: To check the operands for an opcode, we'll track the permitted operands</span>
 <span id="L53" class="LineNr"> 53 </span><span class="Comment">//: for each supported opcode in a bitvector. That way we can often compute the</span>
-<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: bitvector for each instruction's operands and compare it with the expected.</span>
-<span id="L55" class="LineNr"> 55 </span>
-<span id="L56" class="LineNr"> 56 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L57" class="LineNr"> 57 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L57'>operand_type</a> <span class="Delimiter">{</span>
-<span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// start from the least significant bit</span>
-<span id="L59" class="LineNr"> 59 </span>  <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
-<span id="L60" class="LineNr"> 60 </span>  <a href='031check_operands.cc.html#L60'>SUBOP</a><span class="Delimiter">,</span>
-<span id="L61" class="LineNr"> 61 </span>  <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">,</span>
-<span id="L62" class="LineNr"> 62 </span>  <a href='031check_operands.cc.html#L62'>DISP16</a><span class="Delimiter">,</span>
-<span id="L63" class="LineNr"> 63 </span>  <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">,</span>
-<span id="L64" class="LineNr"> 64 </span>  <a href='031check_operands.cc.html#L64'>IMM8</a><span class="Delimiter">,</span>
-<span id="L65" class="LineNr"> 65 </span>  <a href='031check_operands.cc.html#L65'>IMM32</a><span class="Delimiter">,</span>
-<span id="L66" class="LineNr"> 66 </span>  <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a>
-<span id="L67" class="LineNr"> 67 </span><span class="Delimiter">};</span>
-<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L69" class="LineNr"> 69 </span>vector&lt;string&gt; <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">;</span>
-<span id="L70" class="LineNr"> 70 </span>map&lt;string<span class="Delimiter">,</span> operand_type&gt; <span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L72" class="LineNr"> 72 </span><a href='031check_operands.cc.html#L74'>init_op_types</a><span class="Delimiter">();</span>
-<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(code)</span>
-<span id="L74" class="LineNr"> 74 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L74'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a> &lt;= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span>
-<span id="L76" class="LineNr"> 76 </span>  <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
-<span id="L77" class="LineNr"> 77 </span>  <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
-<span id="L78" class="LineNr"> 78 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L60'>SUBOP</a><span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">);</span>
-<span id="L81" class="LineNr"> 81 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L62'>DISP16</a><span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>IMM8</a><span class="Delimiter">);</span>
-<span id="L84" class="LineNr"> 84 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L65'>IMM32</a><span class="Delimiter">);</span>
-<span id="L85" class="LineNr"> 85 </span>  <span class="Comment">#undef DEF</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
-<span id="L87" class="LineNr"> 87 </span>
-<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L89" class="LineNr"> 89 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">;</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span>  <span class="Comment">// no instruction uses all the operand types</span>
-<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
-<span id="L92" class="LineNr"> 92 </span><a href='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">();</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(code)</span>
-<span id="L94" class="LineNr"> 94 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L94'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">// halt</span>
-<span id="L97" class="LineNr"> 97 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// inc</span>
-<span id="L99" class="LineNr"> 99 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L106" class="LineNr">106 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L107" class="LineNr">107 </span>  <span class="Comment">// dec</span>
-<span id="L108" class="LineNr">108 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Comment">// push</span>
-<span id="L117" class="LineNr">117 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L121" class="LineNr">121 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L125" class="LineNr">125 </span>  <span class="Comment">// pop</span>
-<span id="L126" class="LineNr">126 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Comment">// return</span>
-<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
-<span id="L136" class="LineNr">136 </span>
-<span id="L137" class="LineNr">137 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
-<span id="L140" class="LineNr">140 </span>
-<span id="L141" class="LineNr">141 </span>  <span class="Comment">// jump</span>
-<span id="L142" class="LineNr">142 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L143" class="LineNr">143 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L145" class="LineNr">145 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L146" class="LineNr">146 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
-<span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
-<span id="L154" class="LineNr">154 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
-<span id="L155" class="LineNr">155 </span>
-<span id="L156" class="LineNr">156 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
-<span id="L159" class="LineNr">159 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
+<span id="L54" class="LineNr"> 54 </span><span class="Comment">//: 'received' operand bitvector for each instruction's operands and compare</span>
+<span id="L55" class="LineNr"> 55 </span><span class="Comment">//: it with the 'expected' bitvector.</span>
+<span id="L56" class="LineNr"> 56 </span><span class="Comment">//:</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Comment">//: The 'expected' and 'received' bitvectors can be different; the MODRM bit</span>
+<span id="L58" class="LineNr"> 58 </span><span class="Comment">//: in the 'expected' bitvector maps to multiple 'received' operand types in</span>
+<span id="L59" class="LineNr"> 59 </span><span class="Comment">//: an instruction. We deal in expected bitvectors throughout.</span>
+<span id="L60" class="LineNr"> 60 </span>
+<span id="L61" class="LineNr"> 61 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L62" class="LineNr"> 62 </span><span class="Normal">enum</span> <a href='031check_operands.cc.html#L62'>expected_operand_type</a> <span class="Delimiter">{</span>
+<span id="L63" class="LineNr"> 63 </span>  <span class="Comment">// start from the least significant bit</span>
+<span id="L64" class="LineNr"> 64 </span>  <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">,</span>  <span class="Comment">// more complex, may also involve disp8 or disp32</span>
+<span id="L65" class="LineNr"> 65 </span>  <a href='031check_operands.cc.html#L65'>SUBOP</a><span class="Delimiter">,</span>
+<span id="L66" class="LineNr"> 66 </span>  <a href='031check_operands.cc.html#L66'>DISP8</a><span class="Delimiter">,</span>
+<span id="L67" class="LineNr"> 67 </span>  <a href='031check_operands.cc.html#L67'>DISP16</a><span class="Delimiter">,</span>
+<span id="L68" class="LineNr"> 68 </span>  <a href='031check_operands.cc.html#L68'>DISP32</a><span class="Delimiter">,</span>
+<span id="L69" class="LineNr"> 69 </span>  <a href='031check_operands.cc.html#L69'>IMM8</a><span class="Delimiter">,</span>
+<span id="L70" class="LineNr"> 70 </span>  <a href='031check_operands.cc.html#L70'>IMM32</a><span class="Delimiter">,</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a>
+<span id="L72" class="LineNr"> 72 </span><span class="Delimiter">};</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L74" class="LineNr"> 74 </span>vector&lt;string&gt; <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">;</span>
+<span id="L75" class="LineNr"> 75 </span>map&lt;string<span class="Delimiter">,</span> expected_operand_type&gt; <span class="Special"><a href='031check_operands.cc.html#L75'>Operand_type</a></span><span class="Delimiter">;</span>
+<span id="L76" class="LineNr"> 76 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L77" class="LineNr"> 77 </span><a href='031check_operands.cc.html#L79'>init_op_types</a><span class="Delimiter">();</span>
+<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(code)</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L79'>init_op_types</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L80" class="LineNr"> 80 </span>  assert<span class="Delimiter">(</span><a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a> &lt;= <span class="Comment">/*</span><span class="Comment">bits in a uint8_t</span><span class="Comment">*/</span><span class="Constant">8</span><span class="Delimiter">);</span>
+<span id="L81" class="LineNr"> 81 </span>  <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Comment">#define DEF(type) Operand_type_name.at(type) = tolower(#type), put(Operand_type, tolower(#type), type);</span>
+<span id="L83" class="LineNr"> 83 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">);</span>
+<span id="L84" class="LineNr"> 84 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L65'>SUBOP</a><span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L66'>DISP8</a><span class="Delimiter">);</span>
+<span id="L86" class="LineNr"> 86 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L67'>DISP16</a><span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L68'>DISP32</a><span class="Delimiter">);</span>
+<span id="L88" class="LineNr"> 88 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L69'>IMM8</a><span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>  DEF<span class="Delimiter">(</span><a href='031check_operands.cc.html#L70'>IMM32</a><span class="Delimiter">);</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Comment">#undef DEF</span>
+<span id="L91" class="LineNr"> 91 </span><span class="Delimiter">}</span>
+<span id="L92" class="LineNr"> 92 </span>
+<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L94" class="LineNr"> 94 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">;</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Normal">const</span> <span class="Normal">uint8_t</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a> = <span class="Constant">0xff</span><span class="Delimiter">;</span>  <span class="Comment">// no instruction uses all the operand types</span>
+<span id="L96" class="LineNr"> 96 </span><span class="Delimiter">:(before &quot;End One-time Setup&quot;)</span>
+<span id="L97" class="LineNr"> 97 </span><a href='031check_operands.cc.html#L99'>init_permitted_operands</a><span class="Delimiter">();</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(code)</span>
+<span id="L99" class="LineNr"> 99 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L99'>init_permitted_operands</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L100" class="LineNr">100 </span>  <span class="SalientComment">//// Class A: just op, no operands</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment">// halt</span>
+<span id="L102" class="LineNr">102 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f4&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Comment">// inc</span>
+<span id="L104" class="LineNr">104 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;40&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L105" class="LineNr">105 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;41&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L106" class="LineNr">106 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;42&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L107" class="LineNr">107 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;43&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L108" class="LineNr">108 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;44&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;45&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;46&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;47&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </span>  <span class="Comment">// dec</span>
+<span id="L113" class="LineNr">113 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;48&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;49&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L119" class="LineNr">119 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;4f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Comment">// push</span>
+<span id="L122" class="LineNr">122 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L123" class="LineNr">123 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L124" class="LineNr">124 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L125" class="LineNr">125 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L126" class="LineNr">126 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L129" class="LineNr">129 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L130" class="LineNr">130 </span>  <span class="Comment">// pop</span>
+<span id="L131" class="LineNr">131 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L134" class="LineNr">134 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L136" class="LineNr">136 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L137" class="LineNr">137 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L138" class="LineNr">138 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Comment">// return</span>
+<span id="L140" class="LineNr">140 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x00</span><span class="Delimiter">);</span>
+<span id="L141" class="LineNr">141 </span>
+<span id="L142" class="LineNr">142 </span>  <span class="SalientComment">//// Class B: just op and disp8</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L144" class="LineNr">144 </span>  <span class="Comment">//  0     0     0      |0       1     0     0</span>
+<span id="L145" class="LineNr">145 </span>
+<span id="L146" class="LineNr">146 </span>  <span class="Comment">// jump</span>
+<span id="L147" class="LineNr">147 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;eb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;74&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;75&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L150" class="LineNr">150 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L151" class="LineNr">151 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L153" class="LineNr">153 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;7f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x04</span><span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </span>
+<span id="L155" class="LineNr">155 </span>  <span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L157" class="LineNr">157 </span>  <span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L158" class="LineNr">158 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// call</span>
+<span id="L159" class="LineNr">159 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;e9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>  <span class="Comment">// jump</span>
 <span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
+<span id="L161" class="LineNr">161 </span>  <span class="SalientComment">//// Class E: just op and imm8</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L163" class="LineNr">163 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
-<span id="L164" class="LineNr">164 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
-<span id="L165" class="LineNr">165 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
-<span id="L166" class="LineNr">166 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
-<span id="L167" class="LineNr">167 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
-<span id="L168" class="LineNr">168 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
-<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
-<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
-<span id="L171" class="LineNr">171 </span>  <span class="Comment">// copy</span>
-<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L176" class="LineNr">176 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </span>
-<span id="L181" class="LineNr">181 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L183" class="LineNr">183 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span>  <span class="Comment">// add</span>
-<span id="L186" class="LineNr">186 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L187" class="LineNr">187 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span>  <span class="Comment">// subtract</span>
-<span id="L189" class="LineNr">189 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L190" class="LineNr">190 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Comment">// and</span>
-<span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L194" class="LineNr">194 </span>  <span class="Comment">// or</span>
-<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Comment">// xor</span>
-<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L199" class="LineNr">199 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L200" class="LineNr">200 </span>  <span class="Comment">// compare</span>
-<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L203" class="LineNr">203 </span>  <span class="Comment">// copy</span>
-<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L208" class="LineNr">208 </span>  <span class="Comment">// swap</span>
-<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Comment">// copy address (lea)</span>
-<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L212" class="LineNr">212 </span>  <span class="Comment">// pop</span>
-<span id="L213" class="LineNr">213 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L214" class="LineNr">214 </span>
-<span id="L215" class="LineNr">215 </span>  <span class="SalientComment">//// Class N: op, ModR/M and subop (not r32)</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L217" class="LineNr">217 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
-<span id="L219" class="LineNr">219 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
-<span id="L220" class="LineNr">220 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span>  <span class="SalientComment">//// Class O: op, ModR/M, subop (not r32) and imm8</span>
-<span id="L223" class="LineNr">223 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L224" class="LineNr">224 </span>  <span class="Comment">//  0     1     0      |0       0     1     1</span>
-<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Comment">//  0     1     0      |0       0     0     0</span>
+<span id="L164" class="LineNr">164 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;cd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x20</span><span class="Delimiter">);</span>  <span class="Comment">// software interrupt</span>
+<span id="L165" class="LineNr">165 </span>
+<span id="L166" class="LineNr">166 </span>  <span class="SalientComment">//// Class F: just op and imm32</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L168" class="LineNr">168 </span>  <span class="Comment">//  1     0     0      |0       0     0     0</span>
+<span id="L169" class="LineNr">169 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// add</span>
+<span id="L170" class="LineNr">170 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// subtract</span>
+<span id="L171" class="LineNr">171 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// and</span>
+<span id="L172" class="LineNr">172 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// or</span>
+<span id="L173" class="LineNr">173 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// xor</span>
+<span id="L174" class="LineNr">174 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// compare</span>
+<span id="L175" class="LineNr">175 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>  <span class="Comment">// push</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Comment">// copy</span>
+<span id="L177" class="LineNr">177 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L178" class="LineNr">178 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L179" class="LineNr">179 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L181" class="LineNr">181 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L182" class="LineNr">182 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L183" class="LineNr">183 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x40</span><span class="Delimiter">);</span>
+<span id="L185" class="LineNr">185 </span>
+<span id="L186" class="LineNr">186 </span>  <span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L187" class="LineNr">187 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L188" class="LineNr">188 </span>  <span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L189" class="LineNr">189 </span>
+<span id="L190" class="LineNr">190 </span>  <span class="Comment">// add</span>
+<span id="L191" class="LineNr">191 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;01&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;03&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Comment">// subtract</span>
+<span id="L194" class="LineNr">194 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;29&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;2b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L196" class="LineNr">196 </span>  <span class="Comment">// and</span>
+<span id="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;23&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L199" class="LineNr">199 </span>  <span class="Comment">// or</span>
+<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L201" class="LineNr">201 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;0b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Comment">// xor</span>
+<span id="L203" class="LineNr">203 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L204" class="LineNr">204 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;33&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L205" class="LineNr">205 </span>  <span class="Comment">// compare</span>
+<span id="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L208" class="LineNr">208 </span>  <span class="Comment">// copy</span>
+<span id="L209" class="LineNr">209 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L210" class="LineNr">210 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L213" class="LineNr">213 </span>  <span class="Comment">// swap</span>
+<span id="L214" class="LineNr">214 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Comment">// copy address (lea)</span>
+<span id="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </span>  <span class="Comment">// pop</span>
+<span id="L218" class="LineNr">218 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L219" class="LineNr">219 </span>
+<span id="L220" class="LineNr">220 </span>  <span class="SalientComment">//// Class N: op, ModR/M and subop (not r32)</span>
+<span id="L221" class="LineNr">221 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L222" class="LineNr">222 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
+<span id="L223" class="LineNr">223 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;d3&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// shift</span>
+<span id="L224" class="LineNr">224 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// test/not/mul/div</span>
+<span id="L225" class="LineNr">225 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x03</span><span class="Delimiter">);</span>  <span class="Comment">// jump/push/call</span>
 <span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span>  <span class="SalientComment">//// Class P: op, ModR/M and imm32</span>
+<span id="L227" class="LineNr">227 </span>  <span class="SalientComment">//// Class O: op, ModR/M, subop (not r32) and imm8</span>
 <span id="L228" class="LineNr">228 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L229" class="LineNr">229 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x41</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L229" class="LineNr">229 </span>  <span class="Comment">//  0     1     0      |0       0     1     1</span>
+<span id="L230" class="LineNr">230 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c1&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x23</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
 <span id="L231" class="LineNr">231 </span>
-<span id="L232" class="LineNr">232 </span>  <span class="SalientComment">//// Class Q: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L232" class="LineNr">232 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
 <span id="L233" class="LineNr">233 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
 <span id="L234" class="LineNr">234 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
-<span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L238" class="LineNr">238 </span><span class="Delimiter">}</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(code)</span>
-<span id="L241" class="LineNr">241 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L242" class="LineNr">242 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L243" class="LineNr">243 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L244" class="LineNr">244 </span>
-<span id="L245" class="LineNr">245 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L246" class="LineNr">246 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L247" class="LineNr">247 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L89'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L249" class="LineNr">249 </span>    <a href='031check_operands.cc.html#L343'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>    <a href='031check_operands.cc.html#L370'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Delimiter">}</span>
-<span id="L252" class="LineNr">252 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L253" class="LineNr">253 </span>    <a href='031check_operands.cc.html#L259'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L254" class="LineNr">254 </span>  <span class="Delimiter">}</span>
-<span id="L255" class="LineNr">255 </span><span class="Delimiter">}</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
-<span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L259'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L261" class="LineNr">261 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L264" class="LineNr">264 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L265" class="LineNr">265 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L266" class="LineNr">266 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L267" class="LineNr">267 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L268" class="LineNr">268 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L269" class="LineNr">269 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L270" class="LineNr">270 </span>    <span class="Normal">else</span>
-<span id="L271" class="LineNr">271 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L272" class="LineNr">272 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L273" class="LineNr">273 </span>  <span class="Delimiter">}</span>
-<span id="L274" class="LineNr">274 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L275" class="LineNr">275 </span><span class="Delimiter">}</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span>string <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L280" class="LineNr">280 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L281" class="LineNr">281 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L282" class="LineNr">282 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span><span class="Delimiter">}</span>
-<span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L288" class="LineNr">288 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L311'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L289" class="LineNr">289 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Delimiter">}</span>
-<span id="L291" class="LineNr">291 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L292" class="LineNr">292 </span><span class="Delimiter">}</span>
-<span id="L293" class="LineNr">293 </span>
-<span id="L294" class="LineNr">294 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L295" class="LineNr">295 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L296" class="LineNr">296 </span><span class="Delimiter">}</span>
-<span id="L297" class="LineNr">297 </span>
-<span id="L298" class="LineNr">298 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L301" class="LineNr">301 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L302" class="LineNr">302 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr">303 </span>    <span class="Normal">else</span>
-<span id="L304" class="LineNr">304 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span>  <span class="Delimiter">}</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">}</span>
-<span id="L308" class="LineNr">308 </span>
-<span id="L309" class="LineNr">309 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L310" class="LineNr">310 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L311" class="LineNr">311 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L311'>bitvector_for_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L313" class="LineNr">313 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L315" class="LineNr">315 </span>    <span class="Normal">const</span> string&amp; curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L316" class="LineNr">316 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
-<span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L318" class="LineNr">318 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L319" class="LineNr">319 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L90'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L320" class="LineNr">320 </span>    <span class="Delimiter">}</span>
-<span id="L321" class="LineNr">321 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L70'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L322" class="LineNr">322 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L323" class="LineNr">323 </span>  <span class="Delimiter">}</span>
-<span id="L324" class="LineNr">324 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L325" class="LineNr">325 </span><span class="Delimiter">}</span>
-<span id="L326" class="LineNr">326 </span>
-<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L328" class="LineNr">328 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L329" class="LineNr">329 </span>== <span class="Constant">0x1</span>
-<span id="L330" class="LineNr">330 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L331" class="LineNr">331 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L334" class="LineNr">334 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L235" class="LineNr">235 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// combine</span>
+<span id="L236" class="LineNr">236 </span>  <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x43</span><span class="Delimiter">);</span>  <span class="Comment">// copy</span>
+<span id="L237" class="LineNr">237 </span>
+<span id="L238" class="LineNr">238 </span>  <span class="Comment">// End Init Permitted Operands</span>
+<span id="L239" class="LineNr">239 </span><span class="Delimiter">}</span>
+<span id="L240" class="LineNr">240 </span>
+<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(code)</span>
+<span id="L242" class="LineNr">242 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L243" class="LineNr">243 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L244" class="LineNr">244 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L245" class="LineNr">245 </span>
+<span id="L246" class="LineNr">246 </span><span class="Normal">void</span> check_operands<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L247" class="LineNr">247 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L248" class="LineNr">248 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L94'>Permitted_operands</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L249" class="LineNr">249 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L250" class="LineNr">250 </span>    <a href='031check_operands.cc.html#L346'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L251" class="LineNr">251 </span>    <a href='031check_operands.cc.html#L372'>compare_bitvector_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L252" class="LineNr">252 </span>  <span class="Delimiter">}</span>
+<span id="L253" class="LineNr">253 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L254" class="LineNr">254 </span>    <a href='031check_operands.cc.html#L260'>compare_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> expected_bitvector<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
+<span id="L256" class="LineNr">256 </span><span class="Delimiter">}</span>
+<span id="L257" class="LineNr">257 </span>
+<span id="L258" class="LineNr">258 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L259" class="LineNr">259 </span>
+<span id="L260" class="LineNr">260 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L260'>compare_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L295'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L262" class="LineNr">262 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L286'>computed_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L264" class="LineNr">264 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L265" class="LineNr">265 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L267" class="LineNr">267 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L268" class="LineNr">268 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L269" class="LineNr">269 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L270" class="LineNr">270 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L271" class="LineNr">271 </span>    <span class="Normal">else</span>
+<span id="L272" class="LineNr">272 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L273" class="LineNr">273 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L274" class="LineNr">274 </span>  <span class="Delimiter">}</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L276" class="LineNr">276 </span><span class="Delimiter">}</span>
+<span id="L277" class="LineNr">277 </span>
+<span id="L278" class="LineNr">278 </span>string <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L282" class="LineNr">282 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L378'>Name</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L283" class="LineNr">283 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span><span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L286'>computed_expected_operand_bitvector</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip op</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L289" class="LineNr">289 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L312'>expected_bit_for_received_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L290" class="LineNr">290 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </span><span class="Delimiter">}</span>
+<span id="L294" class="LineNr">294 </span>
+<span id="L295" class="LineNr">295 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L295'>has_operands</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L296" class="LineNr">296 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L299'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L297" class="LineNr">297 </span><span class="Delimiter">}</span>
+<span id="L298" class="LineNr">298 </span>
+<span id="L299" class="LineNr">299 </span><span class="Normal">int</span> <a href='031check_operands.cc.html#L299'>first_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L300" class="LineNr">300 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L302" class="LineNr">302 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L303" class="LineNr">303 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span>    <span class="Normal">else</span>
+<span id="L305" class="LineNr">305 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L306" class="LineNr">306 </span>  <span class="Delimiter">}</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span><span class="Delimiter">}</span>
+<span id="L309" class="LineNr">309 </span>
+<span id="L310" class="LineNr">310 </span><span class="Comment">// Scan the metadata of 'w' and return the expected bit corresponding to any operand type.</span>
+<span id="L311" class="LineNr">311 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L312" class="LineNr">312 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L312'>expected_bit_for_received_operand</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L313" class="LineNr">313 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L314" class="LineNr">314 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L316" class="LineNr">316 </span>    string<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> curr = w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L317" class="LineNr">317 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr == <span class="Constant">&quot;mod&quot;</span> || curr == <span class="Constant">&quot;rm32&quot;</span> || curr == <span class="Constant">&quot;r32&quot;</span> || curr == <span class="Constant">&quot;scale&quot;</span> || curr == <span class="Constant">&quot;index&quot;</span> || curr == <span class="Constant">&quot;base&quot;</span><span class="Delimiter">)</span>
+<span id="L318" class="LineNr">318 </span>      curr = <span class="Constant">&quot;modrm&quot;</span><span class="Delimiter">;</span>
+<span id="L319" class="LineNr">319 </span>    <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L75'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// ignore unrecognized metadata</span>
+<span id="L320" class="LineNr">320 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L321" class="LineNr">321 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; w<span class="Delimiter">.</span>original &lt;&lt; <span class="Constant">&quot;' has conflicting operand types; it should have only one\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L322" class="LineNr">322 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L95'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L323" class="LineNr">323 </span>    <span class="Delimiter">}</span>
+<span id="L324" class="LineNr">324 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L75'>Operand_type</a></span><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L325" class="LineNr">325 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L326" class="LineNr">326 </span>  <span class="Delimiter">}</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L328" class="LineNr">328 </span><span class="Delimiter">}</span>
+<span id="L329" class="LineNr">329 </span>
+<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L331" class="LineNr">331 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L332" class="LineNr">332 </span>== <span class="Constant">0x1</span>
+<span id="L333" class="LineNr">333 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L334" class="LineNr">334 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
 <span id="L335" class="LineNr">335 </span>
-<span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L337" class="LineNr">337 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L338" class="LineNr">338 </span>== <span class="Constant">0x1</span>
-<span id="L339" class="LineNr">339 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing mod operand</span>
-<span id="L341" class="LineNr">341 </span>
-<span id="L342" class="LineNr">342 </span><span class="Delimiter">:(code)</span>
-<span id="L343" class="LineNr">343 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L343'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L345" class="LineNr">345 </span>  <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L346" class="LineNr">346 </span>  <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L347" class="LineNr">347 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L348" class="LineNr">348 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
-<span id="L349" class="LineNr">349 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L350" class="LineNr">350 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
-<span id="L351" class="LineNr">351 </span>  <span class="Delimiter">}</span>
-<span id="L352" class="LineNr">352 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L354" class="LineNr">354 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L357" class="LineNr">357 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L358" class="LineNr">358 </span>    <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
-<span id="L359" class="LineNr">359 </span>  <span class="Delimiter">}</span>
-<span id="L360" class="LineNr">360 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L362" class="LineNr">362 </span>    <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Delimiter">}</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L365" class="LineNr">365 </span><span class="Delimiter">}</span>
-<span id="L366" class="LineNr">366 </span>
-<span id="L367" class="LineNr">367 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
-<span id="L368" class="LineNr">368 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
-<span id="L369" class="LineNr">369 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
-<span id="L370" class="LineNr">370 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L370'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L371" class="LineNr">371 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L372" class="LineNr">372 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L374" class="LineNr">374 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L377" class="LineNr">377 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L378" class="LineNr">378 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L379" class="LineNr">379 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L380" class="LineNr">380 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L61'>DISP8</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L381" class="LineNr">381 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L383" class="LineNr">383 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L384" class="LineNr">384 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L385" class="LineNr">385 </span>    <span class="Delimiter">}</span>
-<span id="L386" class="LineNr">386 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L63'>DISP32</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L387" class="LineNr">387 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L388" class="LineNr">388 </span>      <span class="Normal">int32_t</span> rm32 = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
-<span id="L389" class="LineNr">389 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">0</span> &amp;&amp; rm32 == <span class="Constant">5</span><span class="Delimiter">)</span>
-<span id="L390" class="LineNr">390 </span>        <span class="Delimiter">;</span>  <span class="Comment">// ok: special-case for loading address from disp32</span>
-<span id="L391" class="LineNr">391 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">2</span><span class="Delimiter">)</span>
-<span id="L392" class="LineNr">392 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L393" class="LineNr">393 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L394" class="LineNr">394 </span>    <span class="Delimiter">}</span>
-<span id="L395" class="LineNr">395 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L396" class="LineNr">396 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L397" class="LineNr">397 </span>    <span class="Normal">else</span>
-<span id="L398" class="LineNr">398 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L399" class="LineNr">399 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L400" class="LineNr">400 </span>  <span class="Delimiter">}</span>
-<span id="L401" class="LineNr">401 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L402" class="LineNr">402 </span><span class="Delimiter">}</span>
-<span id="L403" class="LineNr">403 </span>
-<span id="L404" class="LineNr">404 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L404'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L405" class="LineNr">405 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L406" class="LineNr">406 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L407" class="LineNr">407 </span><span class="Delimiter">}</span>
-<span id="L408" class="LineNr">408 </span>
-<span id="L409" class="LineNr">409 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L409'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L411" class="LineNr">411 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L277'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L412" class="LineNr">412 </span><span class="Delimiter">}</span>
-<span id="L413" class="LineNr">413 </span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L416" class="LineNr">416 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L417" class="LineNr">417 </span>== <span class="Constant">0x1</span>
-<span id="L418" class="LineNr">418 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L419" class="LineNr">419 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
-<span id="L420" class="LineNr">420 </span>$error: <span class="Constant">0</span>
-<span id="L421" class="LineNr">421 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L422" class="LineNr">422 </span>
-<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L424" class="LineNr">424 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L425" class="LineNr">425 </span>== <span class="Constant">0x1</span>
-<span id="L426" class="LineNr">426 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
-<span id="L427" class="LineNr">427 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L428" class="LineNr">428 </span>
-<span id="L429" class="LineNr">429 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L430" class="LineNr">430 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L431" class="LineNr">431 </span>== <span class="Constant">0x1</span>
-<span id="L432" class="LineNr">432 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
-<span id="L433" class="LineNr">433 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L434" class="LineNr">434 </span>
-<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L436" class="LineNr">436 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L437" class="LineNr">437 </span>== <span class="Constant">0x1</span>
-<span id="L438" class="LineNr">438 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
-<span id="L439" class="LineNr">439 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with imm32 based on subop): missing rm32 operand</span>
-<span id="L440" class="LineNr">440 </span>
-<span id="L441" class="LineNr">441 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L442" class="LineNr">442 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L443" class="LineNr">443 </span>== <span class="Constant">0x1</span>
-<span id="L444" class="LineNr">444 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
-<span id="L445" class="LineNr">445 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with imm32 based on subop): missing subop operand</span>
-<span id="L446" class="LineNr">446 </span>
-<span id="L447" class="LineNr">447 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L448" class="LineNr">448 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L449" class="LineNr">449 </span>== <span class="Constant">0x1</span>
-<span id="L450" class="LineNr">450 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L451" class="LineNr">451 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
-<span id="L452" class="LineNr">452 </span>
-<span id="L453" class="LineNr">453 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L454" class="LineNr">454 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L455" class="LineNr">455 </span>== <span class="Constant">0x1</span>
-<span id="L456" class="LineNr">456 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
-<span id="L457" class="LineNr">457 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with imm32 based on subop): missing index operand</span>
-<span id="L458" class="LineNr">458 </span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L460" class="LineNr">460 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L461" class="LineNr">461 </span>== <span class="Constant">0x1</span>
-<span id="L462" class="LineNr">462 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
-<span id="L463" class="LineNr">463 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with imm32 based on subop): missing base operand</span>
-<span id="L464" class="LineNr">464 </span>
-<span id="L465" class="LineNr">465 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
-<span id="L466" class="LineNr">466 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L467" class="LineNr">467 </span>== <span class="Constant">0x1</span>
-<span id="L468" class="LineNr">468 </span><span class="Constant">89</span>/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX <span class="Constant">4</span>/disp8
-<span id="L469" class="LineNr">469 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8' (copy r32 to rm32): unexpected disp8 operand</span>
-<span id="L470" class="LineNr">470 </span>
-<span id="L471" class="LineNr">471 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L472" class="LineNr">472 </span>== <span class="Constant">0x1</span>
-<span id="L473" class="LineNr">473 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
-<span id="L474" class="LineNr">474 </span>$error: <span class="Constant">0</span>
-<span id="L475" class="LineNr">475 </span>
-<span id="L476" class="LineNr">476 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
-<span id="L477" class="LineNr">477 </span>
-<span id="L478" class="LineNr">478 </span><span class="Delimiter">:(code)</span>
-<span id="L479" class="LineNr">479 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L480" class="LineNr">480 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L481" class="LineNr">481 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L482" class="LineNr">482 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L483" class="LineNr">483 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L484" class="LineNr">484 </span>  <span class="Delimiter">}</span>
-<span id="L485" class="LineNr">485 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L486" class="LineNr">486 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L487" class="LineNr">487 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L488" class="LineNr">488 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L489" class="LineNr">489 </span>  <span class="Delimiter">}</span>
-<span id="L490" class="LineNr">490 </span>  <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L491" class="LineNr">491 </span><span class="Delimiter">}</span>
-<span id="L492" class="LineNr">492 </span>
-<span id="L493" class="LineNr">493 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L493'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L495" class="LineNr">495 </span><span class="Delimiter">}</span>
-<span id="L496" class="LineNr">496 </span>
-<span id="L497" class="LineNr">497 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
-<span id="L498" class="LineNr">498 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L499" class="LineNr">499 </span>== <span class="Constant">0x1</span>
-<span id="L500" class="LineNr">500 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L501" class="LineNr">501 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L502" class="LineNr">502 </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="L503" class="LineNr">503 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L504" class="LineNr">504 </span><span class="traceContains">+error: '0f 84' (jump disp32 bytes away if equal, if ZF is set): missing disp32 operand</span>
-<span id="L505" class="LineNr">505 </span>
-<span id="L506" class="LineNr">506 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L507" class="LineNr">507 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
-<span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L509" class="LineNr">509 </span><span class="SalientComment">//// Class D: just op and disp32</span>
-<span id="L510" class="LineNr">510 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L511" class="LineNr">511 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
-<span id="L512" class="LineNr">512 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L513" class="LineNr">513 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L514" class="LineNr">514 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L515" class="LineNr">515 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L516" class="LineNr">516 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L517" class="LineNr">517 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
-<span id="L518" class="LineNr">518 </span>
-<span id="L519" class="LineNr">519 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L520" class="LineNr">520 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L521" class="LineNr">521 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L522" class="LineNr">522 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
-<span id="L523" class="LineNr">523 </span>
-<span id="L524" class="LineNr">524 </span><span class="Delimiter">:(code)</span>
-<span id="L525" class="LineNr">525 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L525'>check_operands_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L507'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L527" class="LineNr">527 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">))</span>
-<span id="L528" class="LineNr">528 </span>    <a href='031check_operands.cc.html#L343'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L529" class="LineNr">529 </span>  <a href='031check_operands.cc.html#L532'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L59'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L530" class="LineNr">530 </span><span class="Delimiter">}</span>
-<span id="L531" class="LineNr">531 </span>
-<span id="L532" class="LineNr">532 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L532'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L533" class="LineNr">533 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L294'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
-<span id="L534" class="LineNr">534 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L285'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L535" class="LineNr">535 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L536" class="LineNr">536 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
-<span id="L537" class="LineNr">537 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L66'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L538" class="LineNr">538 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
-<span id="L539" class="LineNr">539 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
-<span id="L540" class="LineNr">540 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L69'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L541" class="LineNr">541 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
-<span id="L542" class="LineNr">542 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L543" class="LineNr">543 </span>    <span class="Normal">else</span>
-<span id="L544" class="LineNr">544 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L545" class="LineNr">545 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L546" class="LineNr">546 </span>  <span class="Delimiter">}</span>
-<span id="L547" class="LineNr">547 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L548" class="LineNr">548 </span><span class="Delimiter">}</span>
-<span id="L549" class="LineNr">549 </span>
-<span id="L550" class="LineNr">550 </span>string <a href='031check_operands.cc.html#L550'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L551" class="LineNr">551 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L552" class="LineNr">552 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L553" class="LineNr">553 </span>  <span class="Comment">// strip stuff in parens from the name</span>
-<span id="L554" class="LineNr">554 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L555" class="LineNr">555 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L556" class="LineNr">556 </span><span class="Delimiter">}</span>
-<span id="L557" class="LineNr">557 </span>
-<span id="L558" class="LineNr">558 </span>string <a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L559" class="LineNr">559 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L560" class="LineNr">560 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
-<span id="L561" class="LineNr">561 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L558'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L562" class="LineNr">562 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L337" class="LineNr">337 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L338" class="LineNr">338 </span>
+<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L340" class="LineNr">340 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L341" class="LineNr">341 </span>== <span class="Constant">0x1</span>
+<span id="L342" class="LineNr">342 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop       <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L343" class="LineNr">343 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing mod operand</span>
+<span id="L344" class="LineNr">344 </span>
+<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(code)</span>
+<span id="L346" class="LineNr">346 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L346'>check_operands_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L347" class="LineNr">347 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L348" class="LineNr">348 </span>  <a href='031check_operands.cc.html#L405'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L349" class="LineNr">349 </span>  <a href='031check_operands.cc.html#L405'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L350" class="LineNr">350 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span>data == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span>data == <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// keep sync'd with 'help subop'</span>
+<span id="L352" class="LineNr">352 </span>    <a href='031check_operands.cc.html#L405'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;subop&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L353" class="LineNr">353 </span>    <a href='031check_operands.cc.html#L410'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;r32&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;should be replaced by subop&quot;</span><span class="Delimiter">);</span>
+<span id="L354" class="LineNr">354 </span>  <span class="Delimiter">}</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L356" class="LineNr">356 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L357" class="LineNr">357 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L358" class="LineNr">358 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L273'>hex_byte</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L359" class="LineNr">359 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Comment">/*</span><span class="Comment">direct</span><span class="Comment">*/</span><span class="Constant">3</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L360" class="LineNr">360 </span>    <a href='031check_operands.cc.html#L405'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>    <a href='031check_operands.cc.html#L405'>check_operand_metadata_present</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">);</span>  <span class="Comment">// otherwise why go to SIB?</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Delimiter">}</span>
+<span id="L363" class="LineNr">363 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L364" class="LineNr">364 </span>    <a href='031check_operands.cc.html#L410'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;base&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L365" class="LineNr">365 </span>    <a href='031check_operands.cc.html#L410'>check_operand_metadata_absent</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;index&quot;</span><span class="Delimiter">,</span> op<span class="Delimiter">,</span> <span class="Constant">&quot;direct mode&quot;</span><span class="Delimiter">);</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Delimiter">}</span>
+<span id="L367" class="LineNr">367 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L368" class="LineNr">368 </span><span class="Delimiter">}</span>
+<span id="L369" class="LineNr">369 </span>
+<span id="L370" class="LineNr">370 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L371" class="LineNr">371 </span><span class="Comment">//   exception: modrm instructions can use a displacement on occasion</span>
+<span id="L372" class="LineNr">372 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L372'>compare_bitvector_modrm</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L373" class="LineNr">373 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L295'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L374" class="LineNr">374 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L286'>computed_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L378" class="LineNr">378 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing for modrm &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L379" class="LineNr">379 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L380" class="LineNr">380 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L66'>DISP8</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L382" class="LineNr">382 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L383" class="LineNr">383 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">1</span><span class="Delimiter">)</span>
+<span id="L384" class="LineNr">384 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L385" class="LineNr">385 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L386" class="LineNr">386 </span>    <span class="Delimiter">}</span>
+<span id="L387" class="LineNr">387 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L68'>DISP32</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L388" class="LineNr">388 </span>      <span class="Normal">int32_t</span> mod = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span>      <span class="Normal">int32_t</span> rm32 = <a href='011run.cc.html#L362'>parse_int</a><span class="Delimiter">(</span>metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;rm32&quot;</span><span class="Delimiter">).</span>data<span class="Delimiter">);</span>
+<span id="L390" class="LineNr">390 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>mod == <span class="Constant">0</span> &amp;&amp; rm32 == <span class="Constant">5</span><span class="Delimiter">)</span>
+<span id="L391" class="LineNr">391 </span>        <span class="Delimiter">;</span>  <span class="Comment">// ok: special-case for loading address from disp32</span>
+<span id="L392" class="LineNr">392 </span>      <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>mod != <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L393" class="LineNr">393 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L394" class="LineNr">394 </span>      <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L395" class="LineNr">395 </span>    <span class="Delimiter">}</span>
+<span id="L396" class="LineNr">396 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L397" class="LineNr">397 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L398" class="LineNr">398 </span>    <span class="Normal">else</span>
+<span id="L399" class="LineNr">399 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L400" class="LineNr">400 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L401" class="LineNr">401 </span>  <span class="Delimiter">}</span>
+<span id="L402" class="LineNr">402 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L403" class="LineNr">403 </span><span class="Delimiter">}</span>
+<span id="L404" class="LineNr">404 </span>
+<span id="L405" class="LineNr">405 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L405'>check_operand_metadata_present</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L406" class="LineNr">406 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L407" class="LineNr">407 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L408" class="LineNr">408 </span><span class="Delimiter">}</span>
+<span id="L409" class="LineNr">409 </span>
+<span id="L410" class="LineNr">410 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L410'>check_operand_metadata_absent</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; type<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; msg<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L412" class="LineNr">412 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L278'>maybe_name</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand (&quot;</span> &lt;&lt; msg &lt;&lt; <span class="Constant">&quot;)\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L413" class="LineNr">413 </span><span class="Delimiter">}</span>
+<span id="L414" class="LineNr">414 </span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L417" class="LineNr">417 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L418" class="LineNr">418 </span>== <span class="Constant">0x1</span>
+<span id="L419" class="LineNr">419 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L420" class="LineNr">420 </span>8b/copy <span class="Constant">1</span>/mod/lookup+disp8 <span class="Constant">0</span>/rm32/EAX <span class="Constant">2</span>/r32/EDX <span class="Constant">4</span>/disp8  <span class="Comment"># copy *(EAX+4) to EDX</span>
+<span id="L421" class="LineNr">421 </span>$error: <span class="Constant">0</span>
+<span id="L422" class="LineNr">422 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L423" class="LineNr">423 </span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L425" class="LineNr">425 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>
+<span id="L427" class="LineNr">427 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/mod
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L429" class="LineNr">429 </span>
+<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L431" class="LineNr">431 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L432" class="LineNr">432 </span>== <span class="Constant">0x1</span>
+<span id="L433" class="LineNr">433 </span><span class="PreProc">0</span><span class="Constant">1</span>/add <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/r32
+<span id="L434" class="LineNr">434 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L435" class="LineNr">435 </span>
+<span id="L436" class="LineNr">436 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L437" class="LineNr">437 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L438" class="LineNr">438 </span>== <span class="Constant">0x1</span>
+<span id="L439" class="LineNr">439 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod            <span class="Constant">1</span>/imm32
+<span id="L440" class="LineNr">440 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing rm32 operand</span>
+<span id="L441" class="LineNr">441 </span>
+<span id="L442" class="LineNr">442 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L443" class="LineNr">443 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L444" class="LineNr">444 </span>== <span class="Constant">0x1</span>
+<span id="L445" class="LineNr">445 </span><span class="Constant">81</span>             <span class="Constant">0</span>/mod <span class="Constant">3</span>/rm32/ebx <span class="Constant">1</span>/imm32
+<span id="L446" class="LineNr">446 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing subop operand</span>
+<span id="L447" class="LineNr">447 </span>
+<span id="L448" class="LineNr">448 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L449" class="LineNr">449 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L450" class="LineNr">450 </span>== <span class="Constant">0x1</span>
+<span id="L451" class="LineNr">451 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L452" class="LineNr">452 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
+<span id="L453" class="LineNr">453 </span>
+<span id="L454" class="LineNr">454 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L455" class="LineNr">455 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L456" class="LineNr">456 </span>== <span class="Constant">0x1</span>
+<span id="L457" class="LineNr">457 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">0</span>/base <span class="Constant">1</span>/imm32
+<span id="L458" class="LineNr">458 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 0/base 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing index operand</span>
+<span id="L459" class="LineNr">459 </span>
+<span id="L460" class="LineNr">460 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
+<span id="L461" class="LineNr">461 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L462" class="LineNr">462 </span>== <span class="Constant">0x1</span>
+<span id="L463" class="LineNr">463 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">0</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">2</span>/index <span class="Constant">3</span>/scale <span class="Constant">1</span>/imm32
+<span id="L464" class="LineNr">464 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 2/index 3/scale 1/imm32' (combine rm32 with <a href='037heap.cc.html#L23'>imm32</a> based on subop): missing base operand</span>
+<span id="L465" class="LineNr">465 </span>
+<span id="L466" class="LineNr">466 </span><span class="Delimiter">:(scenario check_extra_displacement)</span>
+<span id="L467" class="LineNr">467 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L468" class="LineNr">468 </span>== <span class="Constant">0x1</span>
+<span id="L469" class="LineNr">469 </span><span class="Constant">89</span>/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">0</span>/rm32/EAX <span class="Constant">1</span>/r32/ECX <span class="Constant">4</span>/disp8
+<span id="L470" class="LineNr">470 </span><span class="traceContains">+error: '89/copy 0/mod/indirect 0/rm32/EAX 1/r32/ECX 4/disp8' (copy r32 to rm32): unexpected disp8 operand</span>
+<span id="L471" class="LineNr">471 </span>
+<span id="L472" class="LineNr">472 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L473" class="LineNr">473 </span>== <span class="Constant">0x1</span>
+<span id="L474" class="LineNr">474 </span><span class="Constant">81</span> <span class="Constant">0</span>/add/subop <span class="Constant">3</span>/mod/indirect <span class="Constant">4</span>/rm32/use-sib <span class="Constant">1</span>/imm32
+<span id="L475" class="LineNr">475 </span>$error: <span class="Constant">0</span>
+<span id="L476" class="LineNr">476 </span>
+<span id="L477" class="LineNr">477 </span><span class="Delimiter">:(scenario extra_modrm)</span>
+<span id="L478" class="LineNr">478 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L479" class="LineNr">479 </span>== <span class="Constant">0x1</span>
+<span id="L480" class="LineNr">480 </span><span class="Constant">59</span>/pop-to-ECX  <span class="Constant">3</span>/mod/direct <span class="Constant">1</span>/rm32/ECX <span class="Constant">4</span>/r32/ESP
+<span id="L481" class="LineNr">481 </span><span class="traceContains">+error: '59/pop-to-ECX 3/mod/direct 1/rm32/ECX 4/r32/ESP' (pop top of stack to ECX): unexpected modrm operand</span>
+<span id="L482" class="LineNr">482 </span>
+<span id="L483" class="LineNr">483 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L484" class="LineNr">484 </span>
+<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(code)</span>
+<span id="L486" class="LineNr">486 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L487" class="LineNr">487 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>data == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L488" class="LineNr">488 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L489" class="LineNr">489 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L490" class="LineNr">490 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L491" class="LineNr">491 </span>  <span class="Delimiter">}</span>
+<span id="L492" class="LineNr">492 </span>  <a href='011run.cc.html#L123'>word</a> op = <a href='031check_operands.cc.html#L36'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L493" class="LineNr">493 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L494" class="LineNr">494 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;unknown 2-byte opcode '0f &quot;</span> &lt;&lt; op<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L495" class="LineNr">495 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L496" class="LineNr">496 </span>  <span class="Delimiter">}</span>
+<span id="L497" class="LineNr">497 </span>  check_operands_0f<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L498" class="LineNr">498 </span><span class="Delimiter">}</span>
+<span id="L499" class="LineNr">499 </span>
+<span id="L500" class="LineNr">500 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L500'>check_operands_f3</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L501" class="LineNr">501 </span>  <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L502" class="LineNr">502 </span><span class="Delimiter">}</span>
+<span id="L503" class="LineNr">503 </span>
+<span id="L504" class="LineNr">504 </span><span class="Delimiter">:(scenario check_missing_disp32_operand)</span>
+<span id="L505" class="LineNr">505 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L506" class="LineNr">506 </span>== <span class="Constant">0x1</span>
+<span id="L507" class="LineNr">507 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L508" class="LineNr">508 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L509" class="LineNr">509 </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="L510" class="LineNr">510 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L511" class="LineNr">511 </span><span class="traceContains">+error: '0f 84' (jump disp32 bytes away if equal, if ZF is set): missing disp32 operand</span>
+<span id="L512" class="LineNr">512 </span>
+<span id="L513" class="LineNr">513 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L514" class="LineNr">514 </span>map&lt;<span class="Comment">/*</span><span class="Comment">op</span><span class="Comment">*/</span>string<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">bitvector</span><span class="Comment">*/</span><span class="Normal">uint8_t</span>&gt; <span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">;</span>
+<span id="L515" class="LineNr">515 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L516" class="LineNr">516 </span><span class="SalientComment">//// Class D: just op and disp32</span>
+<span id="L517" class="LineNr">517 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L518" class="LineNr">518 </span><span class="Comment">//  0     0     1      |0       0     0     0</span>
+<span id="L519" class="LineNr">519 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L520" class="LineNr">520 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L521" class="LineNr">521 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L522" class="LineNr">522 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L523" class="LineNr">523 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L524" class="LineNr">524 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x10</span><span class="Delimiter">);</span>
+<span id="L525" class="LineNr">525 </span>
+<span id="L526" class="LineNr">526 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L527" class="LineNr">527 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L528" class="LineNr">528 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L529" class="LineNr">529 </span><a href='001help.cc.html#L262'>put_new</a><span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x01</span><span class="Delimiter">);</span>
+<span id="L530" class="LineNr">530 </span>
+<span id="L531" class="LineNr">531 </span><span class="Delimiter">:(code)</span>
+<span id="L532" class="LineNr">532 </span><span class="Normal">void</span> check_operands_0f<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L533" class="LineNr">533 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><span class="Special"><a href='031check_operands.cc.html#L514'>Permitted_operands_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L534" class="LineNr">534 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>HAS<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">))</span>
+<span id="L535" class="LineNr">535 </span>    <a href='031check_operands.cc.html#L346'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L536" class="LineNr">536 </span>  <a href='031check_operands.cc.html#L539'>compare_bitvector_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> CLEAR<span class="Delimiter">(</span>expected_bitvector<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L64'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L537" class="LineNr">537 </span><span class="Delimiter">}</span>
+<span id="L538" class="LineNr">538 </span>
+<span id="L539" class="LineNr">539 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L539'>compare_bitvector_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">,</span> <span class="Normal">uint8_t</span> expected<span class="Delimiter">,</span> <span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L540" class="LineNr">540 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='030---operands.cc.html#L379'>all_hex_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L295'>has_operands</a><span class="Delimiter">(</span>inst<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// deliberately programming in raw hex; we'll raise a warning elsewhere</span>
+<span id="L541" class="LineNr">541 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L286'>computed_expected_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L542" class="LineNr">542 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L543" class="LineNr">543 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>bitvector == expected<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this instruction</span>
+<span id="L544" class="LineNr">544 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='031check_operands.cc.html#L71'>NUM_OPERAND_TYPES</a><span class="Delimiter">;</span>  ++i<span class="Delimiter">,</span> bitvector &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">,</span> expected &gt;&gt;= <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L545" class="LineNr">545 </span><span class="CommentedCode">//?     cerr &lt;&lt; &quot;comparing &quot; &lt;&lt; HEXBYTE &lt;&lt; NUM(bitvector) &lt;&lt; &quot; with &quot; &lt;&lt; NUM(expected) &lt;&lt; '\n';</span>
+<span id="L546" class="LineNr">546 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> == <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// all good with this operand</span>
+<span id="L547" class="LineNr">547 </span>    <span class="Normal">const</span> string&amp; optype = <span class="Special"><a href='031check_operands.cc.html#L74'>Operand_type_name</a></span><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L548" class="LineNr">548 </span>    <span class="Normal">if</span> <span class="Delimiter">((</span>bitvector &amp; <span class="Constant">0x1</span><span class="Delimiter">)</span> &gt; <span class="Delimiter">(</span>expected &amp; <span class="Constant">0x1</span><span class="Delimiter">))</span>
+<span id="L549" class="LineNr">549 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L557'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L550" class="LineNr">550 </span>    <span class="Normal">else</span>
+<span id="L551" class="LineNr">551 </span>      <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; <a href='031check_operands.cc.html#L557'>maybe_name_0f</a><span class="Delimiter">(</span>op<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;: missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L552" class="LineNr">552 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L553" class="LineNr">553 </span>  <span class="Delimiter">}</span>
+<span id="L554" class="LineNr">554 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L555" class="LineNr">555 </span><span class="Delimiter">}</span>
+<span id="L556" class="LineNr">556 </span>
+<span id="L557" class="LineNr">557 </span>string <a href='031check_operands.cc.html#L557'>maybe_name_0f</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; op<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L558" class="LineNr">558 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!is_hex_byte<span class="Delimiter">(</span>op<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L559" class="LineNr">559 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L560" class="LineNr">560 </span>  <span class="Comment">// strip stuff in parens from the name</span>
+<span id="L561" class="LineNr">561 </span>  <span class="Normal">const</span> string&amp; s = get<span class="Delimiter">(</span><span class="Special"><a href='010---vm.cc.html#L379'>Name_0f</a></span><span class="Delimiter">,</span> op<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L562" class="LineNr">562 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+s<span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> s<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">&quot; (&quot;</span><span class="Delimiter">))</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
 <span id="L563" class="LineNr">563 </span><span class="Delimiter">}</span>
 <span id="L564" class="LineNr">564 </span>
-<span id="L565" class="LineNr">565 </span><span class="Comment">#undef HAS</span>
-<span id="L566" class="LineNr">566 </span><span class="Comment">#undef SET</span>
-<span id="L567" class="LineNr">567 </span><span class="Comment">#undef CLEAR</span>
-<span id="L568" class="LineNr">568 </span>
-<span id="L569" class="LineNr">569 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L570" class="LineNr">570 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L565" class="LineNr">565 </span>string <a href='031check_operands.cc.html#L565'>tolower</a><span class="Delimiter">(</span><span class="Normal">const</span> <span class="Normal">char</span>* s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L566" class="LineNr">566 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L567" class="LineNr">567 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Comment">/*</span><span class="Comment">nada</span><span class="Comment">*/</span><span class="Delimiter">;</span>  *s<span class="Delimiter">;</span>  ++s<span class="Delimiter">)</span>
+<span id="L568" class="LineNr">568 </span>    out &lt;&lt; <span class="Normal">static_cast</span>&lt;<span class="Normal">char</span>&gt;<span class="Delimiter">(</span><a href='031check_operands.cc.html#L565'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L569" class="LineNr">569 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L570" class="LineNr">570 </span><span class="Delimiter">}</span>
+<span id="L571" class="LineNr">571 </span>
+<span id="L572" class="LineNr">572 </span><span class="Comment">#undef HAS</span>
+<span id="L573" class="LineNr">573 </span><span class="Comment">#undef SET</span>
+<span id="L574" class="LineNr">574 </span><span class="Comment">#undef CLEAR</span>
+<span id="L575" class="LineNr">575 </span>
+<span id="L576" class="LineNr">576 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L577" class="LineNr">577 </span><span class="Comment">#include&lt;cctype&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/032check_operand_bounds.cc.html b/html/subx/032check_operand_bounds.cc.html
index b22414d2..df4daa11 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
 .cSpecial { color: #008000; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color:#800080; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.PreProc { color: #c000c0; }
+.SalientComment { color: #0000af; }
 -->
 </style>
 
@@ -96,7 +91,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- check operand bounds&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L31" class="LineNr">31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr">32 </span>    <span class="Normal">const</span> line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L298'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L33" class="LineNr">33 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <a href='031check_operands.cc.html#L299'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
 <span id="L34" class="LineNr">34 </span>      check_operand_bounds<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">));</span>
 <span id="L35" class="LineNr">35 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// stop at the first mal-formed instruction</span>
 <span id="L36" class="LineNr">36 </span>  <span class="Delimiter">}</span>
diff --git a/html/subx/034compute_segment_address.cc.html b/html/subx/034compute_segment_address.cc.html
index 91ff884d..dbcfc21b 100644
--- a/html/subx/034compute_segment_address.cc.html
+++ b/html/subx/034compute_segment_address.cc.html
@@ -7,26 +7,21 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.PreProc { color:#800080; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -75,7 +70,7 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr"> 11 </span><span class="traceContains">+load: 0x09000056 -&gt; 0b</span>
 <span id="L12" class="LineNr"> 12 </span><span class="traceContains">+load: 0x09000057 -&gt; 0c</span>
 <span id="L13" class="LineNr"> 13 </span><span class="traceContains">+load: 0x09000058 -&gt; 0d</span>
-<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: add imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: add <a href='037heap.cc.html#L23'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L23'>reg</a> <a href='010---vm.cc.html#L13'>EAX</a></span>
 <span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
 <span id="L16" class="LineNr"> 16 </span>
 <span id="L17" class="LineNr"> 17 </span><span class="Comment">//: Update the parser to handle non-numeric segment name.</span>
diff --git a/html/subx/035labels.cc.html b/html/subx/035labels.cc.html
index 3185ffff..928e4a65 100644
--- a/html/subx/035labels.cc.html
+++ b/html/subx/035labels.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.PreProc { color:#800080; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.PreProc { color: #c000c0; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
@@ -149,9 +144,9 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt; byte_index<span class="Delimiter">;</span>  <span class="Comment">// values are unsigned, but we're going to do subtractions on them so they need to fit in 31 bits</span>
 <span id="L85" class="LineNr"> 85 </span>  <a href='035labels.cc.html#L92'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
 <span id="L86" class="LineNr"> 86 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  <a href='035labels.cc.html#L153'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='035labels.cc.html#L157'>drop_labels</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">);</span>
 <span id="L88" class="LineNr"> 88 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L89" class="LineNr"> 89 </span>  <a href='035labels.cc.html#L165'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span>  <a href='035labels.cc.html#L169'>replace_labels_with_displacements</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> byte_index<span class="Delimiter">);</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">}</span>
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Normal">void</span> <a href='035labels.cc.html#L92'>compute_byte_indices_for_labels</a><span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
@@ -180,7 +175,7 @@ if ('onhashchange' in window) {
 <span id="L115" class="LineNr">115 </span>        ++current_byte<span class="Delimiter">;</span>
 <span id="L116" class="LineNr">116 </span>      <span class="Delimiter">}</span>
 <span id="L117" class="LineNr">117 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L118" class="LineNr">118 </span>        string label = <a href='035labels.cc.html#L209'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L118" class="LineNr">118 </span>        string label = <a href='035labels.cc.html#L213'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
 <span id="L119" class="LineNr">119 </span>        <span class="Comment">// ensure labels look sufficiently different from raw hex</span>
 <span id="L120" class="LineNr">120 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>label<span class="Delimiter">);</span>
 <span id="L121" class="LineNr">121 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -188,156 +183,168 @@ if ('onhashchange' in window) {
 <span id="L123" class="LineNr">123 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label definition (':') not allowed in operand\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L124" class="LineNr">124 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
 <span id="L125" class="LineNr">125 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': labels can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L126" class="LineNr">126 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
-<span id="L127" class="LineNr">127 </span>          <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
-<span id="L129" class="LineNr">129 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' is at address &quot;</span> &lt;&lt; <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span>start<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L130" class="LineNr">130 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
-<span id="L131" class="LineNr">131 </span>      <span class="Delimiter">}</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Delimiter">}</span>
-<span id="L133" class="LineNr">133 </span>  <span class="Delimiter">}</span>
-<span id="L134" class="LineNr">134 </span><span class="Delimiter">}</span>
-<span id="L135" class="LineNr">135 </span>
-<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L137" class="LineNr">137 </span><span class="Normal">bool</span> <span class="Special"><a href='035labels.cc.html#L137'>Dump_map</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
-<span id="L138" class="LineNr">138 </span>ofstream <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">;</span>
-<span id="L139" class="LineNr">139 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
-<span id="L140" class="LineNr">140 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--map&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L141" class="LineNr">141 </span>  <span class="Special"><a href='035labels.cc.html#L137'>Dump_map</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L142" class="LineNr">142 </span>  <span class="Comment">// End --map Settings</span>
-<span id="L143" class="LineNr">143 </span><span class="Delimiter">}</span>
-<span id="L144" class="LineNr">144 </span><span class="Comment">//: wait to open &quot;map&quot; for writing until we're sure we aren't trying to read it</span>
-<span id="L145" class="LineNr">145 </span><span class="Delimiter">:(after &quot;Begin subx translate&quot;)</span>
-<span id="L146" class="LineNr">146 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L137'>Dump_map</a></span><span class="Delimiter">)</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span><span class="Delimiter">:(before &quot;End subx translate&quot;)</span>
-<span id="L149" class="LineNr">149 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L137'>Dump_map</a></span><span class="Delimiter">)</span>
-<span id="L150" class="LineNr">150 </span>  <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">.</span>close<span class="Delimiter">();</span>
-<span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(code)</span>
-<span id="L153" class="LineNr">153 </span><span class="Normal">void</span> <a href='035labels.cc.html#L153'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L155" class="LineNr">155 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L156" class="LineNr">156 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L161'>is_label</a><span class="Delimiter">);</span>
-<span id="L157" class="LineNr">157 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
-<span id="L158" class="LineNr">158 </span>  <span class="Delimiter">}</span>
-<span id="L159" class="LineNr">159 </span><span class="Delimiter">}</span>
-<span id="L160" class="LineNr">160 </span>
-<span id="L161" class="LineNr">161 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L161'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L162" class="LineNr">162 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
+<span id="L127" class="LineNr">127 </span>          <span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; <span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span>start + current_byte<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; label &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L129" class="LineNr">129 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L131" class="LineNr">131 </span>        <span class="Delimiter">}</span>
+<span id="L132" class="LineNr">132 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> label<span class="Delimiter">,</span> current_byte<span class="Delimiter">);</span>
+<span id="L133" class="LineNr">133 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;label '&quot;</span> &lt;&lt; label &lt;&lt; <span class="Constant">&quot;' is at address &quot;</span> &lt;&lt; <span class="Delimiter">(</span>current_byte+code<span class="Delimiter">.</span>start<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L134" class="LineNr">134 </span>        <span class="Comment">// no modifying current_byte; label definitions won't be in the final binary</span>
+<span id="L135" class="LineNr">135 </span>      <span class="Delimiter">}</span>
+<span id="L136" class="LineNr">136 </span>    <span class="Delimiter">}</span>
+<span id="L137" class="LineNr">137 </span>  <span class="Delimiter">}</span>
+<span id="L138" class="LineNr">138 </span><span class="Delimiter">}</span>
+<span id="L139" class="LineNr">139 </span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L141" class="LineNr">141 </span><span class="Normal">bool</span> <span class="Special"><a href='035labels.cc.html#L141'>Dump_map</a></span> =<span class="Constant"> false</span><span class="Delimiter">;</span>  <span class="Comment">// currently used only by 'subx translate'</span>
+<span id="L142" class="LineNr">142 </span>ofstream <span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span><span class="Delimiter">;</span>
+<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Commandline Options&quot;)</span>
+<span id="L144" class="LineNr">144 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L98'>is_equal</a><span class="Delimiter">(</span>*arg<span class="Delimiter">,</span> <span class="Constant">&quot;--map&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L145" class="LineNr">145 </span>  <span class="Special"><a href='035labels.cc.html#L141'>Dump_map</a></span> =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Comment">// End --map Settings</span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">}</span>
+<span id="L148" class="LineNr">148 </span><span class="Comment">//: wait to open &quot;map&quot; for writing until we're sure we aren't trying to read it</span>
+<span id="L149" class="LineNr">149 </span><span class="Delimiter">:(after &quot;Begin subx translate&quot;)</span>
+<span id="L150" class="LineNr">150 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L141'>Dump_map</a></span><span class="Delimiter">)</span>
+<span id="L151" class="LineNr">151 </span>  <span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span><span class="Delimiter">.</span>open<span class="Delimiter">(</span><span class="Constant">&quot;map&quot;</span><span class="Delimiter">);</span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End subx translate&quot;)</span>
+<span id="L153" class="LineNr">153 </span><span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L141'>Dump_map</a></span><span class="Delimiter">)</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span><span class="Delimiter">.</span>close<span class="Delimiter">();</span>
+<span id="L155" class="LineNr">155 </span>
+<span id="L156" class="LineNr">156 </span><span class="Delimiter">:(code)</span>
+<span id="L157" class="LineNr">157 </span><span class="Normal">void</span> <a href='035labels.cc.html#L157'>drop_labels</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L158" class="LineNr">158 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L160" class="LineNr">160 </span>    vector&lt;word&gt;::iterator new_end = remove_if<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">(),</span> <a href='035labels.cc.html#L165'>is_label</a><span class="Delimiter">);</span>
+<span id="L161" class="LineNr">161 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span>new_end<span class="Delimiter">,</span> inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</span>
 <span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
 <span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Normal">void</span> <a href='035labels.cc.html#L165'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L167" class="LineNr">167 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L168" class="LineNr">168 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L169" class="LineNr">169 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L170" class="LineNr">170 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L171" class="LineNr">171 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L172" class="LineNr">172 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L173" class="LineNr">173 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L174" class="LineNr">174 </span>        <span class="Normal">int32_t</span> displacement = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L176" class="LineNr">176 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xff</span> || displacement &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
-<span id="L177" class="LineNr">177 </span>            <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 8 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L178" class="LineNr">178 </span>          <span class="Normal">else</span>
-<span id="L179" class="LineNr">179 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L180" class="LineNr">180 </span>        <span class="Delimiter">}</span>
-<span id="L181" class="LineNr">181 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L182" class="LineNr">182 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xffff</span> || displacement &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
-<span id="L183" class="LineNr">183 </span>            <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 16 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L184" class="LineNr">184 </span>          <span class="Normal">else</span>
-<span id="L185" class="LineNr">185 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L186" class="LineNr">186 </span>        <span class="Delimiter">}</span>
-<span id="L187" class="LineNr">187 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L188" class="LineNr">188 </span>          emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L189" class="LineNr">189 </span>        <span class="Delimiter">}</span>
-<span id="L190" class="LineNr">190 </span>      <span class="Delimiter">}</span>
-<span id="L191" class="LineNr">191 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L192" class="LineNr">192 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L193" class="LineNr">193 </span>      <span class="Delimiter">}</span>
-<span id="L194" class="LineNr">194 </span>    <span class="Delimiter">}</span>
-<span id="L195" class="LineNr">195 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L196" class="LineNr">196 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L197" class="LineNr">197 </span>  <span class="Delimiter">}</span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">}</span>
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span>string <a href='035labels.cc.html#L200'>data_to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L201" class="LineNr">201 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L202" class="LineNr">202 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L203" class="LineNr">203 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L204" class="LineNr">204 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Delimiter">}</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">}</span>
-<span id="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span>string <a href='035labels.cc.html#L209'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L165" class="LineNr">165 </span><span class="Normal">bool</span> <a href='035labels.cc.html#L165'>is_label</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L166" class="LineNr">166 </span>  <span class="Identifier">return</span> *w<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> == <span class="Constant">':'</span><span class="Delimiter">;</span>
+<span id="L167" class="LineNr">167 </span><span class="Delimiter">}</span>
+<span id="L168" class="LineNr">168 </span>
+<span id="L169" class="LineNr">169 </span><span class="Normal">void</span> <a href='035labels.cc.html#L169'>replace_labels_with_displacements</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">int32_t</span>&gt;&amp; byte_index<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L170" class="LineNr">170 </span>  <span class="Normal">int32_t</span> byte_index_next_instruction_starts_at = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L171" class="LineNr">171 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L172" class="LineNr">172 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span>    byte_index_next_instruction_starts_at += <a href='034compute_segment_address.cc.html#L112'>num_bytes</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L174" class="LineNr">174 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L175" class="LineNr">175 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L176" class="LineNr">176 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L177" class="LineNr">177 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L178" class="LineNr">178 </span>        <span class="Normal">int32_t</span> displacement = <span class="Normal">static_cast</span>&lt;<span class="Normal">int32_t</span>&gt;<span class="Delimiter">(</span>get<span class="Delimiter">(</span>byte_index<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> - byte_index_next_instruction_starts_at<span class="Delimiter">;</span>
+<span id="L179" class="LineNr">179 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp8&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L180" class="LineNr">180 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xff</span> || displacement &lt; -<span class="Constant">0x7f</span><span class="Delimiter">)</span>
+<span id="L181" class="LineNr">181 </span>            <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 8 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L182" class="LineNr">182 </span>          <span class="Normal">else</span>
+<span id="L183" class="LineNr">183 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L184" class="LineNr">184 </span>        <span class="Delimiter">}</span>
+<span id="L185" class="LineNr">185 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp16&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L186" class="LineNr">186 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>displacement &gt; <span class="Constant">0xffff</span> || displacement &lt; -<span class="Constant">0x7fff</span><span class="Delimiter">)</span>
+<span id="L187" class="LineNr">187 </span>            <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': label too far away for displacement &quot;</span> &lt;&lt; std::hex &lt;&lt; displacement &lt;&lt; <span class="Constant">&quot; to fit in 16 bits\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L188" class="LineNr">188 </span>          <span class="Normal">else</span>
+<span id="L189" class="LineNr">189 </span>            emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L190" class="LineNr">190 </span>        <span class="Delimiter">}</span>
+<span id="L191" class="LineNr">191 </span>        <span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L192" class="LineNr">192 </span>          emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> displacement<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L193" class="LineNr">193 </span>        <span class="Delimiter">}</span>
+<span id="L194" class="LineNr">194 </span>      <span class="Delimiter">}</span>
+<span id="L195" class="LineNr">195 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L196" class="LineNr">196 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L197" class="LineNr">197 </span>      <span class="Delimiter">}</span>
+<span id="L198" class="LineNr">198 </span>    <span class="Delimiter">}</span>
+<span id="L199" class="LineNr">199 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L200" class="LineNr">200 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Delimiter">}</span>
+<span id="L202" class="LineNr">202 </span><span class="Delimiter">}</span>
+<span id="L203" class="LineNr">203 </span>
+<span id="L204" class="LineNr">204 </span>string <a href='035labels.cc.html#L204'>data_to_string</a><span class="Delimiter">(</span><span class="Normal">const</span> line&amp; inst<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L205" class="LineNr">205 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L207" class="LineNr">207 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L208" class="LineNr">208 </span>    out &lt;&lt; inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Delimiter">}</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
 <span id="L211" class="LineNr">211 </span><span class="Delimiter">}</span>
 <span id="L212" class="LineNr">212 </span>
-<span id="L213" class="LineNr">213 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
-<span id="L214" class="LineNr">214 </span><span class="Comment">//: instructions.</span>
-<span id="L215" class="LineNr">215 </span><span class="Comment">//: They should also be the only word on a line.</span>
-<span id="L216" class="LineNr">216 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
-<span id="L217" class="LineNr">217 </span><span class="Comment">//: as long as they're on separate lines.</span>
-<span id="L218" class="LineNr">218 </span>
-<span id="L219" class="LineNr">219 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
-<span id="L220" class="LineNr">220 </span>== <span class="Constant">0x1</span>
-<span id="L221" class="LineNr">221 </span><span class="Comment"># address 1</span>
-<span id="L222" class="LineNr">222 </span><span class="Normal">loop</span>:
-<span id="L223" class="LineNr">223 </span> $loop2:
-<span id="L224" class="LineNr">224 </span><span class="Comment"># address 1 (labels take up no space)</span>
-<span id="L225" class="LineNr">225 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L226" class="LineNr">226 </span><span class="Comment"># address 6</span>
-<span id="L227" class="LineNr">227 </span>    eb  $loop2/disp8
-<span id="L228" class="LineNr">228 </span><span class="Comment"># address 8</span>
-<span id="L229" class="LineNr">229 </span>    eb  $loop3/disp8
-<span id="L230" class="LineNr">230 </span><span class="Comment"># address 0xa</span>
-<span id="L231" class="LineNr">231 </span> $loop3:
-<span id="L232" class="LineNr">232 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
-<span id="L233" class="LineNr">233 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span>
-<span id="L234" class="LineNr">234 </span><span class="traceContains">+transform: label '$loop3' is at address a</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment"># first jump is to -7</span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb f9'</span>
-<span id="L237" class="LineNr">237 </span><span class="Comment"># second jump is to 0 (fall through)</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb 00'</span>
-<span id="L239" class="LineNr">239 </span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(scenario label_too_short)</span>
-<span id="L241" class="LineNr">241 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L242" class="LineNr">242 </span>== <span class="Constant">0x1</span>
-<span id="L243" class="LineNr">243 </span><span class="Normal">xz</span>:
-<span id="L244" class="LineNr">244 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L245" class="LineNr">245 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different name</span>
-<span id="L246" class="LineNr">246 </span>
-<span id="L247" class="LineNr">247 </span><span class="Delimiter">:(scenario label_hex)</span>
-<span id="L248" class="LineNr">248 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L249" class="LineNr">249 </span>== <span class="Constant">0x1</span>
-<span id="L250" class="LineNr">250 </span><span class="Constant">0xab</span>:
-<span id="L251" class="LineNr">251 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L252" class="LineNr">252 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different name</span>
-<span id="L253" class="LineNr">253 </span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
-<span id="L255" class="LineNr">255 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L256" class="LineNr">256 </span>== <span class="Constant">0x1</span>
-<span id="L257" class="LineNr">257 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
-<span id="L258" class="LineNr">258 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
-<span id="L259" class="LineNr">259 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different name</span>
-<span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
-<span id="L262" class="LineNr">262 </span><span class="Comment">//: ignore them.</span>
-<span id="L263" class="LineNr">263 </span>
-<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
-<span id="L265" class="LineNr">265 </span>== <a href='031check_operands.cc.html#L11'>code</a>  <span class="Comment"># 0x09000074</span>
-<span id="L266" class="LineNr">266 </span>  <span class="PreProc">0</span><span class="Constant">5</span>/add  <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># 5 bytes</span>
-<span id="L267" class="LineNr">267 </span><span class="Normal">foo</span>:                      <span class="Comment"># 0 bytes</span>
-<span id="L268" class="LineNr">268 </span>== data  <span class="Comment"># 0x0a000079</span>
-<span id="L269" class="LineNr">269 </span><span class="Normal">bar</span>:
-<span id="L270" class="LineNr">270 </span>  <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L271" class="LineNr">271 </span><span class="traceContains">+transform: segment 1 begins at address 0x0a000079</span>
+<span id="L213" class="LineNr">213 </span>string <a href='035labels.cc.html#L213'>drop_last</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Identifier">return</span> string<span class="Delimiter">(</span>s<span class="Delimiter">.</span>begin<span class="Delimiter">(),</span> --s<span class="Delimiter">.</span>end<span class="Delimiter">());</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">}</span>
+<span id="L216" class="LineNr">216 </span>
+<span id="L217" class="LineNr">217 </span><span class="Comment">//: Label definitions must be the first word on a line. No jumping inside</span>
+<span id="L218" class="LineNr">218 </span><span class="Comment">//: instructions.</span>
+<span id="L219" class="LineNr">219 </span><span class="Comment">//: They should also be the only word on a line.</span>
+<span id="L220" class="LineNr">220 </span><span class="Comment">//: However, you can absolutely have multiple labels map to the same address,</span>
+<span id="L221" class="LineNr">221 </span><span class="Comment">//: as long as they're on separate lines.</span>
+<span id="L222" class="LineNr">222 </span>
+<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(scenario multiple_labels_at)</span>
+<span id="L224" class="LineNr">224 </span>== <span class="Constant">0x1</span>
+<span id="L225" class="LineNr">225 </span><span class="Comment"># address 1</span>
+<span id="L226" class="LineNr">226 </span><span class="Normal">loop</span>:
+<span id="L227" class="LineNr">227 </span> $loop2:
+<span id="L228" class="LineNr">228 </span><span class="Comment"># address 1 (labels take up no space)</span>
+<span id="L229" class="LineNr">229 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L230" class="LineNr">230 </span><span class="Comment"># address 6</span>
+<span id="L231" class="LineNr">231 </span>    eb  $loop2/disp8
+<span id="L232" class="LineNr">232 </span><span class="Comment"># address 8</span>
+<span id="L233" class="LineNr">233 </span>    eb  $loop3/disp8
+<span id="L234" class="LineNr">234 </span><span class="Comment"># address 0xa</span>
+<span id="L235" class="LineNr">235 </span> $loop3:
+<span id="L236" class="LineNr">236 </span><span class="traceContains">+transform: label 'loop' is at address 1</span>
+<span id="L237" class="LineNr">237 </span><span class="traceContains">+transform: label '$loop2' is at address 1</span>
+<span id="L238" class="LineNr">238 </span><span class="traceContains">+transform: label '$loop3' is at address a</span>
+<span id="L239" class="LineNr">239 </span><span class="Comment"># first jump is to -7</span>
+<span id="L240" class="LineNr">240 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb f9'</span>
+<span id="L241" class="LineNr">241 </span><span class="Comment"># second jump is to 0 (fall through)</span>
+<span id="L242" class="LineNr">242 </span><span class="traceContains">+transform: instruction after <a href='011run.cc.html#L231'>transform</a>: 'eb 00'</span>
+<span id="L243" class="LineNr">243 </span>
+<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(scenario duplicate_label)</span>
+<span id="L245" class="LineNr">245 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L246" class="LineNr">246 </span>== <span class="Constant">0x1</span>
+<span id="L247" class="LineNr">247 </span><span class="Normal">loop</span>:
+<span id="L248" class="LineNr">248 </span><span class="Normal">loop</span>:
+<span id="L249" class="LineNr">249 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L250" class="LineNr">250 </span><span class="traceContains">+error: duplicate label 'loop'</span>
+<span id="L251" class="LineNr">251 </span>
+<span id="L252" class="LineNr">252 </span><span class="Delimiter">:(scenario label_too_short)</span>
+<span id="L253" class="LineNr">253 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L254" class="LineNr">254 </span>== <span class="Constant">0x1</span>
+<span id="L255" class="LineNr">255 </span><span class="Normal">xz</span>:
+<span id="L256" class="LineNr">256 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L257" class="LineNr">257 </span><span class="traceContains">+error: 'xz' is two characters long which can look like raw hex bytes at a glance; use a different name</span>
+<span id="L258" class="LineNr">258 </span>
+<span id="L259" class="LineNr">259 </span><span class="Delimiter">:(scenario label_hex)</span>
+<span id="L260" class="LineNr">260 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L261" class="LineNr">261 </span>== <span class="Constant">0x1</span>
+<span id="L262" class="LineNr">262 </span><span class="Constant">0xab</span>:
+<span id="L263" class="LineNr">263 </span>  <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L264" class="LineNr">264 </span><span class="traceContains">+error: '0xab' looks like a hex number; use a different name</span>
+<span id="L265" class="LineNr">265 </span>
+<span id="L266" class="LineNr">266 </span><span class="Delimiter">:(scenario label_negative_hex)</span>
+<span id="L267" class="LineNr">267 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L268" class="LineNr">268 </span>== <span class="Constant">0x1</span>
+<span id="L269" class="LineNr">269 </span> -a:  <span class="Comment"># indent to avoid looking like a trace_should_not_contain command for this scenario</span>
+<span id="L270" class="LineNr">270 </span>    <span class="PreProc">0</span><span class="Constant">5</span>  <span class="Constant">0x0d0c0b0a</span>/imm32
+<span id="L271" class="LineNr">271 </span><span class="traceContains">+error: '-a' starts with '-', which can be confused with a negative number; use a different name</span>
 <span id="L272" class="LineNr">272 </span>
-<span id="L273" class="LineNr">273 </span><span class="Delimiter">:(before &quot;End size_of(word w) Special-cases&quot;)</span>
-<span id="L274" class="LineNr">274 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L161'>is_label</a><span class="Delimiter">(</span>w<span class="Delimiter">))</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L273" class="LineNr">273 </span><span class="Comment">//: now that we have labels, we need to adjust segment size computation to</span>
+<span id="L274" class="LineNr">274 </span><span class="Comment">//: ignore them.</span>
+<span id="L275" class="LineNr">275 </span>
+<span id="L276" class="LineNr">276 </span><span class="Delimiter">:(scenario segment_size_ignores_labels)</span>
+<span id="L277" class="LineNr">277 </span>== <a href='031check_operands.cc.html#L11'>code</a>  <span class="Comment"># 0x09000074</span>
+<span id="L278" class="LineNr">278 </span>  <span class="PreProc">0</span><span class="Constant">5</span>/add  <span class="Constant">0x0d0c0b0a</span>/imm32  <span class="Comment"># 5 bytes</span>
+<span id="L279" class="LineNr">279 </span><span class="Normal">foo</span>:                      <span class="Comment"># 0 bytes</span>
+<span id="L280" class="LineNr">280 </span>== data  <span class="Comment"># 0x0a000079</span>
+<span id="L281" class="LineNr">281 </span><span class="Normal">bar</span>:
+<span id="L282" class="LineNr">282 </span>  <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L283" class="LineNr">283 </span><span class="traceContains">+transform: segment 1 begins at address 0x0a000079</span>
+<span id="L284" class="LineNr">284 </span>
+<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End size_of(word w) Special-cases&quot;)</span>
+<span id="L286" class="LineNr">286 </span><span class="Normal">else</span> <span class="Normal">if</span> <span class="Delimiter">(</span><a href='035labels.cc.html#L165'>is_label</a><span class="Delimiter">(</span>w<span class="Delimiter">))</span>
+<span id="L287" class="LineNr">287 </span>  <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/036global_variables.cc.html b/html/subx/036global_variables.cc.html
index c26d5b53..919e77a9 100644
--- a/html/subx/036global_variables.cc.html
+++ b/html/subx/036global_variables.cc.html
@@ -7,29 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
-.CommentedCode { color: #6c6c6c; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.SalientComment { color: #00ffff; }
-.PreProc { color:#800080; }
+.traceContains { color: #005f00; }
+.CommentedCode { color: #8a8a8a; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.SalientComment { color: #0000af; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
@@ -86,202 +81,217 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(code)</span>
 <span id="L20" class="LineNr"> 20 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L20'>rewrite_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;-- rewrite global variables&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L22" class="LineNr"> 22 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
-<span id="L23" class="LineNr"> 23 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L24" class="LineNr"> 24 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L25" class="LineNr"> 25 </span>  <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
-<span id="L26" class="LineNr"> 26 </span>  <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
-<span id="L27" class="LineNr"> 27 </span><span class="Delimiter">}</span>
-<span id="L28" class="LineNr"> 28 </span>
-<span id="L29" class="LineNr"> 29 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L31" class="LineNr"> 31 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
-<span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
-<span id="L33" class="LineNr"> 33 </span>
-<span id="L34" class="LineNr"> 34 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L35" class="LineNr"> 35 </span>  <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
-<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L37" class="LineNr"> 37 </span>    <span class="Normal">const</span> line&amp; inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L38" class="LineNr"> 38 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L39" class="LineNr"> 39 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L40" class="LineNr"> 40 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L41" class="LineNr"> 41 </span>        current_address += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L42" class="LineNr"> 42 </span>      <span class="Delimiter">}</span>
-<span id="L43" class="LineNr"> 43 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L44" class="LineNr"> 44 </span>        string variable = <a href='035labels.cc.html#L209'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
-<span id="L45" class="LineNr"> 45 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
-<span id="L46" class="LineNr"> 46 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
-<span id="L47" class="LineNr"> 47 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L48" class="LineNr"> 48 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L49" class="LineNr"> 49 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': global variable names can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L50" class="LineNr"> 50 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
-<span id="L51" class="LineNr"> 51 </span>          <span class="Special"><a href='035labels.cc.html#L138'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; variable &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L52" class="LineNr"> 52 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;global variable '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;' is at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L54" class="LineNr"> 54 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
-<span id="L55" class="LineNr"> 55 </span>      <span class="Delimiter">}</span>
-<span id="L56" class="LineNr"> 56 </span>    <span class="Delimiter">}</span>
-<span id="L57" class="LineNr"> 57 </span>  <span class="Delimiter">}</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Delimiter">}</span>
-<span id="L59" class="LineNr"> 59 </span>
-<span id="L60" class="LineNr"> 60 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L60'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='035labels.cc.html#L153'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Comment">// Begin rewrite_global_variables</span>
+<span id="L23" class="LineNr"> 23 </span>  map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt; address<span class="Delimiter">;</span>
+<span id="L24" class="LineNr"> 24 </span>  compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L26" class="LineNr"> 26 </span>  <a href='036global_variables.cc.html#L65'>drop_global_variables</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L27" class="LineNr"> 27 </span>  <a href='036global_variables.cc.html#L70'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>p<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L28" class="LineNr"> 28 </span><span class="Delimiter">}</span>
+<span id="L29" class="LineNr"> 29 </span>
+<span id="L30" class="LineNr"> 30 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> program&amp; p<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L31" class="LineNr"> 31 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L32" class="LineNr"> 32 </span>    compute_addresses_for_global_variables<span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span><span class="Delimiter">}</span>
+<span id="L34" class="LineNr"> 34 </span>
+<span id="L35" class="LineNr"> 35 </span><span class="Normal">void</span> compute_addresses_for_global_variables<span class="Delimiter">(</span><span class="Normal">const</span> segment&amp; s<span class="Delimiter">,</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L36" class="LineNr"> 36 </span>  <span class="Normal">int</span> current_address = s<span class="Delimiter">.</span>start<span class="Delimiter">;</span>
+<span id="L37" class="LineNr"> 37 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="Normal">const</span> line&amp; inst = s<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L40" class="LineNr"> 40 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L41" class="LineNr"> 41 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>*curr<span class="Delimiter">.</span>data<span class="Delimiter">.</span>rbegin<span class="Delimiter">()</span> != <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L42" class="LineNr"> 42 </span>        current_address += size_of<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L43" class="LineNr"> 43 </span>      <span class="Delimiter">}</span>
+<span id="L44" class="LineNr"> 44 </span>      <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L45" class="LineNr"> 45 </span>        string variable = <a href='035labels.cc.html#L213'>drop_last</a><span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">);</span>
+<span id="L46" class="LineNr"> 46 </span>        <span class="Comment">// ensure variables look sufficiently different from raw hex</span>
+<span id="L47" class="LineNr"> 47 </span>        <a href='035labels.cc.html#L52'>check_valid_name</a><span class="Delimiter">(</span>variable<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L204'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L49" class="LineNr"> 49 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>j &gt; <span class="Constant">0</span><span class="Delimiter">)</span>
+<span id="L50" class="LineNr"> 50 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': global variable names can only be the first <a href='011run.cc.html#L123'>word</a> in a line.\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L51" class="LineNr"> 51 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span><span class="Delimiter">.</span>is_open<span class="Delimiter">())</span>
+<span id="L52" class="LineNr"> 52 </span>          <span class="Special"><a href='035labels.cc.html#L142'>Map_file</a></span> &lt;&lt; <span class="Constant">&quot;0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; <span class="Constant">' '</span> &lt;&lt; variable &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L53" class="LineNr"> 53 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L256'>contains_key</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L54" class="LineNr"> 54 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;duplicate global '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L55" class="LineNr"> 55 </span>          <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L56" class="LineNr"> 56 </span>        <span class="Delimiter">}</span>
+<span id="L57" class="LineNr"> 57 </span>        <a href='001help.cc.html#L252'>put</a><span class="Delimiter">(</span>address<span class="Delimiter">,</span> variable<span class="Delimiter">,</span> current_address<span class="Delimiter">);</span>
+<span id="L58" class="LineNr"> 58 </span>        <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;global variable '&quot;</span> &lt;&lt; variable &lt;&lt; <span class="Constant">&quot;' is at address 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; current_address &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L59" class="LineNr"> 59 </span>        <span class="Comment">// no modifying current_address; global variable definitions won't be in the final binary</span>
+<span id="L60" class="LineNr"> 60 </span>      <span class="Delimiter">}</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="Delimiter">}</span>
+<span id="L62" class="LineNr"> 62 </span>  <span class="Delimiter">}</span>
 <span id="L63" class="LineNr"> 63 </span><span class="Delimiter">}</span>
 <span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L65'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L67" class="LineNr"> 67 </span>  <a href='036global_variables.cc.html#L72'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> address<span class="Delimiter">);</span>
-<span id="L68" class="LineNr"> 68 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L69" class="LineNr"> 69 </span>    <a href='036global_variables.cc.html#L95'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
-<span id="L70" class="LineNr"> 70 </span><span class="Delimiter">}</span>
-<span id="L71" class="LineNr"> 71 </span>
-<span id="L72" class="LineNr"> 72 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L72'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L75" class="LineNr"> 75 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L77" class="LineNr"> 77 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L79" class="LineNr"> 79 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
-<span id="L80" class="LineNr"> 80 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L81" class="LineNr"> 81 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L82" class="LineNr"> 82 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L83" class="LineNr"> 83 </span>      <span class="Delimiter">}</span>
-<span id="L84" class="LineNr"> 84 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!valid_use_of_global_variable<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L85" class="LineNr"> 85 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L86" class="LineNr"> 86 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>      <span class="Delimiter">}</span>
-<span id="L88" class="LineNr"> 88 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L89" class="LineNr"> 89 </span>    <span class="Delimiter">}</span>
-<span id="L90" class="LineNr"> 90 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Delimiter">}</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
-<span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L95'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>segment&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L97" class="LineNr"> 97 </span>    line&amp; l = data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L98" class="LineNr"> 98 </span>    <a href='011run.cc.html#L117'>line</a> new_l<span class="Delimiter">;</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L100" class="LineNr">100 </span>      <span class="Normal">const</span> word&amp; curr = l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L102" class="LineNr">102 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
-<span id="L103" class="LineNr">103 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L104" class="LineNr">104 </span>        new_l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L106" class="LineNr">106 </span>      <span class="Delimiter">}</span>
-<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot; maps to &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L108" class="LineNr">108 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Delimiter">}</span>
-<span id="L110" class="LineNr">110 </span>    l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
-<span id="L111" class="LineNr">111 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>l<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Delimiter">}</span>
-<span id="L113" class="LineNr">113 </span><span class="Delimiter">}</span>
-<span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L115'>valid_use_of_global_variable</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Comment">// End Valid Uses Of Global Variable(curr)</span>
-<span id="L118" class="LineNr">118 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L119" class="LineNr">119 </span><span class="Delimiter">}</span>
-<span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="SalientComment">//:: a more complex sanity check for how we use global variables</span>
-<span id="L122" class="LineNr">122 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
-<span id="L123" class="LineNr">123 </span>
-<span id="L124" class="LineNr">124 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
-<span id="L125" class="LineNr">125 </span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L127'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(code)</span>
-<span id="L127" class="LineNr">127 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L127'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L128" class="LineNr">128 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L130" class="LineNr">130 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L132" class="LineNr">132 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L134" class="LineNr">134 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span>
-<span id="L135" class="LineNr">135 </span>          &amp;&amp; has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span>
-<span id="L136" class="LineNr">136 </span>        curr<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
-<span id="L137" class="LineNr">137 </span>    <span class="Delimiter">}</span>
-<span id="L138" class="LineNr">138 </span>  <span class="Delimiter">}</span>
-<span id="L139" class="LineNr">139 </span><span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span>
-<span id="L141" class="LineNr">141 </span><span class="Delimiter">:(before &quot;End Valid Uses Of Global Variable(curr)&quot;)</span>
-<span id="L142" class="LineNr">142 </span><span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
-<span id="L143" class="LineNr">143 </span>  <span class="Identifier">return</span> <a href='036global_variables.cc.html#L148'>has_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
-<span id="L144" class="LineNr">144 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span>
-<span id="L145" class="LineNr">145 </span><span class="Comment">// addresses as a real displacement added to other operands.</span>
-<span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(code)</span>
-<span id="L148" class="LineNr">148 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L148'>has_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
-<span id="L150" class="LineNr">150 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == m<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L151" class="LineNr">151 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L152" class="LineNr">152 </span><span class="Delimiter">}</span>
-<span id="L153" class="LineNr">153 </span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_jump)</span>
-<span id="L155" class="LineNr">155 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L156" class="LineNr">156 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L157" class="LineNr">157 </span>eb/jump  x/disp8
-<span id="L158" class="LineNr">158 </span>== data
-<span id="L159" class="LineNr">159 </span><span class="Normal">x</span>:
-<span id="L160" class="LineNr">160 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L161" class="LineNr">161 </span><span class="traceContains">+error: 'eb/jump x/disp8': can't refer to global variable 'x'</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment"># sub-optimal error message; should be</span>
-<span id="L163" class="LineNr">163 </span><span class="CommentedCode">#? +error: can't jump to data (variable 'x')</span>
-<span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_call)</span>
-<span id="L166" class="LineNr">166 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L167" class="LineNr">167 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L168" class="LineNr">168 </span>e8/call  x/disp32
-<span id="L169" class="LineNr">169 </span>== data
-<span id="L170" class="LineNr">170 </span><span class="Normal">x</span>:
-<span id="L171" class="LineNr">171 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L172" class="LineNr">172 </span><span class="traceContains">+error: 'e8/call x/disp32': can't refer to global variable 'x'</span>
-<span id="L173" class="LineNr">173 </span><span class="Comment"># sub-optimal error message; should be</span>
-<span id="L174" class="LineNr">174 </span><span class="CommentedCode">#? +error: can't call to the data segment ('x')</span>
-<span id="L175" class="LineNr">175 </span>
-<span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario global_variable_in_data_segment)</span>
-<span id="L177" class="LineNr">177 </span>== <span class="Constant">0x1</span>
-<span id="L178" class="LineNr">178 </span>b9  x/imm32
-<span id="L179" class="LineNr">179 </span>== <span class="Constant">0x0a000000</span>
-<span id="L180" class="LineNr">180 </span><span class="Normal">x</span>:
-<span id="L181" class="LineNr">181 </span>  y/imm32
-<span id="L182" class="LineNr">182 </span><span class="Normal">y</span>:
-<span id="L183" class="LineNr">183 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L184" class="LineNr">184 </span><span class="Comment"># check that we loaded 'x' with the address of 'y'</span>
-<span id="L185" class="LineNr">185 </span><span class="traceContains">+load: 0x0a000000 -&gt; 04</span>
-<span id="L186" class="LineNr">186 </span><span class="traceContains">+load: 0x0a000001 -&gt; 00</span>
-<span id="L187" class="LineNr">187 </span><span class="traceContains">+load: 0x0a000002 -&gt; 00</span>
-<span id="L188" class="LineNr">188 </span><span class="traceContains">+load: 0x0a000003 -&gt; 0a</span>
-<span id="L189" class="LineNr">189 </span>$error: <span class="Constant">0</span>
-<span id="L190" class="LineNr">190 </span>
-<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(scenario disp32_data_with_modrm)</span>
-<span id="L192" class="LineNr">192 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L193" class="LineNr">193 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX x/disp32
-<span id="L194" class="LineNr">194 </span>== data
-<span id="L195" class="LineNr">195 </span><span class="Normal">x</span>:
-<span id="L196" class="LineNr">196 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
-<span id="L197" class="LineNr">197 </span>$error: <span class="Constant">0</span>
-<span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(scenario disp32_data_with_call)</span>
-<span id="L201" class="LineNr">201 </span>== <a href='031check_operands.cc.html#L11'>code</a>
-<span id="L202" class="LineNr">202 </span><span class="Normal">foo</span>:
-<span id="L203" class="LineNr">203 </span>  e8/call bar/disp32
-<span id="L204" class="LineNr">204 </span><span class="Normal">bar</span>:
-<span id="L205" class="LineNr">205 </span>$error: <span class="Constant">0</span>
-<span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(code)</span>
-<span id="L208" class="LineNr">208 </span>string to_full_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L209" class="LineNr">209 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L211" class="LineNr">211 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
-<span id="L212" class="LineNr">212 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
-<span id="L213" class="LineNr">213 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
-<span id="L214" class="LineNr">214 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Delimiter">}</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L217" class="LineNr">217 </span><span class="Delimiter">}</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L65'>drop_global_variables</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a> segment</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L67" class="LineNr"> 67 </span>    <a href='035labels.cc.html#L157'>drop_labels</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
+<span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
+<span id="L69" class="LineNr"> 69 </span>
+<span id="L70" class="LineNr"> 70 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L70'>replace_global_variables_with_addresses</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L71" class="LineNr"> 71 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='036global_variables.cc.html#L77'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L73" class="LineNr"> 73 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Comment">/*</span><span class="Comment">skip <a href='031check_operands.cc.html#L11'>code</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L74" class="LineNr"> 74 </span>    <a href='036global_variables.cc.html#L100'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">),</span> address<span class="Delimiter">);</span>
+<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
+<span id="L76" class="LineNr"> 76 </span>
+<span id="L77" class="LineNr"> 77 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L77'>replace_global_variables_in_code_segment</a><span class="Delimiter">(</span>segment&amp; <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L78" class="LineNr"> 78 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L79" class="LineNr"> 79 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L80" class="LineNr"> 80 </span>    <a href='011run.cc.html#L117'>line</a> new_inst<span class="Delimiter">;</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L82" class="LineNr"> 82 </span>      <span class="Normal">const</span> word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L83" class="LineNr"> 83 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L84" class="LineNr"> 84 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
+<span id="L85" class="LineNr"> 85 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L86" class="LineNr"> 86 </span>        new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L87" class="LineNr"> 87 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L88" class="LineNr"> 88 </span>      <span class="Delimiter">}</span>
+<span id="L89" class="LineNr"> 89 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!valid_use_of_global_variable<span class="Delimiter">(</span>curr<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L90" class="LineNr"> 90 </span>        <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;': can't refer to global variable '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L91" class="LineNr"> 91 </span>        <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L92" class="LineNr"> 92 </span>      <span class="Delimiter">}</span>
+<span id="L93" class="LineNr"> 93 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_inst<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L94" class="LineNr"> 94 </span>    <span class="Delimiter">}</span>
+<span id="L95" class="LineNr"> 95 </span>    inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;instruction after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Delimiter">}</span>
+<span id="L98" class="LineNr"> 98 </span><span class="Delimiter">}</span>
+<span id="L99" class="LineNr"> 99 </span>
+<span id="L100" class="LineNr">100 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L100'>replace_global_variables_in_data_segment</a><span class="Delimiter">(</span>segment&amp; data<span class="Delimiter">,</span> <span class="Normal">const</span> map&lt;string<span class="Delimiter">,</span> <span class="Normal">uint32_t</span>&gt;&amp; address<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L102" class="LineNr">102 </span>    line&amp; l = data<span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>    <a href='011run.cc.html#L117'>line</a> new_l<span class="Delimiter">;</span>
+<span id="L104" class="LineNr">104 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L105" class="LineNr">105 </span>      <span class="Normal">const</span> word&amp; curr = l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L106" class="LineNr">106 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L107" class="LineNr">107 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>!looks_like_hex_int<span class="Delimiter">(</span>curr<span class="Delimiter">.</span>data<span class="Delimiter">))</span>
+<span id="L108" class="LineNr">108 </span>          <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;missing reference to global '&quot;</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot;'\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>        new_l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
+<span id="L110" class="LineNr">110 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L111" class="LineNr">111 </span>      <span class="Delimiter">}</span>
+<span id="L112" class="LineNr">112 </span>      <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; curr<span class="Delimiter">.</span>data &lt;&lt; <span class="Constant">&quot; maps to &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L413'>HEXWORD</a> &lt;&lt; get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">)</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>      emit_hex_bytes<span class="Delimiter">(</span>new_l<span class="Delimiter">,</span> get<span class="Delimiter">(</span>address<span class="Delimiter">,</span> curr<span class="Delimiter">.</span>data<span class="Delimiter">),</span> <span class="Constant">4</span><span class="Delimiter">);</span>
+<span id="L114" class="LineNr">114 </span>    <span class="Delimiter">}</span>
+<span id="L115" class="LineNr">115 </span>    l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>swap<span class="Delimiter">(</span>new_l<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>
+<span id="L116" class="LineNr">116 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;transform&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;after <a href='011run.cc.html#L231'>transform</a>: '&quot;</span> &lt;&lt; data_to_string<span class="Delimiter">(</span>l<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;'&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L117" class="LineNr">117 </span>  <span class="Delimiter">}</span>
+<span id="L118" class="LineNr">118 </span><span class="Delimiter">}</span>
+<span id="L119" class="LineNr">119 </span>
+<span id="L120" class="LineNr">120 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L120'>valid_use_of_global_variable</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; curr<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L121" class="LineNr">121 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Comment">// End Valid Uses Of Global Variable(curr)</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L124" class="LineNr">124 </span><span class="Delimiter">}</span>
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="SalientComment">//:: a more complex sanity check for how we use global variables</span>
+<span id="L127" class="LineNr">127 </span><span class="Comment">//: requires first saving some data early before we pack operands</span>
+<span id="L128" class="LineNr">128 </span>
+<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(after &quot;Begin Level-2 Transforms&quot;)</span>
+<span id="L130" class="LineNr">130 </span><span class="Special"><a href='011run.cc.html#L229'>Transform</a></span><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='036global_variables.cc.html#L132'>correlate_disp32_with_mod</a><span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(code)</span>
+<span id="L132" class="LineNr">132 </span><span class="Normal">void</span> <a href='036global_variables.cc.html#L132'>correlate_disp32_with_mod</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L133" class="LineNr">133 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L134" class="LineNr">134 </span>  segment&amp; <a href='031check_operands.cc.html#L11'>code</a> = p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L136" class="LineNr">136 </span>    line&amp; inst = <a href='031check_operands.cc.html#L11'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L137" class="LineNr">137 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L138" class="LineNr">138 </span>      word&amp; curr = inst<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L139" class="LineNr">139 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">)</span>
+<span id="L140" class="LineNr">140 </span>          &amp;&amp; has_operand_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> <span class="Constant">&quot;mod&quot;</span><span class="Delimiter">))</span>
+<span id="L141" class="LineNr">141 </span>        curr<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
+<span id="L142" class="LineNr">142 </span>    <span class="Delimiter">}</span>
+<span id="L143" class="LineNr">143 </span>  <span class="Delimiter">}</span>
+<span id="L144" class="LineNr">144 </span><span class="Delimiter">}</span>
+<span id="L145" class="LineNr">145 </span>
+<span id="L146" class="LineNr">146 </span><span class="Delimiter">:(before &quot;End Valid Uses Of Global Variable(curr)&quot;)</span>
+<span id="L147" class="LineNr">147 </span><span class="Normal">if</span> <span class="Delimiter">(</span>has_operand_metadata<span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;disp32&quot;</span><span class="Delimiter">))</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Identifier">return</span> <a href='036global_variables.cc.html#L153'>has_metadata</a><span class="Delimiter">(</span>curr<span class="Delimiter">,</span> <span class="Constant">&quot;has_mod&quot;</span><span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span><span class="Comment">// todo: more sophisticated check, to ensure we don't use global variable</span>
+<span id="L150" class="LineNr">150 </span><span class="Comment">// addresses as a real displacement added to other operands.</span>
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(code)</span>
+<span id="L153" class="LineNr">153 </span><span class="Normal">bool</span> <a href='036global_variables.cc.html#L153'>has_metadata</a><span class="Delimiter">(</span><span class="Normal">const</span> word&amp; w<span class="Delimiter">,</span> <span class="Normal">const</span> string&amp; m<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L154" class="LineNr">154 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span>
+<span id="L155" class="LineNr">155 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>w<span class="Delimiter">.</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">)</span> == m<span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L156" class="LineNr">156 </span>  <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L157" class="LineNr">157 </span><span class="Delimiter">}</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_jump)</span>
+<span id="L160" class="LineNr">160 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L161" class="LineNr">161 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L162" class="LineNr">162 </span>eb/jump  x/disp8
+<span id="L163" class="LineNr">163 </span>== data
+<span id="L164" class="LineNr">164 </span><span class="Normal">x</span>:
+<span id="L165" class="LineNr">165 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L166" class="LineNr">166 </span><span class="traceContains">+error: 'eb/jump x/disp8': can't refer to global variable 'x'</span>
+<span id="L167" class="LineNr">167 </span><span class="Comment"># sub-optimal error message; should be</span>
+<span id="L168" class="LineNr">168 </span><span class="CommentedCode">#? +error: can't jump to data (variable 'x')</span>
+<span id="L169" class="LineNr">169 </span>
+<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(scenario global_variable_disallowed_in_call)</span>
+<span id="L171" class="LineNr">171 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L172" class="LineNr">172 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L173" class="LineNr">173 </span>e8/call  x/disp32
+<span id="L174" class="LineNr">174 </span>== data
+<span id="L175" class="LineNr">175 </span><span class="Normal">x</span>:
+<span id="L176" class="LineNr">176 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L177" class="LineNr">177 </span><span class="traceContains">+error: 'e8/call x/disp32': can't refer to global variable 'x'</span>
+<span id="L178" class="LineNr">178 </span><span class="Comment"># sub-optimal error message; should be</span>
+<span id="L179" class="LineNr">179 </span><span class="CommentedCode">#? +error: can't call to the data segment ('x')</span>
+<span id="L180" class="LineNr">180 </span>
+<span id="L181" class="LineNr">181 </span><span class="Delimiter">:(scenario global_variable_in_data_segment)</span>
+<span id="L182" class="LineNr">182 </span>== <span class="Constant">0x1</span>
+<span id="L183" class="LineNr">183 </span>b9  x/imm32
+<span id="L184" class="LineNr">184 </span>== <span class="Constant">0x0a000000</span>
+<span id="L185" class="LineNr">185 </span><span class="Normal">x</span>:
+<span id="L186" class="LineNr">186 </span>  y/imm32
+<span id="L187" class="LineNr">187 </span><span class="Normal">y</span>:
+<span id="L188" class="LineNr">188 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L189" class="LineNr">189 </span><span class="Comment"># check that we loaded 'x' with the address of 'y'</span>
+<span id="L190" class="LineNr">190 </span><span class="traceContains">+load: 0x0a000000 -&gt; 04</span>
+<span id="L191" class="LineNr">191 </span><span class="traceContains">+load: 0x0a000001 -&gt; 00</span>
+<span id="L192" class="LineNr">192 </span><span class="traceContains">+load: 0x0a000002 -&gt; 00</span>
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+load: 0x0a000003 -&gt; 0a</span>
+<span id="L194" class="LineNr">194 </span>$error: <span class="Constant">0</span>
+<span id="L195" class="LineNr">195 </span>
+<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(scenario duplicate_global_variable)</span>
+<span id="L197" class="LineNr">197 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L198" class="LineNr">198 </span>== <span class="Constant">0x1</span>
+<span id="L199" class="LineNr">199 </span><span class="Constant">40</span>/increment-EAX
+<span id="L200" class="LineNr">200 </span>== <span class="Constant">0x0a000000</span>
+<span id="L201" class="LineNr">201 </span><span class="Normal">x</span>:
+<span id="L202" class="LineNr">202 </span><span class="Normal">x</span>:
+<span id="L203" class="LineNr">203 </span>  <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+error: duplicate global 'x'</span>
+<span id="L205" class="LineNr">205 </span>
+<span id="L206" class="LineNr">206 </span><span class="Delimiter">:(scenario disp32_data_with_modrm)</span>
+<span id="L207" class="LineNr">207 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L208" class="LineNr">208 </span>8b/copy <span class="Constant">0</span>/mod/indirect <span class="Constant">5</span>/rm32/<span class="Delimiter">.</span>disp32 <span class="Constant">2</span>/r32/EDX x/disp32
+<span id="L209" class="LineNr">209 </span>== data
+<span id="L210" class="LineNr">210 </span><span class="Normal">x</span>:
+<span id="L211" class="LineNr">211 </span>  <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span> <span class="PreProc">0</span><span class="Constant">0</span>
+<span id="L212" class="LineNr">212 </span>$error: <span class="Constant">0</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario disp32_data_with_call)</span>
+<span id="L216" class="LineNr">216 </span>== <a href='031check_operands.cc.html#L11'>code</a>
+<span id="L217" class="LineNr">217 </span><span class="Normal">foo</span>:
+<span id="L218" class="LineNr">218 </span>  e8/call bar/disp32
+<span id="L219" class="LineNr">219 </span><span class="Normal">bar</span>:
+<span id="L220" class="LineNr">220 </span>$error: <span class="Constant">0</span>
+<span id="L221" class="LineNr">221 </span>
+<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(code)</span>
+<span id="L223" class="LineNr">223 </span>string to_full_string<span class="Delimiter">(</span><span class="Normal">const</span> line&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L224" class="LineNr">224 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L225" class="LineNr">225 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L226" class="LineNr">226 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i &gt; <span class="Constant">0</span><span class="Delimiter">)</span> out &lt;&lt; <span class="Constant">' '</span><span class="Delimiter">;</span>
+<span id="L227" class="LineNr">227 </span>    out &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>data<span class="Delimiter">;</span>
+<span id="L228" class="LineNr">228 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">int</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt; <a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span>
+<span id="L229" class="LineNr">229 </span>      out &lt;&lt; <span class="Constant">'/'</span> &lt;&lt; in<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">).</span>metadata<span class="Delimiter">.</span>at<span class="Delimiter">(</span>j<span class="Delimiter">);</span>
+<span id="L230" class="LineNr">230 </span>  <span class="Delimiter">}</span>
+<span id="L231" class="LineNr">231 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/037heap.cc.html b/html/subx/037heap.cc.html
new file mode 100644
index 00000000..ef5ad509
--- /dev/null
+++ b/html/subx/037heap.cc.html
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/037heap.cc</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="cpp">
+<meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+* { font-size:12pt; font-size: 1em; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/037heap.cc'>https://github.com/akkartik/mu/blob/master/subx/037heap.cc</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr"> 1 </span><span class="Comment">//: Support for dynamic allocation.</span>
+<span id="L2" class="LineNr"> 2 </span><span class="Comment">//:</span>
+<span id="L3" class="LineNr"> 3 </span><span class="Comment">//: Just provide a special label marking the first unused address in the data</span>
+<span id="L4" class="LineNr"> 4 </span><span class="Comment">//: segment. Then we'll write SubX helpers to make use of it.</span>
+<span id="L5" class="LineNr"> 5 </span>
+<span id="L6" class="LineNr"> 6 </span><span class="Delimiter">:(before &quot;Begin rewrite_global_variables&quot;)</span>
+<span id="L7" class="LineNr"> 7 </span><a href='037heap.cc.html#L9'>insert_heap_global_variable</a><span class="Delimiter">(</span>p<span class="Delimiter">);</span>
+<span id="L8" class="LineNr"> 8 </span><span class="Delimiter">:(code)</span>
+<span id="L9" class="LineNr"> 9 </span><span class="Normal">void</span> <a href='037heap.cc.html#L9'>insert_heap_global_variable</a><span class="Delimiter">(</span>program&amp; p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L10" class="LineNr">10 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L166'>SIZE</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">)</span> &lt; <span class="Constant">2</span><span class="Delimiter">)</span>
+<span id="L11" class="LineNr">11 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>  <span class="Comment">// no data segment defined</span>
+<span id="L12" class="LineNr">12 </span>  <span class="Comment">// Start-of-heap:</span>
+<span id="L13" class="LineNr">13 </span>  p<span class="Delimiter">.</span><a href='011run.cc.html#L100'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L109'>lines</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>label<span class="Delimiter">(</span><span class="Constant">&quot;Start-of-heap&quot;</span><span class="Delimiter">));</span>
+<span id="L14" class="LineNr">14 </span><span class="Delimiter">}</span>
+<span id="L15" class="LineNr">15 </span>
+<span id="L16" class="LineNr">16 </span><a href='011run.cc.html#L117'>line</a> label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L17" class="LineNr">17 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L18" class="LineNr">18 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L19" class="LineNr">19 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Delimiter">(</span>s+<span class="Constant">&quot;:&quot;</span><span class="Delimiter">);</span>
+<span id="L20" class="LineNr">20 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L21" class="LineNr">21 </span><span class="Delimiter">}</span>
+<span id="L22" class="LineNr">22 </span>
+<span id="L23" class="LineNr">23 </span><a href='011run.cc.html#L117'>line</a> <a href='037heap.cc.html#L23'>imm32</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L24" class="LineNr">24 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L25" class="LineNr">25 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L26" class="LineNr">26 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = s<span class="Delimiter">;</span>
+<span id="L27" class="LineNr">27 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><span class="Constant">&quot;imm32&quot;</span><span class="Delimiter">);</span>
+<span id="L28" class="LineNr">28 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L29" class="LineNr">29 </span><span class="Delimiter">}</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/038---literal_strings.cc.html b/html/subx/038---literal_strings.cc.html
index a66897db..43f995a5 100644
--- a/html/subx/038---literal_strings.cc.html
+++ b/html/subx/038---literal_strings.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.LineNr { color:#444444; }
+.LineNr { }
 .traceAbsent { color: #c00000; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.traceContains { color: #008000; }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.traceContains { color: #005f00; }
 -->
 </style>
 
@@ -132,179 +127,172 @@ if ('onhashchange' in window) {
 <span id="L67" class="LineNr"> 67 </span>  <span class="Delimiter">}</span>
 <span id="L68" class="LineNr"> 68 </span><span class="Delimiter">}</span>
 <span id="L69" class="LineNr"> 69 </span>
-<span id="L70" class="LineNr"> 70 </span><a href='011run.cc.html#L117'>line</a> label<span class="Delimiter">(</span>string s<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L71" class="LineNr"> 71 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
-<span id="L72" class="LineNr"> 72 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
-<span id="L73" class="LineNr"> 73 </span>  result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = <span class="Delimiter">(</span>s+<span class="Constant">&quot;:&quot;</span><span class="Delimiter">);</span>
-<span id="L74" class="LineNr"> 74 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">}</span>
-<span id="L76" class="LineNr"> 76 </span>
-<span id="L77" class="LineNr"> 77 </span><span class="Comment">//: Within strings, whitespace is significant. So we need to redo our instruction</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Comment">//: parsing.</span>
-<span id="L79" class="LineNr"> 79 </span>
-<span id="L80" class="LineNr"> 80 </span><span class="Delimiter">:(scenarios parse_instruction_character_by_character)</span>
-<span id="L81" class="LineNr"> 81 </span><span class="Delimiter">:(scenario instruction_with_string_literal)</span>
-<span id="L82" class="LineNr"> 82 </span>a <span class="Constant">&quot;abc  def&quot;</span> z  <span class="Comment"># two spaces inside string</span>
-<span id="L83" class="LineNr"> 83 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;abc  def&quot;</span>
-<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span>
-<span id="L86" class="LineNr"> 86 </span><span class="Comment"># no other words</span>
-<span id="L87" class="LineNr"> 87 </span>$parse2: <span class="Constant">3</span>
-<span id="L88" class="LineNr"> 88 </span>
-<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">:(before &quot;End Line Parsing Special-cases(line_data -&gt; l)&quot;)</span>
-<span id="L90" class="LineNr"> 90 </span><span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'&quot;'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// can cause false-positives, but we can handle them</span>
-<span id="L91" class="LineNr"> 91 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
-<span id="L93" class="LineNr"> 93 </span><span class="Delimiter">}</span>
-<span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(code)</span>
-<span id="L96" class="LineNr"> 96 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">,</span> vector&lt;line&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L97" class="LineNr"> 97 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != string::npos  &amp;&amp; line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != line_data<span class="Delimiter">.</span>size<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L98" class="LineNr"> 98 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;parse_instruction_character_by_character: should receive only a single line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L99" class="LineNr"> 99 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Delimiter">}</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Comment">// parse literals</span>
-<span id="L102" class="LineNr">102 </span>  istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
-<span id="L103" class="LineNr">103 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
-<span id="L104" class="LineNr">104 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
-<span id="L106" class="LineNr">106 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>    <a href='038---literal_strings.cc.html#L158'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
-<span id="L108" class="LineNr">108 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L109" class="LineNr">109 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L110" class="LineNr">110 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment; drop rest of line</span>
-<span id="L111" class="LineNr">111 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// line metadata; skip for now</span>
-<span id="L112" class="LineNr">112 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L113" class="LineNr">113 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment token at end of line</span>
-<span id="L114" class="LineNr">114 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span>
-<span id="L115" class="LineNr">115 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// '.' followed by space is comment token; skip</span>
-<span id="L116" class="LineNr">116 </span>    <span class="Delimiter">}</span>
-<span id="L117" class="LineNr">117 </span>    result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
-<span id="L118" class="LineNr">118 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L119" class="LineNr">119 </span>      <span class="Comment">// slurp word data</span>
-<span id="L120" class="LineNr">120 </span>      ostringstream d<span class="Delimiter">;</span>
-<span id="L121" class="LineNr">121 </span>      d &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L122" class="LineNr">122 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L123" class="LineNr">123 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L124" class="LineNr">124 </span>        d &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L125" class="LineNr">125 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L126" class="LineNr">126 </span>      <span class="Delimiter">}</span>
-<span id="L127" class="LineNr">127 </span>      result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L128" class="LineNr">128 </span>      <span class="Comment">// slurp metadata</span>
-<span id="L129" class="LineNr">129 </span>      ostringstream m<span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L131" class="LineNr">131 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L132" class="LineNr">132 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'/'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L133" class="LineNr">133 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
-<span id="L134" class="LineNr">134 </span>          m<span class="Delimiter">.</span>str<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
-<span id="L135" class="LineNr">135 </span>        <span class="Delimiter">}</span>
-<span id="L136" class="LineNr">136 </span>        <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L137" class="LineNr">137 </span>          m &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L138" class="LineNr">138 </span>        <span class="Delimiter">}</span>
-<span id="L139" class="LineNr">139 </span>      <span class="Delimiter">}</span>
-<span id="L140" class="LineNr">140 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
-<span id="L141" class="LineNr">141 </span>    <span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L143" class="LineNr">143 </span>      <span class="Comment">// slurp all characters until whitespace</span>
-<span id="L144" class="LineNr">144 </span>      ostringstream w<span class="Delimiter">;</span>
-<span id="L145" class="LineNr">145 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L146" class="LineNr">146 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// peek can sometimes trigger eof(), so do it first</span>
-<span id="L147" class="LineNr">147 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
-<span id="L148" class="LineNr">148 </span>        w &lt;&lt; c<span class="Delimiter">;</span>
-<span id="L149" class="LineNr">149 </span>      <span class="Delimiter">}</span>
-<span id="L150" class="LineNr">150 </span>      <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
-<span id="L151" class="LineNr">151 </span>    <span class="Delimiter">}</span>
-<span id="L152" class="LineNr">152 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L153" class="LineNr">153 </span>  <span class="Delimiter">}</span>
-<span id="L154" class="LineNr">154 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L155" class="LineNr">155 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
+<span id="L70" class="LineNr"> 70 </span><span class="Comment">//: Within strings, whitespace is significant. So we need to redo our instruction</span>
+<span id="L71" class="LineNr"> 71 </span><span class="Comment">//: parsing.</span>
+<span id="L72" class="LineNr"> 72 </span>
+<span id="L73" class="LineNr"> 73 </span><span class="Delimiter">:(scenarios parse_instruction_character_by_character)</span>
+<span id="L74" class="LineNr"> 74 </span><span class="Delimiter">:(scenario instruction_with_string_literal)</span>
+<span id="L75" class="LineNr"> 75 </span>a <span class="Constant">&quot;abc  def&quot;</span> z  <span class="Comment"># two spaces inside string</span>
+<span id="L76" class="LineNr"> 76 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L77" class="LineNr"> 77 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;abc  def&quot;</span>
+<span id="L78" class="LineNr"> 78 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Comment"># no other words</span>
+<span id="L80" class="LineNr"> 80 </span>$parse2: <span class="Constant">3</span>
+<span id="L81" class="LineNr"> 81 </span>
+<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">:(before &quot;End Line Parsing Special-cases(line_data -&gt; l)&quot;)</span>
+<span id="L83" class="LineNr"> 83 </span><span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="Constant">'&quot;'</span><span class="Delimiter">)</span> != string::npos<span class="Delimiter">)</span> <span class="Delimiter">{</span>  <span class="Comment">// can cause false-positives, but we can handle them</span>
+<span id="L84" class="LineNr"> 84 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> l<span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  <span class="Identifier">continue</span><span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span><span class="Delimiter">}</span>
+<span id="L87" class="LineNr"> 87 </span>
+<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(code)</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">,</span> vector&lt;line&gt;&amp; out<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != string::npos  &amp;&amp; line_data<span class="Delimiter">.</span>find<span class="Delimiter">(</span><span class="cSpecial">'\n'</span><span class="Delimiter">)</span> != line_data<span class="Delimiter">.</span>size<span class="Delimiter">()</span>-<span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L91" class="LineNr"> 91 </span>    <a href='003trace.cc.html#L190'>raise</a> &lt;&lt; <span class="Constant">&quot;parse_instruction_character_by_character: should receive only a single line\n&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L92" class="LineNr"> 92 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L93" class="LineNr"> 93 </span>  <span class="Delimiter">}</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Comment">// parse literals</span>
+<span id="L95" class="LineNr"> 95 </span>  istringstream in<span class="Delimiter">(</span>line_data<span class="Delimiter">);</span>
+<span id="L96" class="LineNr"> 96 </span>  in &gt;&gt; std::noskipws<span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <a href='011run.cc.html#L117'>line</a> result<span class="Delimiter">;</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Comment">// add tokens (words or strings) one by one</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L100" class="LineNr">100 </span>    <a href='038---literal_strings.cc.html#L151'>skip_whitespace</a><span class="Delimiter">(</span>in<span class="Delimiter">);</span>
+<span id="L101" class="LineNr">101 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L102" class="LineNr">102 </span>    <span class="Normal">char</span> c = in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L103" class="LineNr">103 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment; drop rest of line</span>
+<span id="L104" class="LineNr">104 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">':'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// line metadata; skip for now</span>
+<span id="L105" class="LineNr">105 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'.'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L106" class="LineNr">106 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!has_data<span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// comment token at end of line</span>
+<span id="L107" class="LineNr">107 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span>
+<span id="L108" class="LineNr">108 </span>        <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// '.' followed by space is comment token; skip</span>
+<span id="L109" class="LineNr">109 </span>    <span class="Delimiter">}</span>
+<span id="L110" class="LineNr">110 </span>    result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>push_back<span class="Delimiter">(</span><a href='011run.cc.html#L123'>word</a><span class="Delimiter">());</span>
+<span id="L111" class="LineNr">111 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L112" class="LineNr">112 </span>      <span class="Comment">// slurp word data</span>
+<span id="L113" class="LineNr">113 </span>      ostringstream d<span class="Delimiter">;</span>
+<span id="L114" class="LineNr">114 </span>      d &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L115" class="LineNr">115 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L116" class="LineNr">116 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span>        d &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'&quot;'</span><span class="Delimiter">)</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L119" class="LineNr">119 </span>      <span class="Delimiter">}</span>
+<span id="L120" class="LineNr">120 </span>      result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>data = d<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>      <span class="Comment">// slurp metadata</span>
+<span id="L122" class="LineNr">122 </span>      ostringstream m<span class="Delimiter">;</span>
+<span id="L123" class="LineNr">123 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L124" class="LineNr">124 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L125" class="LineNr">125 </span>        <span class="Normal">if</span> <span class="Delimiter">(</span>c == <span class="Constant">'/'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L126" class="LineNr">126 </span>          <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
+<span id="L127" class="LineNr">127 </span>          m<span class="Delimiter">.</span>str<span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
+<span id="L128" class="LineNr">128 </span>        <span class="Delimiter">}</span>
+<span id="L129" class="LineNr">129 </span>        <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L130" class="LineNr">130 </span>          m &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L131" class="LineNr">131 </span>        <span class="Delimiter">}</span>
+<span id="L132" class="LineNr">132 </span>      <span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span>!m<span class="Delimiter">.</span>str<span class="Delimiter">().</span>empty<span class="Delimiter">())</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">().</span>metadata<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>m<span class="Delimiter">.</span>str<span class="Delimiter">());</span>
+<span id="L134" class="LineNr">134 </span>    <span class="Delimiter">}</span>
+<span id="L135" class="LineNr">135 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L136" class="LineNr">136 </span>      <span class="Comment">// slurp all characters until whitespace</span>
+<span id="L137" class="LineNr">137 </span>      ostringstream w<span class="Delimiter">;</span>
+<span id="L138" class="LineNr">138 </span>      w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L139" class="LineNr">139 </span>      <span class="Normal">while</span> <span class="Delimiter">(</span>!isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">())</span> &amp;&amp; <a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">))</span> <span class="Delimiter">{</span>  <span class="Comment">// peek can sometimes trigger eof(), so do it first</span>
+<span id="L140" class="LineNr">140 </span>        in &gt;&gt; c<span class="Delimiter">;</span>
+<span id="L141" class="LineNr">141 </span>        w &lt;&lt; c<span class="Delimiter">;</span>
+<span id="L142" class="LineNr">142 </span>      <span class="Delimiter">}</span>
+<span id="L143" class="LineNr">143 </span>      <a href='011run.cc.html#L191'>parse_word</a><span class="Delimiter">(</span>w<span class="Delimiter">.</span>str<span class="Delimiter">(),</span> result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">());</span>
+<span id="L144" class="LineNr">144 </span>    <span class="Delimiter">}</span>
+<span id="L145" class="LineNr">145 </span>    <a href='003trace.cc.html#L183'>trace</a><span class="Delimiter">(</span><span class="Constant">99</span><span class="Delimiter">,</span> <span class="Constant">&quot;parse2&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;word: &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>back<span class="Delimiter">())</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Delimiter">}</span>
+<span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!result<span class="Delimiter">.</span><a href='011run.cc.html#L118'>words</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L148" class="LineNr">148 </span>    out<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>result<span class="Delimiter">);</span>
+<span id="L149" class="LineNr">149 </span><span class="Delimiter">}</span>
+<span id="L150" class="LineNr">150 </span>
+<span id="L151" class="LineNr">151 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L151'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L152" class="LineNr">152 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L153" class="LineNr">153 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Delimiter">}</span>
 <span id="L156" class="LineNr">156 </span><span class="Delimiter">}</span>
 <span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L158'>skip_whitespace</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L159" class="LineNr">159 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><span class="Constant">true</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L160" class="LineNr">160 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; isspace<span class="Delimiter">(</span>in<span class="Delimiter">.</span>peek<span class="Delimiter">()))</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L161" class="LineNr">161 </span>    <span class="Normal">else</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L158" class="LineNr">158 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L158'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L159" class="LineNr">159 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L160" class="LineNr">160 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
+<span id="L161" class="LineNr">161 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
 <span id="L162" class="LineNr">162 </span>  <span class="Delimiter">}</span>
 <span id="L163" class="LineNr">163 </span><span class="Delimiter">}</span>
 <span id="L164" class="LineNr">164 </span>
-<span id="L165" class="LineNr">165 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L165'>skip_comment</a><span class="Delimiter">(</span>istream&amp; in<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L166" class="LineNr">166 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> == <span class="Constant">'#'</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L167" class="LineNr">167 </span>    in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L168" class="LineNr">168 </span>    <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L274'>has_data</a><span class="Delimiter">(</span>in<span class="Delimiter">)</span> &amp;&amp; in<span class="Delimiter">.</span>peek<span class="Delimiter">()</span> != <span class="cSpecial">'\n'</span><span class="Delimiter">)</span> in<span class="Delimiter">.</span>get<span class="Delimiter">();</span>
-<span id="L169" class="LineNr">169 </span>  <span class="Delimiter">}</span>
-<span id="L170" class="LineNr">170 </span><span class="Delimiter">}</span>
-<span id="L171" class="LineNr">171 </span>
-<span id="L172" class="LineNr">172 </span><span class="Comment">// helper for tests</span>
-<span id="L173" class="LineNr">173 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L174" class="LineNr">174 </span>  vector&lt;line&gt; out<span class="Delimiter">;</span>
-<span id="L175" class="LineNr">175 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
-<span id="L176" class="LineNr">176 </span><span class="Delimiter">}</span>
-<span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="Delimiter">:(scenario parse2_comment_token_in_middle)</span>
-<span id="L179" class="LineNr">179 </span>a <span class="Delimiter">.</span> z
-<span id="L180" class="LineNr">180 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span>
-<span id="L182" class="LineNr">182 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
-<span id="L183" class="LineNr">183 </span><span class="Comment"># no other words</span>
-<span id="L184" class="LineNr">184 </span>$parse2: <span class="Constant">2</span>
-<span id="L185" class="LineNr">185 </span>
-<span id="L186" class="LineNr">186 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot)</span>
-<span id="L187" class="LineNr">187 </span>a <span class="Delimiter">.</span>b c
-<span id="L188" class="LineNr">188 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L189" class="LineNr">189 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .b</span>
-<span id="L190" class="LineNr">190 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span>
-<span id="L191" class="LineNr">191 </span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">:(scenario parse2_comment_token_at_start)</span>
-<span id="L193" class="LineNr">193 </span><span class="Delimiter">.</span> a b
-<span id="L194" class="LineNr">194 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
-<span id="L196" class="LineNr">196 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
-<span id="L197" class="LineNr">197 </span>
-<span id="L198" class="LineNr">198 </span><span class="Delimiter">:(scenario parse2_comment_token_at_end)</span>
-<span id="L199" class="LineNr">199 </span>a b <span class="Delimiter">.</span>
-<span id="L200" class="LineNr">200 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L201" class="LineNr">201 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
-<span id="L202" class="LineNr">202 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
-<span id="L203" class="LineNr">203 </span>
-<span id="L204" class="LineNr">204 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot_at_start)</span>
-<span id="L205" class="LineNr">205 </span><span class="Delimiter">.</span>a b c
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
-<span id="L208" class="LineNr">208 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span>
-<span id="L209" class="LineNr">209 </span>
-<span id="L210" class="LineNr">210 </span><span class="Delimiter">:(scenario parse2_metadata)</span>
-<span id="L211" class="LineNr">211 </span><span class="Delimiter">.</span>a b/c d
-<span id="L212" class="LineNr">212 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span>
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b /c</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: d</span>
-<span id="L215" class="LineNr">215 </span>
-<span id="L216" class="LineNr">216 </span><span class="Delimiter">:(scenario parse2_string_with_metadata)</span>
-<span id="L217" class="LineNr">217 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32 g
-<span id="L218" class="LineNr">218 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L219" class="LineNr">219 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc  def&quot; /disp32</span>
-<span id="L220" class="LineNr">220 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: g</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span><span class="Delimiter">:(scenario parse2_string_with_metadata_at_end)</span>
-<span id="L223" class="LineNr">223 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32
-<span id="L224" class="LineNr">224 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
-<span id="L225" class="LineNr">225 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc  def&quot; /disp32</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(code)</span>
-<span id="L228" class="LineNr">228 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L228'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L229" class="LineNr">229 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
-<span id="L230" class="LineNr">230 </span>      <span class="Constant">&quot;68/push \&quot;</span>test\<span class="Constant">&quot;/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
-<span id="L231" class="LineNr">231 </span>  <span class="Delimiter">);</span>
-<span id="L232" class="LineNr">232 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
-<span id="L233" class="LineNr">233 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D&quot;</span>
-<span id="L234" class="LineNr">234 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: \&quot;</span>test\<span class="Constant">&quot; /f^D&quot;</span>
-<span id="L235" class="LineNr">235 </span>  <span class="Delimiter">);</span>
-<span id="L236" class="LineNr">236 </span><span class="Delimiter">}</span>
-<span id="L237" class="LineNr">237 </span>
-<span id="L238" class="LineNr">238 </span><span class="Comment">//: Make sure slashes inside strings don't trigger adding stuff from inside the</span>
-<span id="L239" class="LineNr">239 </span><span class="Comment">//: string to metadata.</span>
-<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(scenario parse2_string_containing_slashes)</span>
-<span id="L241" class="LineNr">241 </span>a <span class="Constant">&quot;bc/def&quot;</span>/disp32
-<span id="L242" class="LineNr">242 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc/def&quot; /disp32</span>
+<span id="L165" class="LineNr">165 </span><span class="Comment">// helper for tests</span>
+<span id="L166" class="LineNr">166 </span><span class="Normal">void</span> parse_instruction_character_by_character<span class="Delimiter">(</span><span class="Normal">const</span> string&amp; line_data<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L167" class="LineNr">167 </span>  vector&lt;line&gt; out<span class="Delimiter">;</span>
+<span id="L168" class="LineNr">168 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>line_data<span class="Delimiter">,</span> out<span class="Delimiter">);</span>
+<span id="L169" class="LineNr">169 </span><span class="Delimiter">}</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="Delimiter">:(scenario parse2_comment_token_in_middle)</span>
+<span id="L172" class="LineNr">172 </span>a <span class="Delimiter">.</span> z
+<span id="L173" class="LineNr">173 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L174" class="LineNr">174 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: z</span>
+<span id="L175" class="LineNr">175 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
+<span id="L176" class="LineNr">176 </span><span class="Comment"># no other words</span>
+<span id="L177" class="LineNr">177 </span>$parse2: <span class="Constant">2</span>
+<span id="L178" class="LineNr">178 </span>
+<span id="L179" class="LineNr">179 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot)</span>
+<span id="L180" class="LineNr">180 </span>a <span class="Delimiter">.</span>b c
+<span id="L181" class="LineNr">181 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L182" class="LineNr">182 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .b</span>
+<span id="L183" class="LineNr">183 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span>
+<span id="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(scenario parse2_comment_token_at_start)</span>
+<span id="L186" class="LineNr">186 </span><span class="Delimiter">.</span> a b
+<span id="L187" class="LineNr">187 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L188" class="LineNr">188 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
+<span id="L189" class="LineNr">189 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
+<span id="L190" class="LineNr">190 </span>
+<span id="L191" class="LineNr">191 </span><span class="Delimiter">:(scenario parse2_comment_token_at_end)</span>
+<span id="L192" class="LineNr">192 </span>a b <span class="Delimiter">.</span>
+<span id="L193" class="LineNr">193 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L194" class="LineNr">194 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
+<span id="L195" class="LineNr">195 </span><span class="traceAbsent">-parse2: <a href='011run.cc.html#L123'>word</a>: .</span>
+<span id="L196" class="LineNr">196 </span>
+<span id="L197" class="LineNr">197 </span><span class="Delimiter">:(scenario parse2_word_starting_with_dot_at_start)</span>
+<span id="L198" class="LineNr">198 </span><span class="Delimiter">.</span>a b c
+<span id="L199" class="LineNr">199 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span>
+<span id="L200" class="LineNr">200 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b</span>
+<span id="L201" class="LineNr">201 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: c</span>
+<span id="L202" class="LineNr">202 </span>
+<span id="L203" class="LineNr">203 </span><span class="Delimiter">:(scenario parse2_metadata)</span>
+<span id="L204" class="LineNr">204 </span><span class="Delimiter">.</span>a b/c d
+<span id="L205" class="LineNr">205 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: .a</span>
+<span id="L206" class="LineNr">206 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: b /c</span>
+<span id="L207" class="LineNr">207 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: d</span>
+<span id="L208" class="LineNr">208 </span>
+<span id="L209" class="LineNr">209 </span><span class="Delimiter">:(scenario parse2_string_with_metadata)</span>
+<span id="L210" class="LineNr">210 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32 g
+<span id="L211" class="LineNr">211 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L212" class="LineNr">212 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc  def&quot; /disp32</span>
+<span id="L213" class="LineNr">213 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: g</span>
+<span id="L214" class="LineNr">214 </span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario parse2_string_with_metadata_at_end)</span>
+<span id="L216" class="LineNr">216 </span>a <span class="Constant">&quot;bc  def&quot;</span>/disp32
+<span id="L217" class="LineNr">217 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: a</span>
+<span id="L218" class="LineNr">218 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc  def&quot; /disp32</span>
+<span id="L219" class="LineNr">219 </span>
+<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(code)</span>
+<span id="L221" class="LineNr">221 </span><span class="Normal">void</span> <a href='038---literal_strings.cc.html#L221'>test_parse2_string_with_metadata_at_end_of_line_without_newline</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L222" class="LineNr">222 </span>  parse_instruction_character_by_character<span class="Delimiter">(</span>
+<span id="L223" class="LineNr">223 </span>      <span class="Constant">&quot;68/push \&quot;</span>test\<span class="Constant">&quot;/f&quot;</span>  <span class="Comment">// no newline, which is how calls from parse() will look</span>
+<span id="L224" class="LineNr">224 </span>  <span class="Delimiter">);</span>
+<span id="L225" class="LineNr">225 </span>  <a href='003trace.cc.html#L233'>CHECK_TRACE_CONTENTS</a><span class="Delimiter">(</span>
+<span id="L226" class="LineNr">226 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: 68 /push^D&quot;</span>
+<span id="L227" class="LineNr">227 </span>      <span class="Constant">&quot;parse2: <a href='011run.cc.html#L123'>word</a>: \&quot;</span>test\<span class="Constant">&quot; /f^D&quot;</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Delimiter">);</span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">}</span>
+<span id="L230" class="LineNr">230 </span>
+<span id="L231" class="LineNr">231 </span><span class="Comment">//: Make sure slashes inside strings don't trigger adding stuff from inside the</span>
+<span id="L232" class="LineNr">232 </span><span class="Comment">//: string to metadata.</span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">:(scenario parse2_string_containing_slashes)</span>
+<span id="L234" class="LineNr">234 </span>a <span class="Constant">&quot;bc/def&quot;</span>/disp32
+<span id="L235" class="LineNr">235 </span><span class="traceContains">+parse2: <a href='011run.cc.html#L123'>word</a>: &quot;bc/def&quot; /disp32</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/039debug.cc.html b/html/subx/039debug.cc.html
index e8883fd0..999d541e 100644
--- a/html/subx/039debug.cc.html
+++ b/html/subx/039debug.cc.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/subx/040---tests.cc.html b/html/subx/040---tests.cc.html
index 38daebc0..de38c642 100644
--- a/html/subx/040---tests.cc.html
+++ b/html/subx/040---tests.cc.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="cpp">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .cSpecial { color: #008000; }
-.traceContains { color: #008000; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Delimiter { color:#800080; }
-.Special { color:#c00000; }
-.Identifier { color:#c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Comment { color: #8080ff; }
-.PreProc { color:#800080; }
+.traceContains { color: #005f00; }
+.LineNr { }
+.Constant { color: #008787; }
+.Delimiter { color: #c000c0; }
+.Special { color: #d70000; }
+.Identifier { color: #af5f00; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Comment { color: #005faf; }
+.PreProc { color: #c000c0; }
 -->
 </style>
 
diff --git a/html/subx/050_write.subx.html b/html/subx/050_write.subx.html
index 3da032cf..f42eb707 100644
--- a/html/subx/050_write.subx.html
+++ b/html/subx/050_write.subx.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.Constant { color: #008787; }
 .subxMinorFunction { color: #875f5f; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -70,13 +65,13 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="subxComment"># main:</span>
 <span id="L9" class="LineNr"> 9 </span>    <span class="subxComment"># syscall(exit, 0) -- can't test _write just yet</span>
 <span id="L10" class="LineNr">10 </span>    bb/copy-to-EBX  0/imm32
-<span id="L11" class="LineNr">11 </span>    b8/copy-to-EAX  1/imm32
+<span id="L11" class="LineNr">11 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L12" class="LineNr">12 </span>    cd/syscall  0x80/imm8
 <span id="L13" class="LineNr">13 </span>
-<span id="L14" class="LineNr">14 </span><span class="subxMinorFunction">_write</span>:  <span class="subxComment"># fd : int, s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L14" class="LineNr">14 </span><span class="subxMinorFunction"><a href='050_write.subx.html#L14'>_write</a></span>:  <span class="subxComment"># fd : int, s : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L15" class="LineNr">15 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L16" class="LineNr">16 </span>    55/push-EBP
-<span id="L17" class="LineNr">17 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L17" class="LineNr">17 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L18" class="LineNr">18 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L19" class="LineNr">19 </span>    50/push-EAX
 <span id="L20" class="LineNr">20 </span>    51/push-ECX
@@ -84,13 +79,13 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr">22 </span>    53/push-EBX
 <span id="L23" class="LineNr">23 </span>    <span class="subxComment"># syscall(write, fd, (data) s+4, (size) *s)</span>
 <span id="L24" class="LineNr">24 </span>    <span class="subxS1Comment"># . fd : EBX</span>
-<span id="L25" class="LineNr">25 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L25" class="LineNr">25 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
 <span id="L26" class="LineNr">26 </span>    <span class="subxS1Comment"># . data : ECX = s+4</span>
-<span id="L27" class="LineNr">27 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
-<span id="L28" class="LineNr">28 </span>    81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
+<span id="L27" class="LineNr">27 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
+<span id="L28" class="LineNr">28 </span>    81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
 <span id="L29" class="LineNr">29 </span>    <span class="subxS1Comment"># . size : EDX = *s</span>
-<span id="L30" class="LineNr">30 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
-<span id="L31" class="LineNr">31 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L30" class="LineNr">30 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L31" class="LineNr">31 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
 <span id="L32" class="LineNr">32 </span>    <span class="subxS1Comment"># . syscall</span>
 <span id="L33" class="LineNr">33 </span>    b8/copy-to-EAX  4/imm32/write
 <span id="L34" class="LineNr">34 </span>    cd/syscall  0x80/imm8
@@ -101,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L39" class="LineNr">39 </span>    59/pop-to-ECX
 <span id="L40" class="LineNr">40 </span>    58/pop-to-EAX
 <span id="L41" class="LineNr">41 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L42" class="LineNr">42 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L42" class="LineNr">42 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L43" class="LineNr">43 </span>    5d/pop-to-EBP
 <span id="L44" class="LineNr">44 </span>    c3/return
 <span id="L45" class="LineNr">45 </span>
diff --git a/html/subx/051test.subx.html b/html/subx/051test.subx.html
index 077f1570..3532f4ce 100644
--- a/html/subx/051test.subx.html
+++ b/html/subx/051test.subx.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
-.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
+.Constant { color: #008787; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -75,79 +70,79 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr">12 </span>    68/push  34/imm32
 <span id="L13" class="LineNr">13 </span>    68/push  34/imm32
 <span id="L14" class="LineNr">14 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L15" class="LineNr">15 </span>    e8/call  check-ints-equal/disp32
+<span id="L15" class="LineNr">15 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L16" class="LineNr">16 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L17" class="LineNr">17 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L17" class="LineNr">17 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L18" class="LineNr">18 </span>    <span class="subxComment"># syscall(exit, 0)</span>
 <span id="L19" class="LineNr">19 </span>    bb/copy-to-EBX  0/imm32
 <span id="L20" class="LineNr">20 </span>    b8/copy-to-EAX  1/imm32/exit
 <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="subxComment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L24" class="LineNr">24 </span><span class="subxFunction">check-ints-equal</span>:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; &lt;void&gt;</span>
+<span id="L24" class="LineNr">24 </span><span class="subxFunction"><a href='051test.subx.html#L24'>check-ints-equal</a></span>:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; &lt;void&gt;</span>
 <span id="L25" class="LineNr">25 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L26" class="LineNr">26 </span>    55/push-EBP
-<span id="L27" class="LineNr">27 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L27" class="LineNr">27 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L28" class="LineNr">28 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L29" class="LineNr">29 </span>    50/push-EAX
 <span id="L30" class="LineNr">30 </span>    51/push-ECX
 <span id="L31" class="LineNr">31 </span>    53/push-EBX
 <span id="L32" class="LineNr">32 </span>    <span class="subxComment"># load first 2 args into EAX and EBX</span>
-<span id="L33" class="LineNr">33 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L34" class="LineNr">34 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L33" class="LineNr">33 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L34" class="LineNr">34 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
 <span id="L35" class="LineNr">35 </span>    <span class="subxComment"># if EAX == EBX success</span>
-<span id="L36" class="LineNr">36 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
+<span id="L36" class="LineNr">36 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
 <span id="L37" class="LineNr">37 </span>    75/jump-if-unequal  $check-ints-equal:else/disp8
 <span id="L38" class="LineNr">38 </span>    <span class="subxS1Comment"># . _write(2/stderr, '.')</span>
 <span id="L39" class="LineNr">39 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L40" class="LineNr">40 </span>    68/push  <span class="Constant">&quot;.&quot;</span>/imm32
 <span id="L41" class="LineNr">41 </span>    68/push  2/imm32/stderr
 <span id="L42" class="LineNr">42 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L43" class="LineNr">43 </span>    e8/call  _write/disp32
+<span id="L43" class="LineNr">43 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
 <span id="L44" class="LineNr">44 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L45" class="LineNr">45 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L45" class="LineNr">45 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L46" class="LineNr">46 </span>    <span class="subxS1Comment"># . return</span>
 <span id="L47" class="LineNr">47 </span>    eb/jump  $check-ints-equal:end/disp8
 <span id="L48" class="LineNr">48 </span>    <span class="subxComment"># otherwise print error message</span>
 <span id="L49" class="LineNr">49 </span><span class="Constant">$check-ints-equal:else</span>:
 <span id="L50" class="LineNr">50 </span>    <span class="subxS1Comment"># . _write(2/stderr, msg)</span>
 <span id="L51" class="LineNr">51 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L52" class="LineNr">52 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to ECX</span>
+<span id="L52" class="LineNr">52 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to ECX</span>
 <span id="L53" class="LineNr">53 </span>    51/push-ECX
 <span id="L54" class="LineNr">54 </span>    68/push  2/imm32/stderr
 <span id="L55" class="LineNr">55 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L56" class="LineNr">56 </span>    e8/call  _write/disp32
+<span id="L56" class="LineNr">56 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
 <span id="L57" class="LineNr">57 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L58" class="LineNr">58 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L58" class="LineNr">58 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L59" class="LineNr">59 </span>    <span class="subxS1Comment"># . _write(2/stderr, Newline)</span>
 <span id="L60" class="LineNr">60 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L61" class="LineNr">61 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
+<span id="L61" class="LineNr">61 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
 <span id="L62" class="LineNr">62 </span>    68/push  2/imm32/stderr
 <span id="L63" class="LineNr">63 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L64" class="LineNr">64 </span>    e8/call  _write/disp32
+<span id="L64" class="LineNr">64 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
 <span id="L65" class="LineNr">65 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L66" class="LineNr">66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L66" class="LineNr">66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L67" class="LineNr">67 </span>    <span class="subxComment"># increment Num-test-failures</span>
-<span id="L68" class="LineNr">68 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># increment *Num-test-failures</span>
+<span id="L68" class="LineNr">68 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># increment *Num-test-failures</span>
 <span id="L69" class="LineNr">69 </span><span class="Constant">$check-ints-equal:end</span>:
 <span id="L70" class="LineNr">70 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L71" class="LineNr">71 </span>    5b/pop-to-EBX
 <span id="L72" class="LineNr">72 </span>    59/pop-to-ECX
 <span id="L73" class="LineNr">73 </span>    58/pop-to-EAX
 <span id="L74" class="LineNr">74 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L75" class="LineNr">75 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L75" class="LineNr">75 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L76" class="LineNr">76 </span>    5d/pop-to-EBP
 <span id="L77" class="LineNr">77 </span>    c3/return
 <span id="L78" class="LineNr">78 </span>
 <span id="L79" class="LineNr">79 </span>== data
 <span id="L80" class="LineNr">80 </span>
-<span id="L81" class="LineNr">81 </span><span class="SpecialChar">Newline</span>:
+<span id="L81" class="LineNr">81 </span><span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>:
 <span id="L82" class="LineNr">82 </span>    <span class="subxComment"># size</span>
 <span id="L83" class="LineNr">83 </span>    01 00 00 00
 <span id="L84" class="LineNr">84 </span>    <span class="subxComment"># data</span>
 <span id="L85" class="LineNr">85 </span>    0a/newline
 <span id="L86" class="LineNr">86 </span>
-<span id="L87" class="LineNr">87 </span><span class="SpecialChar">Num-test-failures</span>:
+<span id="L87" class="LineNr">87 </span><span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>:
 <span id="L88" class="LineNr">88 </span>    00 00 00 00
 <span id="L89" class="LineNr">89 </span>
 <span id="L90" class="LineNr">90 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/subx/052kernel_string_equal.subx.html b/html/subx/052kernel_string_equal.subx.html
index 911a17d8..d1397093 100644
--- a/html/subx/052kernel_string_equal.subx.html
+++ b/html/subx/052kernel_string_equal.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.Constant { color:#00a0a0; }
-.SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -87,16 +82,16 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
 <span id="L23" class="LineNr"> 23 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L25" class="LineNr"> 25 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L26" class="LineNr"> 26 </span>    b8/copy-to-EAX  1/imm32
+<span id="L25" class="LineNr"> 25 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L26" class="LineNr"> 26 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L27" class="LineNr"> 27 </span>    cd/syscall  0x80/imm8
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="subxComment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
 <span id="L30" class="LineNr"> 30 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L31" class="LineNr"> 31 </span><span class="subxFunction">kernel-string-equal</span>:  <span class="subxComment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxFunction"><a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a></span>:  <span class="subxComment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L33" class="LineNr"> 33 </span>    55/push-EBP
-<span id="L34" class="LineNr"> 34 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L34" class="LineNr"> 34 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L36" class="LineNr"> 36 </span>    51/push-ECX
 <span id="L37" class="LineNr"> 37 </span>    52/push-EDX
@@ -119,29 +114,29 @@ if ('onhashchange' in window) {
 <span id="L54" class="LineNr"> 54 </span>    <span class="subxComment">#   return *s1 == 0</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxComment">#</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># initialize s into EDI</span>
-<span id="L57" class="LineNr"> 57 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L57" class="LineNr"> 57 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># initialize benchmark length n into EDX</span>
-<span id="L59" class="LineNr"> 59 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
-<span id="L60" class="LineNr"> 60 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L59" class="LineNr"> 59 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L60" class="LineNr"> 60 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># initialize benchmark data into ESI</span>
-<span id="L62" class="LineNr"> 62 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
+<span id="L62" class="LineNr"> 62 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># 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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># initialize loop counter i into 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="subxComment"># while (i/ECX &lt; n/EDX)</span>
 <span id="L67" class="LineNr"> 67 </span><span class="Constant">$kernel-string-equal:loop</span>:
-<span id="L68" class="LineNr"> 68 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
+<span id="L68" class="LineNr"> 68 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
 <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="subxComment"># c1/EAX, c2/EBX = *s, *benchmark</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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L72" class="LineNr"> 72 </span>    8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to lower byte of EBX</span>
+<span id="L74" class="LineNr"> 74 </span>    8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ESI to lower byte of EBX</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="subxComment"># 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-equal:false/disp8
 <span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L79" class="LineNr"> 79 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L79" class="LineNr"> 79 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <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="subxComment"># ++s1, ++s2, ++i</span>
 <span id="L82" class="LineNr"> 82 </span>    41/inc-ECX
@@ -152,7 +147,7 @@ if ('onhashchange' in window) {
 <span id="L87" class="LineNr"> 87 </span><span class="Constant">$kernel-string-equal:break</span>:
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># if (*s/EDI == 0) return true</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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L90" class="LineNr"> 90 </span>    8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
 <span id="L91" class="LineNr"> 91 </span>    3d/compare-EAX  0/imm32
 <span id="L92" class="LineNr"> 92 </span>    75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L93" class="LineNr"> 93 </span><span class="Constant">$kernel-string-equal:true</span>:
@@ -169,157 +164,157 @@ if ('onhashchange' in window) {
 <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="subxS1Comment"># . epilog</span>
-<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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="subxH1Comment"># - tests</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="subxTest">test-compare-null-kernel-string-with-empty-array</span>:
+<span id="L113" class="LineNr">113 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L113'>test-compare-null-kernel-string-with-empty-array</a></span>:
 <span id="L114" class="LineNr">114 </span>    <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
 <span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L116" class="LineNr">116 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L117" class="LineNr">117 </span>    68/push  <span class="SpecialChar">Null-kernel-string</span>/imm32
+<span id="L117" class="LineNr">117 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>/imm32
 <span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L119" class="LineNr">119 </span>    e8/call  kernel-string-equal/disp32
+<span id="L119" class="LineNr">119 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L121" class="LineNr">121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L121" class="LineNr">121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L122" class="LineNr">122 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L124" class="LineNr">124 </span>    68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-empty-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L128" class="LineNr">128 </span>    e8/call  check-ints-equal/disp32
+<span id="L128" class="LineNr">128 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-null-kernel-string-with-non-empty-array</span>:
+<span id="L133" class="LineNr">133 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L133'>test-compare-null-kernel-string-with-non-empty-array</a></span>:
 <span id="L134" class="LineNr">134 </span>    <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L136" class="LineNr">136 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L137" class="LineNr">137 </span>    68/push  <span class="SpecialChar">Null-kernel-string</span>/imm32
+<span id="L137" class="LineNr">137 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>/imm32
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L139" class="LineNr">139 </span>    e8/call  kernel-string-equal/disp32
+<span id="L139" class="LineNr">139 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L142" class="LineNr">142 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L144" class="LineNr">144 </span>    68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L148" class="LineNr">148 </span>    e8/call  check-ints-equal/disp32
+<span id="L148" class="LineNr">148 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-equal-array</span>:
+<span id="L153" class="LineNr">153 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L153'>test-compare-kernel-string-with-equal-array</a></span>:
 <span id="L154" class="LineNr">154 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
 <span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L156" class="LineNr">156 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L157" class="LineNr">157 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L157" class="LineNr">157 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L158" class="LineNr">158 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L159" class="LineNr">159 </span>    e8/call  kernel-string-equal/disp32
+<span id="L159" class="LineNr">159 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L161" class="LineNr">161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L162" class="LineNr">162 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L163" class="LineNr">163 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L164" class="LineNr">164 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L168" class="LineNr">168 </span>    e8/call  check-ints-equal/disp32
+<span id="L168" class="LineNr">168 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L169" class="LineNr">169 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L170" class="LineNr">170 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L170" class="LineNr">170 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-inequal-array</span>:
+<span id="L173" class="LineNr">173 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L173'>test-compare-kernel-string-with-inequal-array</a></span>:
 <span id="L174" class="LineNr">174 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
 <span id="L175" class="LineNr">175 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L176" class="LineNr">176 </span>    68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
-<span id="L177" class="LineNr">177 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L177" class="LineNr">177 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L179" class="LineNr">179 </span>    e8/call  kernel-string-equal/disp32
+<span id="L179" class="LineNr">179 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L182" class="LineNr">182 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L184" class="LineNr">184 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L188" class="LineNr">188 </span>    e8/call  check-ints-equal/disp32
+<span id="L188" class="LineNr">188 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-empty-array</span>:
+<span id="L193" class="LineNr">193 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L193'>test-compare-kernel-string-with-empty-array</a></span>:
 <span id="L194" class="LineNr">194 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
 <span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L196" class="LineNr">196 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L197" class="LineNr">197 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L197" class="LineNr">197 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L199" class="LineNr">199 </span>    e8/call  kernel-string-equal/disp32
+<span id="L199" class="LineNr">199 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L200" class="LineNr">200 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L201" class="LineNr">201 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L201" class="LineNr">201 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L202" class="LineNr">202 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L204" class="LineNr">204 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L208" class="LineNr">208 </span>    e8/call  check-ints-equal/disp32
+<span id="L208" class="LineNr">208 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L209" class="LineNr">209 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L210" class="LineNr">210 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L210" class="LineNr">210 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-shorter-array</span>:
+<span id="L213" class="LineNr">213 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L213'>test-compare-kernel-string-with-shorter-array</a></span>:
 <span id="L214" class="LineNr">214 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
 <span id="L215" class="LineNr">215 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L216" class="LineNr">216 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L217" class="LineNr">217 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L217" class="LineNr">217 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L219" class="LineNr">219 </span>    e8/call  kernel-string-equal/disp32
+<span id="L219" class="LineNr">219 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L221" class="LineNr">221 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L221" class="LineNr">221 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L222" class="LineNr">222 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L224" class="LineNr">224 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-shorter-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L228" class="LineNr">228 </span>    e8/call  check-ints-equal/disp32
+<span id="L228" class="LineNr">228 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L229" class="LineNr">229 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L230" class="LineNr">230 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L230" class="LineNr">230 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-longer-array</span>:
+<span id="L233" class="LineNr">233 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L233'>test-compare-kernel-string-with-longer-array</a></span>:
 <span id="L234" class="LineNr">234 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
 <span id="L235" class="LineNr">235 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L236" class="LineNr">236 </span>    68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
-<span id="L237" class="LineNr">237 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L237" class="LineNr">237 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L238" class="LineNr">238 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L239" class="LineNr">239 </span>    e8/call  kernel-string-equal/disp32
+<span id="L239" class="LineNr">239 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L241" class="LineNr">241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L241" class="LineNr">241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L242" class="LineNr">242 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L243" class="LineNr">243 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L244" class="LineNr">244 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-longer-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L248" class="LineNr">248 </span>    e8/call  check-ints-equal/disp32
+<span id="L248" class="LineNr">248 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L250" class="LineNr">250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L250" class="LineNr">250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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>== data
 <span id="L254" class="LineNr">254 </span>
-<span id="L255" class="LineNr">255 </span><span class="SpecialChar">Null-kernel-string</span>:
+<span id="L255" class="LineNr">255 </span><span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>:
 <span id="L256" class="LineNr">256 </span>    00/null
-<span id="L257" class="LineNr">257 </span><span class="SpecialChar">Abc-kernel-string</span>:
+<span id="L257" class="LineNr">257 </span><span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>:
 <span id="L258" class="LineNr">258 </span>    41/A 62/b 63/c 00/null
 <span id="L259" class="LineNr">259 </span>
 <span id="L260" class="LineNr">260 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/subx/053new_segment.subx.html b/html/subx/053new_segment.subx.html
index 563318e7..e51b1b21 100644
--- a/html/subx/053new_segment.subx.html
+++ b/html/subx/053new_segment.subx.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
 .subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -73,43 +68,43 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr">10 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L11" class="LineNr">11 </span>    68/push  0x1000/imm32
 <span id="L12" class="LineNr">12 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L13" class="LineNr">13 </span>    e8/call  new-segment/disp32
+<span id="L13" class="LineNr">13 </span>    e8/call  <a href='053new_segment.subx.html#L25'>new-segment</a>/disp32
 <span id="L14" class="LineNr">14 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L15" class="LineNr">15 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L15" class="LineNr">15 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L16" class="LineNr">16 </span>
 <span id="L17" class="LineNr">17 </span>    <span class="subxComment"># write to *EAX to check that we have access to the newly-allocated segment</span>
-<span id="L18" class="LineNr">18 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x34/imm32        <span class="subxComment"># copy to *EAX</span>
+<span id="L18" class="LineNr">18 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x34/imm32        <span class="subxComment"># copy to *EAX</span>
 <span id="L19" class="LineNr">19 </span>
 <span id="L20" class="LineNr">20 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L21" class="LineNr">21 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L21" class="LineNr">21 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L22" class="LineNr">22 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L23" class="LineNr">23 </span>    cd/syscall  0x80/imm8
 <span id="L24" class="LineNr">24 </span>
-<span id="L25" class="LineNr">25 </span><span class="subxFunction">new-segment</span>:  <span class="subxComment"># len : int -&gt; address</span>
+<span id="L25" class="LineNr">25 </span><span class="subxFunction"><a href='053new_segment.subx.html#L25'>new-segment</a></span>:  <span class="subxComment"># len : int -&gt; address</span>
 <span id="L26" class="LineNr">26 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L27" class="LineNr">27 </span>    55/push-EBP
-<span id="L28" class="LineNr">28 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L28" class="LineNr">28 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L29" class="LineNr">29 </span>    53/push-EBX
 <span id="L30" class="LineNr">30 </span>    <span class="subxComment"># copy len to _mmap-new-segment-&gt;len</span>
 <span id="L31" class="LineNr">31 </span>    <span class="subxComment"># TODO: compute _mmap-new-segment+4 before runtime</span>
-<span id="L32" class="LineNr">32 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
-<span id="L33" class="LineNr">33 </span>    bb/copy-to-EBX  _mmap-new-segment/imm32
-<span id="L34" class="LineNr">34 </span>    89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *(EBX+4)</span>
+<span id="L32" class="LineNr">32 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L33" class="LineNr">33 </span>    bb/copy-to-EBX  <a href='053new_segment.subx.html#L49'>_mmap-new-segment</a>/imm32
+<span id="L34" class="LineNr">34 </span>    89/copy                         1/mod/*+disp8   3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EBX+4)</span>
 <span id="L35" class="LineNr">35 </span>    <span class="subxComment"># mmap(_mmap-new-segment)</span>
-<span id="L36" class="LineNr">36 </span>    bb/copy-to-EBX  _mmap-new-segment/imm32
+<span id="L36" class="LineNr">36 </span>    bb/copy-to-EBX  <a href='053new_segment.subx.html#L49'>_mmap-new-segment</a>/imm32
 <span id="L37" class="LineNr">37 </span>    b8/copy-to-EAX  0x5a/imm32/mmap
 <span id="L38" class="LineNr">38 </span>    cd/syscall  0x80/imm8
 <span id="L39" class="LineNr">39 </span><span class="Constant">$new-segment:end</span>:
 <span id="L40" class="LineNr">40 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L41" class="LineNr">41 </span>    5b/pop-to-EBX
-<span id="L42" class="LineNr">42 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L42" class="LineNr">42 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L43" class="LineNr">43 </span>    5d/pop-to-EBP
 <span id="L44" class="LineNr">44 </span>    c3/return
 <span id="L45" class="LineNr">45 </span>
 <span id="L46" class="LineNr">46 </span>== data
 <span id="L47" class="LineNr">47 </span>
 <span id="L48" class="LineNr">48 </span><span class="subxComment"># various constants used here were found in the Linux sources (search for file mman-common.h)</span>
-<span id="L49" class="LineNr">49 </span><span class="subxMinorFunction">_mmap-new-segment</span>:  <span class="subxComment"># type mmap_arg_struct</span>
+<span id="L49" class="LineNr">49 </span><span class="subxMinorFunction"><a href='053new_segment.subx.html#L49'>_mmap-new-segment</a></span>:  <span class="subxComment"># type mmap_arg_struct</span>
 <span id="L50" class="LineNr">50 </span>    <span class="subxComment"># addr</span>
 <span id="L51" class="LineNr">51 </span>    00 00 00 00  <span class="subxComment"># null</span>
 <span id="L52" class="LineNr">52 </span>    <span class="subxComment"># len</span>
diff --git a/html/subx/054string_equal.subx.html b/html/subx/054string_equal.subx.html
index 6c54747f..e9fa32ba 100644
--- a/html/subx/054string_equal.subx.html
+++ b/html/subx/054string_equal.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.Constant { color:#00a0a0; }
-.SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -74,14 +69,14 @@ if ('onhashchange' in window) {
 <span id="L9" class="LineNr">  9 </span>    <span class="subxComment"># run-tests()</span>
 <span id="L10" class="LineNr"> 10 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L11" class="LineNr"> 11 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L12" class="LineNr"> 12 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L13" class="LineNr"> 13 </span>    b8/copy-to-EAX  1/imm32
+<span id="L12" class="LineNr"> 12 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L13" class="LineNr"> 13 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L14" class="LineNr"> 14 </span>    cd/syscall  0x80/imm8
 <span id="L15" class="LineNr"> 15 </span>
-<span id="L16" class="LineNr"> 16 </span><span class="subxFunction">string-equal</span>:  <span class="subxComment"># s : string, benchmark : string -&gt; EAX : boolean</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxFunction"><a href='054string_equal.subx.html#L16'>string-equal</a></span>:  <span class="subxComment"># s : string, benchmark : string -&gt; EAX : boolean</span>
 <span id="L17" class="LineNr"> 17 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L18" class="LineNr"> 18 </span>    55/push-EBP
-<span id="L19" class="LineNr"> 19 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L19" class="LineNr"> 19 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L20" class="LineNr"> 20 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L21" class="LineNr"> 21 </span>    51/push-ECX
 <span id="L22" class="LineNr"> 22 </span>    52/push-EDX
@@ -100,14 +95,14 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxComment">#   s[i]: EAX</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="subxComment">#</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxComment"># var s/EAX : (address array byte)</span>
-<span id="L38" class="LineNr"> 38 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L38" class="LineNr"> 38 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="subxComment"># var benchmark/EBX : (address array byte)</span>
-<span id="L40" class="LineNr"> 40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L40" class="LineNr"> 40 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="subxComment"># if s-&gt;length != b-&gt;length return false</span>
 <span id="L42" class="LineNr"> 42 </span>    <span class="subxComment"># EDX = s-&gt;length</span>
-<span id="L43" class="LineNr"> 43 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to EDX</span>
+<span id="L43" class="LineNr"> 43 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to EDX</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxComment"># compare s-&gt;length and b-&gt;length</span>
-<span id="L45" class="LineNr"> 45 </span>    39/compare                      0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare *EBX with EDX</span>
+<span id="L45" class="LineNr"> 45 </span>    39/compare                      0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EBX with EDX</span>
 <span id="L46" class="LineNr"> 46 </span>    75/jump-if-not-equal  $string-equal:false/disp8
 <span id="L47" class="LineNr"> 47 </span><span class="Constant">$string-equal:lengths</span>:
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># var i/ECX : int = 0</span>
@@ -118,13 +113,13 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span>    40/inc-EAX
 <span id="L54" class="LineNr"> 54 </span><span class="Constant">$string-equal:loop</span>:
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxComment"># if i &gt;= s-&gt;length return true</span>
-<span id="L56" class="LineNr"> 56 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
+<span id="L56" class="LineNr"> 56 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
 <span id="L57" class="LineNr"> 57 </span>    7d/jump-if-greater-or-equal  $string-equal:true/disp8
 <span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># if b[i] != s[i] return false</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxComment"># ESI = s[i]</span>
-<span id="L60" class="LineNr"> 60 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          6/r32/ESI  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ESI</span>
+<span id="L60" class="LineNr"> 60 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ESI</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># compare b[i] with ESI</span>
-<span id="L62" class="LineNr"> 62 </span>    39/compare                      0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          6/r32/ESI  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare *EBX with ESI</span>
+<span id="L62" class="LineNr"> 62 </span>    39/compare                      0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare *EBX with ESI</span>
 <span id="L63" class="LineNr"> 63 </span>    75/jump-if-not-equal  $string-equal:false/disp8
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># ++i</span>
 <span id="L65" class="LineNr"> 65 </span>    41/inc-ECX
@@ -146,90 +141,90 @@ if ('onhashchange' in window) {
 <span id="L81" class="LineNr"> 81 </span>    5a/pop-to-EDX
 <span id="L82" class="LineNr"> 82 </span>    59/pop-to-ECX
 <span id="L83" class="LineNr"> 83 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L85" class="LineNr"> 85 </span>    5d/pop-to-EBP
 <span id="L86" class="LineNr"> 86 </span>    c3/return
 <span id="L87" class="LineNr"> 87 </span>
 <span id="L88" class="LineNr"> 88 </span><span class="subxH1Comment"># - tests</span>
 <span id="L89" class="LineNr"> 89 </span>
-<span id="L90" class="LineNr"> 90 </span><span class="subxTest">test-compare-empty-with-empty-string</span>:
+<span id="L90" class="LineNr"> 90 </span><span class="subxTest"><a href='054string_equal.subx.html#L90'>test-compare-empty-with-empty-string</a></span>:
 <span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># EAX = string-equal(&quot;&quot;, &quot;&quot;)</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L93" class="LineNr"> 93 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L94" class="LineNr"> 94 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L95" class="LineNr"> 95 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L96" class="LineNr"> 96 </span>    e8/call  string-equal/disp32
+<span id="L96" class="LineNr"> 96 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L101" class="LineNr">101 </span>    68/push  <span class="Constant">&quot;F - test-compare-empty-with-empty-string&quot;</span>/imm32
 <span id="L102" class="LineNr">102 </span>    68/push  1/imm32/true
 <span id="L103" class="LineNr">103 </span>    50/push-EAX
 <span id="L104" class="LineNr">104 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L105" class="LineNr">105 </span>    e8/call  check-ints-equal/disp32
+<span id="L105" class="LineNr">105 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L106" class="LineNr">106 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L107" class="LineNr">107 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L107" class="LineNr">107 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L108" class="LineNr">108 </span>    c3/return
 <span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="subxTest">test-compare-empty-with-non-empty-string</span>:  <span class="subxComment"># also checks length-mismatch code path</span>
+<span id="L110" class="LineNr">110 </span><span class="subxTest"><a href='054string_equal.subx.html#L110'>test-compare-empty-with-non-empty-string</a></span>:  <span class="subxComment"># also checks length-mismatch code path</span>
 <span id="L111" class="LineNr">111 </span>    <span class="subxComment"># EAX = string-equal(&quot;&quot;, &quot;Abc&quot;)</span>
 <span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L113" class="LineNr">113 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L114" class="LineNr">114 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
 <span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L116" class="LineNr">116 </span>    e8/call  string-equal/disp32
+<span id="L116" class="LineNr">116 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L118" class="LineNr">118 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L118" class="LineNr">118 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L119" class="LineNr">119 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L121" class="LineNr">121 </span>    68/push  <span class="Constant">&quot;F - test-compare-empty-with-non-empty-string&quot;</span>/imm32
 <span id="L122" class="LineNr">122 </span>    68/push  0/imm32/false
 <span id="L123" class="LineNr">123 </span>    50/push-EAX
 <span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L125" class="LineNr">125 </span>    e8/call  check-ints-equal/disp32
+<span id="L125" class="LineNr">125 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L127" class="LineNr">127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L127" class="LineNr">127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L128" class="LineNr">128 </span>    c3/return
 <span id="L129" class="LineNr">129 </span>
-<span id="L130" class="LineNr">130 </span><span class="subxTest">test-compare-equal-strings</span>:
+<span id="L130" class="LineNr">130 </span><span class="subxTest"><a href='054string_equal.subx.html#L130'>test-compare-equal-strings</a></span>:
 <span id="L131" class="LineNr">131 </span>    <span class="subxComment"># EAX = string-equal(&quot;Abc&quot;, &quot;Abc&quot;)</span>
 <span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L133" class="LineNr">133 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L134" class="LineNr">134 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L136" class="LineNr">136 </span>    e8/call  string-equal/disp32
+<span id="L136" class="LineNr">136 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L139" class="LineNr">139 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L141" class="LineNr">141 </span>    68/push  <span class="Constant">&quot;F - test-compare-equal-strings&quot;</span>/imm32
 <span id="L142" class="LineNr">142 </span>    68/push  1/imm32/true
 <span id="L143" class="LineNr">143 </span>    50/push-EAX
 <span id="L144" class="LineNr">144 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L145" class="LineNr">145 </span>    e8/call  check-ints-equal/disp32
+<span id="L145" class="LineNr">145 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L148" class="LineNr">148 </span>    c3/return
 <span id="L149" class="LineNr">149 </span>
-<span id="L150" class="LineNr">150 </span><span class="subxTest">test-compare-inequal-strings-equal-lengths</span>:
+<span id="L150" class="LineNr">150 </span><span class="subxTest"><a href='054string_equal.subx.html#L150'>test-compare-inequal-strings-equal-lengths</a></span>:
 <span id="L151" class="LineNr">151 </span>    <span class="subxComment"># EAX = string-equal(&quot;Abc&quot;, &quot;Adc&quot;)</span>
 <span id="L152" class="LineNr">152 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L153" class="LineNr">153 </span>    68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
 <span id="L154" class="LineNr">154 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
 <span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L156" class="LineNr">156 </span>    e8/call  string-equal/disp32
+<span id="L156" class="LineNr">156 </span>    e8/call  <a href='054string_equal.subx.html#L16'>string-equal</a>/disp32
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L158" class="LineNr">158 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L158" class="LineNr">158 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L159" class="LineNr">159 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L161" class="LineNr">161 </span>    68/push  <span class="Constant">&quot;F - test-compare-inequal-strings-equal-lengths&quot;</span>/imm32
 <span id="L162" class="LineNr">162 </span>    68/push  0/imm32/false
 <span id="L163" class="LineNr">163 </span>    50/push-EAX
 <span id="L164" class="LineNr">164 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L165" class="LineNr">165 </span>    e8/call  check-ints-equal/disp32
+<span id="L165" class="LineNr">165 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L166" class="LineNr">166 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L167" class="LineNr">167 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L167" class="LineNr">167 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L168" class="LineNr">168 </span>    c3/return
 <span id="L169" class="LineNr">169 </span>
 <span id="L170" class="LineNr">170 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/subx/055trace.subx.html b/html/subx/055trace.subx.html
index e9abb3bb..7f0951d7 100644
--- a/html/subx/055trace.subx.html
+++ b/html/subx/055trace.subx.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
-.CommentedCode { color: #6c6c6c; }
-.subxH1Comment { color:#00ffff; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.Constant { color: #008787; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -88,12 +83,12 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span>== data
 <span id="L23" class="LineNr"> 23 </span>
 <span id="L24" class="LineNr"> 24 </span><span class="subxComment"># We'll save the address of the trace segment here.</span>
-<span id="L25" class="LineNr"> 25 </span><span class="SpecialChar">Trace-stream</span>:
+<span id="L25" class="LineNr"> 25 </span><span class="SpecialChar"><a href='055trace.subx.html#L25'>Trace-stream</a></span>:
 <span id="L26" class="LineNr"> 26 </span>    00 00 00 00
 <span id="L27" class="LineNr"> 27 </span>
 <span id="L28" class="LineNr"> 28 </span><span class="subxComment"># Fake trace-stream for tests.</span>
 <span id="L29" class="LineNr"> 29 </span><span class="subxComment"># Also illustrates the layout of the real trace-stream (segment).</span>
-<span id="L30" class="LineNr"> 30 </span><span class="subxMinorFunction">_test-trace-stream</span>:
+<span id="L30" class="LineNr"> 30 </span><span class="subxMinorFunction"><a href='055trace.subx.html#L30'>_test-trace-stream</a></span>:
 <span id="L31" class="LineNr"> 31 </span>    <span class="subxComment"># current write index</span>
 <span id="L32" class="LineNr"> 32 </span>    00 00 00 00
 <span id="L33" class="LineNr"> 33 </span>    <span class="subxComment"># current read index</span>
@@ -112,32 +107,32 @@ if ('onhashchange' in window) {
 <span id="L46" class="LineNr"> 46 </span>    <span class="subxComment"># run-tests()</span>
 <span id="L47" class="LineNr"> 47 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L49" class="LineNr"> 49 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L50" class="LineNr"> 50 </span>    b8/copy-to-EAX  1/imm32
+<span id="L49" class="LineNr"> 49 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L50" class="LineNr"> 50 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L51" class="LineNr"> 51 </span>    cd/syscall  0x80/imm8
 <span id="L52" class="LineNr"> 52 </span>
 <span id="L53" class="LineNr"> 53 </span><span class="subxComment"># Allocate a new segment for the trace stream, initialize its length, and save its address to Trace-stream.</span>
 <span id="L54" class="LineNr"> 54 </span><span class="subxComment"># The Trace-stream segment will consist of variable-length lines separated by newlines (0x0a)</span>
-<span id="L55" class="LineNr"> 55 </span><span class="subxFunction">initialize-trace-stream</span>:
+<span id="L55" class="LineNr"> 55 </span><span class="subxFunction"><a href='055trace.subx.html#L55'>initialize-trace-stream</a></span>:
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># EAX = new-segment(0x1000)</span>
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L58" class="LineNr"> 58 </span>    68/push  0x1000/imm32/N
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L60" class="LineNr"> 60 </span>    e8/call  new-segment/disp32
+<span id="L60" class="LineNr"> 60 </span>    e8/call  <a href='053new_segment.subx.html#L25'>new-segment</a>/disp32
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L62" class="LineNr"> 62 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L62" class="LineNr"> 62 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># copy EAX to *Trace-stream</span>
-<span id="L64" class="LineNr"> 64 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Trace-stream</span>/disp32               <span class="subxComment"># copy EAX to *Trace-stream</span>
+<span id="L64" class="LineNr"> 64 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar"><a href='055trace.subx.html#L25'>Trace-stream</a></span>/disp32               <span class="subxComment"># copy EAX to *Trace-stream</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># Trace-stream-&gt;length = 0x1000/N - 12</span>
-<span id="L66" class="LineNr"> 66 </span>    c7          0/copy              1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0xff4/imm32       <span class="subxComment"># copy 0xff4 to *(EAX+8)</span>
+<span id="L66" class="LineNr"> 66 </span>    c7          0/subop/copy        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0xff4/imm32       <span class="subxComment"># copy 0xff4 to *(EAX+8)</span>
 <span id="L67" class="LineNr"> 67 </span>    c3/return
 <span id="L68" class="LineNr"> 68 </span>
 <span id="L69" class="LineNr"> 69 </span><span class="subxComment"># Append a string to the given trace stream.</span>
 <span id="L70" class="LineNr"> 70 </span><span class="subxComment"># Silently give up if it's already full. Or truncate the string if there isn't enough room.</span>
-<span id="L71" class="LineNr"> 71 </span><span class="subxFunction">trace</span>:  <span class="subxComment"># t : (address trace-stream), line : string</span>
+<span id="L71" class="LineNr"> 71 </span><span class="subxFunction"><a href='055trace.subx.html#L71'>trace</a></span>:  <span class="subxComment"># t : (address trace-stream), line : string</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L73" class="LineNr"> 73 </span>    55/push-EBP
-<span id="L74" class="LineNr"> 74 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L74" class="LineNr"> 74 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L76" class="LineNr"> 76 </span>    50/push-EAX
 <span id="L77" class="LineNr"> 77 </span>    51/push-ECX
@@ -146,48 +141,48 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span>    56/push-ESI
 <span id="L81" class="LineNr"> 81 </span>    57/push-EDI
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># EDI = t</span>
-<span id="L83" class="LineNr"> 83 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L83" class="LineNr"> 83 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="subxComment"># ESI = line</span>
-<span id="L85" class="LineNr"> 85 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L85" class="LineNr"> 85 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># ECX = t-&gt;write</span>
-<span id="L87" class="LineNr"> 87 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L87" class="LineNr"> 87 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># EDX = t-&gt;length</span>
-<span id="L89" class="LineNr"> 89 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
+<span id="L89" class="LineNr"> 89 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
 <span id="L90" class="LineNr"> 90 </span>    <span class="subxComment"># EAX = _append-3(&amp;t-&gt;data[t-&gt;write], &amp;t-&gt;data[t-&gt;length], line)</span>
 <span id="L91" class="LineNr"> 91 </span>    <span class="subxS2Comment"># . . push line</span>
 <span id="L92" class="LineNr"> 92 </span>    56/push-ESI
 <span id="L93" class="LineNr"> 93 </span>    <span class="subxS2Comment"># . . push &amp;t-&gt;data[t-&gt;length]</span>
-<span id="L94" class="LineNr"> 94 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EDX+12 to EBX</span>
+<span id="L94" class="LineNr"> 94 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+EDX+12 to EBX</span>
 <span id="L95" class="LineNr"> 95 </span>    53/push-EBX
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxS2Comment"># . . push &amp;t-&gt;data[t-&gt;write]</span>
-<span id="L97" class="LineNr"> 97 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
+<span id="L97" class="LineNr"> 97 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
 <span id="L98" class="LineNr"> 98 </span>    53/push-EBX
 <span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L100" class="LineNr">100 </span>    e8/call  _append-3/disp32
+<span id="L100" class="LineNr">100 </span>    e8/call  <a href='055trace.subx.html#L279'>_append-3</a>/disp32
 <span id="L101" class="LineNr">101 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L102" class="LineNr">102 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L102" class="LineNr">102 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L103" class="LineNr">103 </span>    <span class="subxComment"># if EAX == 0 return</span>
-<span id="L104" class="LineNr">104 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EDX</span>
+<span id="L104" class="LineNr">104 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EDX</span>
 <span id="L105" class="LineNr">105 </span>    74/jump-if-equal  $trace:end/disp8
 <span id="L106" class="LineNr">106 </span>    <span class="subxComment"># t-&gt;write += EAX</span>
-<span id="L107" class="LineNr">107 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
+<span id="L107" class="LineNr">107 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
 <span id="L108" class="LineNr">108 </span>    <span class="subxComment"># refresh ECX = t-&gt;write</span>
-<span id="L109" class="LineNr">109 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L109" class="LineNr">109 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
 <span id="L110" class="LineNr">110 </span>    <span class="subxComment"># EAX = _append-3(&amp;t-&gt;data[t-&gt;write], &amp;t-&gt;data[t-&gt;length], line)</span>
 <span id="L111" class="LineNr">111 </span>    <span class="subxS2Comment"># . . push line</span>
-<span id="L112" class="LineNr">112 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
+<span id="L112" class="LineNr">112 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
 <span id="L113" class="LineNr">113 </span>    <span class="subxS2Comment"># . . push &amp;t-&gt;data[t-&gt;length]</span>
-<span id="L114" class="LineNr">114 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EDX+12 to EBX</span>
+<span id="L114" class="LineNr">114 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  2/index/EDX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+EDX+12 to EBX</span>
 <span id="L115" class="LineNr">115 </span>    53/push-EBX
 <span id="L116" class="LineNr">116 </span>    <span class="subxS2Comment"># . . push &amp;t-&gt;data[t-&gt;write]</span>
-<span id="L117" class="LineNr">117 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
+<span id="L117" class="LineNr">117 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
 <span id="L118" class="LineNr">118 </span>    53/push-EBX
 <span id="L119" class="LineNr">119 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L120" class="LineNr">120 </span>    e8/call  _append-3/disp32
+<span id="L120" class="LineNr">120 </span>    e8/call  <a href='055trace.subx.html#L279'>_append-3</a>/disp32
 <span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L122" class="LineNr">122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L122" class="LineNr">122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxComment"># t-&gt;write += EAX</span>
-<span id="L124" class="LineNr">124 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
+<span id="L124" class="LineNr">124 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
 <span id="L125" class="LineNr">125 </span><span class="Constant">$trace:end</span>:
 <span id="L126" class="LineNr">126 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L127" class="LineNr">127 </span>    5f/pop-to-EDI
@@ -197,187 +192,187 @@ if ('onhashchange' in window) {
 <span id="L131" class="LineNr">131 </span>    59/pop-to-ECX
 <span id="L132" class="LineNr">132 </span>    58/pop-to-EAX
 <span id="L133" class="LineNr">133 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L134" class="LineNr">134 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L134" class="LineNr">134 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L135" class="LineNr">135 </span>    5d/pop-to-EBP
 <span id="L136" class="LineNr">136 </span>    c3/return
 <span id="L137" class="LineNr">137 </span>
-<span id="L138" class="LineNr">138 </span><span class="subxFunction">clear-trace-stream</span>:  <span class="subxComment"># t : (address trace-stream)</span>
+<span id="L138" class="LineNr">138 </span><span class="subxFunction"><a href='055trace.subx.html#L138'>clear-trace-stream</a></span>:  <span class="subxComment"># t : (address trace-stream)</span>
 <span id="L139" class="LineNr">139 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L140" class="LineNr">140 </span>    55/push-EBP
-<span id="L141" class="LineNr">141 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L141" class="LineNr">141 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L142" class="LineNr">142 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L143" class="LineNr">143 </span>    50/push-EAX
 <span id="L144" class="LineNr">144 </span>    51/push-ECX
 <span id="L145" class="LineNr">145 </span>    <span class="subxComment"># EAX = t</span>
-<span id="L146" class="LineNr">146 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L146" class="LineNr">146 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L147" class="LineNr">147 </span>    <span class="subxComment"># ECX = t-&gt;length</span>
-<span id="L148" class="LineNr">148 </span>    8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EAX+8) to ECX</span>
+<span id="L148" class="LineNr">148 </span>    8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EAX+8) to ECX</span>
 <span id="L149" class="LineNr">149 </span>    <span class="subxComment"># ECX = &amp;t-&gt;data[t-&gt;length]</span>
-<span id="L150" class="LineNr">150 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+ECX+12 to ECX</span>
+<span id="L150" class="LineNr">150 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+12 to ECX</span>
 <span id="L151" class="LineNr">151 </span>    <span class="subxComment"># t-&gt;write = 0</span>
-<span id="L152" class="LineNr">152 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L152" class="LineNr">152 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L153" class="LineNr">153 </span>    <span class="subxComment"># t-&gt;read = 0</span>
-<span id="L154" class="LineNr">154 </span>    c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EAX+4)</span>
+<span id="L154" class="LineNr">154 </span>    c7          0/subop/copy        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EAX+4)</span>
 <span id="L155" class="LineNr">155 </span>    <span class="subxComment"># EAX = t-&gt;data</span>
-<span id="L156" class="LineNr">156 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to EAX</span>
+<span id="L156" class="LineNr">156 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to EAX</span>
 <span id="L157" class="LineNr">157 </span>    <span class="subxComment"># while (true)</span>
 <span id="L158" class="LineNr">158 </span><span class="Constant">$clear-trace-stream:loop</span>:
 <span id="L159" class="LineNr">159 </span>    <span class="subxComment"># if EAX &gt;= ECX break</span>
-<span id="L160" class="LineNr">160 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
+<span id="L160" class="LineNr">160 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
 <span id="L161" class="LineNr">161 </span>    7d/jump-if-greater-or-equal  $clear-trace-stream:end/disp8
 <span id="L162" class="LineNr">162 </span>    <span class="subxComment"># *EAX = 0</span>
-<span id="L163" class="LineNr">163 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L163" class="LineNr">163 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L164" class="LineNr">164 </span>    <span class="subxComment"># EAX += 4</span>
-<span id="L165" class="LineNr">165 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
+<span id="L165" class="LineNr">165 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
 <span id="L166" class="LineNr">166 </span>    eb/jump  $clear-trace-stream:loop/disp8
 <span id="L167" class="LineNr">167 </span><span class="Constant">$clear-trace-stream:end</span>:
 <span id="L168" class="LineNr">168 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L169" class="LineNr">169 </span>    59/pop-to-ECX
 <span id="L170" class="LineNr">170 </span>    58/pop-to-EAX
 <span id="L171" class="LineNr">171 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L172" class="LineNr">172 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L172" class="LineNr">172 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L173" class="LineNr">173 </span>    5d/pop-to-EBP
 <span id="L174" class="LineNr">174 </span>    c3/return
 <span id="L175" class="LineNr">175 </span>
 <span id="L176" class="LineNr">176 </span><span class="subxH1Comment"># - tests</span>
 <span id="L177" class="LineNr">177 </span>
-<span id="L178" class="LineNr">178 </span><span class="subxTest">test-trace-single</span>:
+<span id="L178" class="LineNr">178 </span><span class="subxTest"><a href='055trace.subx.html#L178'>test-trace-single</a></span>:
 <span id="L179" class="LineNr">179 </span>    <span class="subxComment"># clear-trace-stream(_test-trace-stream)</span>
 <span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L181" class="LineNr">181 </span>    68/push  _test-trace-stream/imm32
+<span id="L181" class="LineNr">181 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L182" class="LineNr">182 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L183" class="LineNr">183 </span>    e8/call  clear-trace-stream/disp32
+<span id="L183" class="LineNr">183 </span>    e8/call  <a href='055trace.subx.html#L138'>clear-trace-stream</a>/disp32
 <span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L185" class="LineNr">185 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L185" class="LineNr">185 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L186" class="LineNr">186 </span>    <span class="subxComment"># trace(_test-trace-stream, &quot;Ab&quot;)</span>
 <span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L188" class="LineNr">188 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L189" class="LineNr">189 </span>    68/push  _test-trace-stream/imm32
+<span id="L189" class="LineNr">189 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L190" class="LineNr">190 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L191" class="LineNr">191 </span>    e8/call  trace/disp32
+<span id="L191" class="LineNr">191 </span>    e8/call  <a href='055trace.subx.html#L71'>trace</a>/disp32
 <span id="L192" class="LineNr">192 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L193" class="LineNr">193 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L193" class="LineNr">193 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L194" class="LineNr">194 </span>    <span class="subxComment"># check-ints-equal(*_test-trace-stream-&gt;data, 41/A 62/b 0a/newline 00, msg)</span>
 <span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L196" class="LineNr">196 </span>    68/push  <span class="Constant">&quot;F - test-trace-single&quot;</span>/imm32
 <span id="L197" class="LineNr">197 </span>    68/push  0x0a6241/imm32/Ab-newline
 <span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . push *_test-trace-stream-&gt;data</span>
-<span id="L199" class="LineNr">199 </span>    b8/copy-to-EAX  _test-trace-stream/imm32
-<span id="L200" class="LineNr">200 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L199" class="LineNr">199 </span>    b8/copy-to-EAX  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
+<span id="L200" class="LineNr">200 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L201" class="LineNr">201 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L202" class="LineNr">202 </span>    e8/call  check-ints-equal/disp32
+<span id="L202" class="LineNr">202 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L204" class="LineNr">204 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L204" class="LineNr">204 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L205" class="LineNr">205 </span>    <span class="subxComment"># end</span>
 <span id="L206" class="LineNr">206 </span>    c3/return
 <span id="L207" class="LineNr">207 </span>
-<span id="L208" class="LineNr">208 </span><span class="subxTest">test-trace-appends</span>:
+<span id="L208" class="LineNr">208 </span><span class="subxTest"><a href='055trace.subx.html#L208'>test-trace-appends</a></span>:
 <span id="L209" class="LineNr">209 </span>    <span class="subxComment"># clear-trace-stream(_test-trace-stream)</span>
 <span id="L210" class="LineNr">210 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L211" class="LineNr">211 </span>    68/push  _test-trace-stream/imm32
+<span id="L211" class="LineNr">211 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L212" class="LineNr">212 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L213" class="LineNr">213 </span>    e8/call  clear-trace-stream/disp32
+<span id="L213" class="LineNr">213 </span>    e8/call  <a href='055trace.subx.html#L138'>clear-trace-stream</a>/disp32
 <span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L215" class="LineNr">215 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L215" class="LineNr">215 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L216" class="LineNr">216 </span>    <span class="subxComment"># trace(_test-trace-stream, &quot;C&quot;)</span>
 <span id="L217" class="LineNr">217 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L218" class="LineNr">218 </span>    68/push  <span class="Constant">&quot;C&quot;</span>/imm32
-<span id="L219" class="LineNr">219 </span>    68/push  _test-trace-stream/imm32
+<span id="L219" class="LineNr">219 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L221" class="LineNr">221 </span>    e8/call  trace/disp32
+<span id="L221" class="LineNr">221 </span>    e8/call  <a href='055trace.subx.html#L71'>trace</a>/disp32
 <span id="L222" class="LineNr">222 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L223" class="LineNr">223 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L223" class="LineNr">223 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L224" class="LineNr">224 </span>    <span class="subxComment"># trace(_test-trace-stream, &quot;D&quot;)</span>
 <span id="L225" class="LineNr">225 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L226" class="LineNr">226 </span>    68/push  <span class="Constant">&quot;D&quot;</span>/imm32
-<span id="L227" class="LineNr">227 </span>    68/push  _test-trace-stream/imm32
+<span id="L227" class="LineNr">227 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L228" class="LineNr">228 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L229" class="LineNr">229 </span>    e8/call  trace/disp32
+<span id="L229" class="LineNr">229 </span>    e8/call  <a href='055trace.subx.html#L71'>trace</a>/disp32
 <span id="L230" class="LineNr">230 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L231" class="LineNr">231 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L231" class="LineNr">231 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L232" class="LineNr">232 </span>    <span class="subxComment"># check-ints-equal(*_test-trace-stream-&gt;data, 43/C 0a/newline 44/D 0a/newline, msg)</span>
 <span id="L233" class="LineNr">233 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L234" class="LineNr">234 </span>    68/push  <span class="Constant">&quot;F - test-trace-appends&quot;</span>/imm32
 <span id="L235" class="LineNr">235 </span>    68/push  0x0a440a43/imm32/C-newline-D-newline
 <span id="L236" class="LineNr">236 </span>    <span class="subxS2Comment"># . . push *_test-trace-stream-&gt;data</span>
-<span id="L237" class="LineNr">237 </span>    b8/copy-to-EAX  _test-trace-stream/imm32
-<span id="L238" class="LineNr">238 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L237" class="LineNr">237 </span>    b8/copy-to-EAX  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
+<span id="L238" class="LineNr">238 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L239" class="LineNr">239 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L240" class="LineNr">240 </span>    e8/call  check-ints-equal/disp32
+<span id="L240" class="LineNr">240 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L241" class="LineNr">241 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L242" class="LineNr">242 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L242" class="LineNr">242 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L243" class="LineNr">243 </span>    <span class="subxComment"># end</span>
 <span id="L244" class="LineNr">244 </span>    c3/return
 <span id="L245" class="LineNr">245 </span>
-<span id="L246" class="LineNr">246 </span><span class="subxTest">test-trace-empty-line</span>:
+<span id="L246" class="LineNr">246 </span><span class="subxTest"><a href='055trace.subx.html#L246'>test-trace-empty-line</a></span>:
 <span id="L247" class="LineNr">247 </span>    <span class="subxComment"># clear-trace-stream(_test-trace-stream)</span>
 <span id="L248" class="LineNr">248 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L249" class="LineNr">249 </span>    68/push  _test-trace-stream/imm32
+<span id="L249" class="LineNr">249 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L250" class="LineNr">250 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L251" class="LineNr">251 </span>    e8/call  clear-trace-stream/disp32
+<span id="L251" class="LineNr">251 </span>    e8/call  <a href='055trace.subx.html#L138'>clear-trace-stream</a>/disp32
 <span id="L252" class="LineNr">252 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L253" class="LineNr">253 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L253" class="LineNr">253 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L254" class="LineNr">254 </span>    <span class="subxComment"># trace(_test-trace-stream, &quot;&quot;)</span>
 <span id="L255" class="LineNr">255 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L256" class="LineNr">256 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L257" class="LineNr">257 </span>    68/push  _test-trace-stream/imm32
+<span id="L257" class="LineNr">257 </span>    68/push  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
 <span id="L258" class="LineNr">258 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L259" class="LineNr">259 </span>    e8/call  trace/disp32
+<span id="L259" class="LineNr">259 </span>    e8/call  <a href='055trace.subx.html#L71'>trace</a>/disp32
 <span id="L260" class="LineNr">260 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L261" class="LineNr">261 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L261" class="LineNr">261 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L262" class="LineNr">262 </span>    <span class="subxComment"># check-ints-equal(*_test-trace-stream-&gt;data, 0, msg)</span>
 <span id="L263" class="LineNr">263 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L264" class="LineNr">264 </span>    68/push  <span class="Constant">&quot;F - test-trace-empty-line&quot;</span>/imm32
 <span id="L265" class="LineNr">265 </span>    68/push  0/imm32
 <span id="L266" class="LineNr">266 </span>    <span class="subxS2Comment"># . . push *_test-trace-stream-&gt;data</span>
-<span id="L267" class="LineNr">267 </span>    b8/copy-to-EAX  _test-trace-stream/imm32
-<span id="L268" class="LineNr">268 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L267" class="LineNr">267 </span>    b8/copy-to-EAX  <a href='055trace.subx.html#L30'>_test-trace-stream</a>/imm32
+<span id="L268" class="LineNr">268 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L269" class="LineNr">269 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L270" class="LineNr">270 </span>    e8/call  check-ints-equal/disp32
+<span id="L270" class="LineNr">270 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L271" class="LineNr">271 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L272" class="LineNr">272 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L272" class="LineNr">272 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L273" class="LineNr">273 </span>    <span class="subxComment"># end</span>
 <span id="L274" class="LineNr">274 </span>    c3/return
 <span id="L275" class="LineNr">275 </span>
 <span id="L276" class="LineNr">276 </span><span class="subxH1Comment"># - helpers</span>
 <span id="L277" class="LineNr">277 </span>
 <span id="L278" class="LineNr">278 </span><span class="subxComment"># 3-argument variant of _append</span>
-<span id="L279" class="LineNr">279 </span><span class="subxMinorFunction">_append-3</span>:  <span class="subxComment"># out : address, outend : address, s : (array byte) -&gt; num_bytes_appended/EAX</span>
+<span id="L279" class="LineNr">279 </span><span class="subxMinorFunction"><a href='055trace.subx.html#L279'>_append-3</a></span>:  <span class="subxComment"># out : address, outend : address, s : (array byte) -&gt; num_bytes_appended/EAX</span>
 <span id="L280" class="LineNr">280 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L281" class="LineNr">281 </span>    55/push-EBP
-<span id="L282" class="LineNr">282 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L282" class="LineNr">282 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L283" class="LineNr">283 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L284" class="LineNr">284 </span>    51/push-ECX
 <span id="L285" class="LineNr">285 </span>    <span class="subxComment"># _append-4(out, outend, &amp;s-&gt;data[0], &amp;s-&gt;data[s-&gt;length]) -&gt; num_bytes_appended/EAX</span>
 <span id="L286" class="LineNr">286 </span>    <span class="subxS2Comment"># . . push &amp;s-&gt;data[s-&gt;length]</span>
-<span id="L287" class="LineNr">287 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to EAX</span>
-<span id="L288" class="LineNr">288 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L289" class="LineNr">289 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
+<span id="L287" class="LineNr">287 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        0/r32/EAX   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EAX</span>
+<span id="L288" class="LineNr">288 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L289" class="LineNr">289 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+4 to ECX</span>
 <span id="L290" class="LineNr">290 </span>    51/push-ECX
 <span id="L291" class="LineNr">291 </span>    <span class="subxS2Comment"># . . push &amp;s-&gt;data[0]</span>
-<span id="L292" class="LineNr">292 </span>    8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+4 to ECX</span>
+<span id="L292" class="LineNr">292 </span>    8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+4 to ECX</span>
 <span id="L293" class="LineNr">293 </span>    51/push-ECX
 <span id="L294" class="LineNr">294 </span>    <span class="subxS2Comment"># . . push outend</span>
-<span id="L295" class="LineNr">295 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L295" class="LineNr">295 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L296" class="LineNr">296 </span>    <span class="subxS2Comment"># . . push out</span>
-<span id="L297" class="LineNr">297 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L297" class="LineNr">297 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L298" class="LineNr">298 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L299" class="LineNr">299 </span>    e8/call  _append-4/disp32
+<span id="L299" class="LineNr">299 </span>    e8/call  <a href='055trace.subx.html#L311'>_append-4</a>/disp32
 <span id="L300" class="LineNr">300 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L301" class="LineNr">301 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L301" class="LineNr">301 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L302" class="LineNr">302 </span><span class="Constant">$_append-3:end</span>:
 <span id="L303" class="LineNr">303 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L304" class="LineNr">304 </span>    59/pop-to-ECX
 <span id="L305" class="LineNr">305 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L306" class="LineNr">306 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L306" class="LineNr">306 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L307" class="LineNr">307 </span>    5d/pop-to-EBP
 <span id="L308" class="LineNr">308 </span>    c3/return
 <span id="L309" class="LineNr">309 </span>
 <span id="L310" class="LineNr">310 </span><span class="subxComment"># 4-argument variant of _append</span>
-<span id="L311" class="LineNr">311 </span><span class="subxMinorFunction">_append-4</span>:  <span class="subxComment"># out : address, outend : address, in : address, inend : address -&gt; num_bytes_appended/EAX</span>
+<span id="L311" class="LineNr">311 </span><span class="subxMinorFunction"><a href='055trace.subx.html#L311'>_append-4</a></span>:  <span class="subxComment"># out : address, outend : address, in : address, inend : address -&gt; num_bytes_appended/EAX</span>
 <span id="L312" class="LineNr">312 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L313" class="LineNr">313 </span>    55/push-EBP
-<span id="L314" class="LineNr">314 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L314" class="LineNr">314 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L315" class="LineNr">315 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L316" class="LineNr">316 </span>    51/push-ECX
 <span id="L317" class="LineNr">317 </span>    52/push-EDX
@@ -387,23 +382,23 @@ if ('onhashchange' in window) {
 <span id="L321" class="LineNr">321 </span>    <span class="subxComment"># EAX/num_bytes_appended = 0</span>
 <span id="L322" class="LineNr">322 </span>    b8/copy-to-EAX  0/imm32
 <span id="L323" class="LineNr">323 </span>    <span class="subxComment"># EDI = out</span>
-<span id="L324" class="LineNr">324 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L324" class="LineNr">324 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L325" class="LineNr">325 </span>    <span class="subxComment"># EDX = outend</span>
-<span id="L326" class="LineNr">326 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L326" class="LineNr">326 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
 <span id="L327" class="LineNr">327 </span>    <span class="subxComment"># ESI = in</span>
-<span id="L328" class="LineNr">328 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+16) to ESI</span>
+<span id="L328" class="LineNr">328 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to ESI</span>
 <span id="L329" class="LineNr">329 </span>    <span class="subxComment"># ECX = inend</span>
-<span id="L330" class="LineNr">330 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+20) to ECX</span>
+<span id="L330" class="LineNr">330 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+20) to ECX</span>
 <span id="L331" class="LineNr">331 </span><span class="Constant">$_append-4:loop</span>:
 <span id="L332" class="LineNr">332 </span>    <span class="subxComment"># if ESI/in &gt;= ECX/inend break</span>
-<span id="L333" class="LineNr">333 </span>    39/compare                      3/mod/direct    6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ESI with ECX</span>
+<span id="L333" class="LineNr">333 </span>    39/compare                      3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ESI with ECX</span>
 <span id="L334" class="LineNr">334 </span>    7d/jump-if-greater-or-equal  $_append-4:end/disp8
 <span id="L335" class="LineNr">335 </span>    <span class="subxComment"># if EDI/out &gt;= EDX/outend break  (for now silently ignore filled up buffer)</span>
-<span id="L336" class="LineNr">336 </span>    39/compare                      3/mod/direct    7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EDI with EDX</span>
+<span id="L336" class="LineNr">336 </span>    39/compare                      3/mod/direct    7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDI with EDX</span>
 <span id="L337" class="LineNr">337 </span>    7d/jump-if-greater-or-equal  $_append-4:end/disp8
 <span id="L338" class="LineNr">338 </span>    <span class="subxComment"># copy one byte from ESI/in to EDI/out</span>
-<span id="L339" class="LineNr">339 </span>    8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/BL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to BL</span>
-<span id="L340" class="LineNr">340 </span>    88/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/BL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at BL to *EDI</span>
+<span id="L339" class="LineNr">339 </span>    8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ESI to BL</span>
+<span id="L340" class="LineNr">340 </span>    88/copy-byte                    0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/BL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at BL to *EDI</span>
 <span id="L341" class="LineNr">341 </span>    <span class="subxComment"># updates</span>
 <span id="L342" class="LineNr">342 </span>    40/increment-EAX
 <span id="L343" class="LineNr">343 </span>    46/increment-ESI
@@ -417,7 +412,7 @@ if ('onhashchange' in window) {
 <span id="L351" class="LineNr">351 </span>    5a/pop-to-EDX
 <span id="L352" class="LineNr">352 </span>    59/pop-to-ECX
 <span id="L353" class="LineNr">353 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L354" class="LineNr">354 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L354" class="LineNr">354 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L355" class="LineNr">355 </span>    5d/pop-to-EBP
 <span id="L356" class="LineNr">356 </span>    c3/return
 <span id="L357" class="LineNr">357 </span>
diff --git a/html/subx/056write.subx.html b/html/subx/056write.subx.html
index 01f84327..80b4db69 100644
--- a/html/subx/056write.subx.html
+++ b/html/subx/056write.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.subxFunction { color: #af5f00; text-decoration: underline; }
-.subxTest { color: #5f8700; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
 .subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -88,25 +83,25 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr"> 23 </span><span class="subxComment"># main:</span>
 <span id="L24" class="LineNr"> 24 </span>    e8/call  run-tests/disp32  <span class="subxComment"># '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="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L26" class="LineNr"> 26 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L27" class="LineNr"> 27 </span>    b8/copy-to-EAX  1/imm32
+<span id="L26" class="LineNr"> 26 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L27" class="LineNr"> 27 </span>    b8/copy-to-EAX  1/imm32/exit
 <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="subxComment"># TODO: come up with a way to signal when a write to disk fails</span>
-<span id="L31" class="LineNr"> 31 </span><span class="subxFunction">write</span>:  <span class="subxComment"># f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxFunction"><a href='056write.subx.html#L31'>write</a></span>:  <span class="subxComment"># f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L33" class="LineNr"> 33 </span>    55/push-EBP
-<span id="L34" class="LineNr"> 34 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L34" class="LineNr"> 34 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxComment"># if (f &lt; 0x08000000) _write(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
-<span id="L36" class="LineNr"> 36 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L36" class="LineNr"> 36 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L37" class="LineNr"> 37 </span>    7d/jump-if-greater-or-equal  $write:fake/disp8
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L39" class="LineNr"> 39 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L40" class="LineNr"> 40 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L39" class="LineNr"> 39 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L40" class="LineNr"> 40 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L42" class="LineNr"> 42 </span>    e8/call  _write/disp32
+<span id="L42" class="LineNr"> 42 </span>    e8/call  <a href='050_write.subx.html#L14'>_write</a>/disp32
 <span id="L43" class="LineNr"> 43 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L44" class="LineNr"> 44 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L44" class="LineNr"> 44 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L45" class="LineNr"> 45 </span>    eb/jump  $write:end/disp8
 <span id="L46" class="LineNr"> 46 </span><span class="Constant">$write:fake</span>:
 <span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># otherwise, treat 'f' as a stream to append to</span>
@@ -116,26 +111,26 @@ if ('onhashchange' in window) {
 <span id="L51" class="LineNr"> 51 </span>    52/push-EDX
 <span id="L52" class="LineNr"> 52 </span>    53/push-EBX
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxComment"># ECX = f</span>
-<span id="L54" class="LineNr"> 54 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L54" class="LineNr"> 54 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxComment"># EDX = f-&gt;write</span>
-<span id="L56" class="LineNr"> 56 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ECX to EDX</span>
+<span id="L56" class="LineNr"> 56 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EDX</span>
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxComment"># EBX = f-&gt;length</span>
-<span id="L58" class="LineNr"> 58 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ECX+8) to EBX</span>
+<span id="L58" class="LineNr"> 58 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+8) to EBX</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxComment"># EAX = _append-3(&amp;f-&gt;data[f-&gt;write], &amp;f-&gt;data[f-&gt;length], s)</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxS2Comment"># . . push s</span>
-<span id="L61" class="LineNr"> 61 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L61" class="LineNr"> 61 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="subxS2Comment"># . . push &amp;f-&gt;data[f-&gt;length]</span>
-<span id="L63" class="LineNr"> 63 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  3/index/EBX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX+EBX+12 to EBX</span>
+<span id="L63" class="LineNr"> 63 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  3/index/EBX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ECX+EBX+12 to EBX</span>
 <span id="L64" class="LineNr"> 64 </span>    53/push-EBX
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxS2Comment"># . . push &amp;f-&gt;data[f-&gt;write]</span>
-<span id="L66" class="LineNr"> 66 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  2/index/EDX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX+EDX+12 to EBX</span>
+<span id="L66" class="LineNr"> 66 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    1/base/ECX  2/index/EDX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ECX+EDX+12 to EBX</span>
 <span id="L67" class="LineNr"> 67 </span>    53/push-EBX
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L69" class="LineNr"> 69 </span>    e8/call  _append-3/disp32
+<span id="L69" class="LineNr"> 69 </span>    e8/call  <a href='055trace.subx.html#L279'>_append-3</a>/disp32
 <span id="L70" class="LineNr"> 70 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L71" class="LineNr"> 71 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L71" class="LineNr"> 71 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxComment"># f-&gt;write += EAX</span>
-<span id="L73" class="LineNr"> 73 </span>    01/add                          0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *ECX</span>
+<span id="L73" class="LineNr"> 73 </span>    01/add                          0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *ECX</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L75" class="LineNr"> 75 </span>    5b/pop-to-EBX
 <span id="L76" class="LineNr"> 76 </span>    5a/pop-to-EDX
@@ -143,119 +138,119 @@ if ('onhashchange' in window) {
 <span id="L78" class="LineNr"> 78 </span>    58/pop-to-EAX
 <span id="L79" class="LineNr"> 79 </span><span class="Constant">$write:end</span>:
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L81" class="LineNr"> 81 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L81" class="LineNr"> 81 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L82" class="LineNr"> 82 </span>    5d/pop-to-EBP
 <span id="L83" class="LineNr"> 83 </span>    c3/return
 <span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span><span class="subxFunction">clear-stream</span>:  <span class="subxComment"># f : (address stream) -&gt; &lt;void&gt;</span>
+<span id="L85" class="LineNr"> 85 </span><span class="subxFunction"><a href='056write.subx.html#L85'>clear-stream</a></span>:  <span class="subxComment"># f : (address stream) -&gt; &lt;void&gt;</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L87" class="LineNr"> 87 </span>    55/push-EBP
-<span id="L88" class="LineNr"> 88 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L88" class="LineNr"> 88 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L90" class="LineNr"> 90 </span>    50/push-EAX
 <span id="L91" class="LineNr"> 91 </span>    51/push-ECX
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxComment"># EAX = f</span>
-<span id="L93" class="LineNr"> 93 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L93" class="LineNr"> 93 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="subxComment"># ECX = f-&gt;length</span>
-<span id="L95" class="LineNr"> 95 </span>    8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EAX+8) to ECX</span>
+<span id="L95" class="LineNr"> 95 </span>    8b/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EAX+8) to ECX</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># ECX = &amp;f-&gt;data[f-&gt;length]</span>
-<span id="L97" class="LineNr"> 97 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+ECX+12 to ECX</span>
+<span id="L97" class="LineNr"> 97 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    0/base/EAX  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+ECX+12 to ECX</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="subxComment"># f-&gt;write = 0</span>
-<span id="L99" class="LineNr"> 99 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L99" class="LineNr"> 99 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxComment"># f-&gt;read = 0</span>
-<span id="L101" class="LineNr">101 </span>    c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EAX+4)</span>
+<span id="L101" class="LineNr">101 </span>    c7          0/subop/copy        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(EAX+4)</span>
 <span id="L102" class="LineNr">102 </span>    <span class="subxComment"># EAX = f-&gt;data</span>
-<span id="L103" class="LineNr">103 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to EAX</span>
+<span id="L103" class="LineNr">103 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to EAX</span>
 <span id="L104" class="LineNr">104 </span>    <span class="subxComment"># while (true)</span>
 <span id="L105" class="LineNr">105 </span><span class="Constant">$clear-stream:loop</span>:
 <span id="L106" class="LineNr">106 </span>    <span class="subxComment"># if EAX &gt;= ECX break</span>
-<span id="L107" class="LineNr">107 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
+<span id="L107" class="LineNr">107 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with ECX</span>
 <span id="L108" class="LineNr">108 </span>    7d/jump-if-greater-or-equal  $clear-stream:end/disp8
 <span id="L109" class="LineNr">109 </span>    <span class="subxComment"># *EAX = 0</span>
-<span id="L110" class="LineNr">110 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L110" class="LineNr">110 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L111" class="LineNr">111 </span>    <span class="subxComment"># EAX += 4</span>
-<span id="L112" class="LineNr">112 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
+<span id="L112" class="LineNr">112 </span>    81          0/subop/add         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to EAX</span>
 <span id="L113" class="LineNr">113 </span>    eb/jump  $clear-stream:loop/disp8
 <span id="L114" class="LineNr">114 </span><span class="Constant">$clear-stream:end</span>:
 <span id="L115" class="LineNr">115 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L116" class="LineNr">116 </span>    59/pop-to-ECX
 <span id="L117" class="LineNr">117 </span>    58/pop-to-EAX
 <span id="L118" class="LineNr">118 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L119" class="LineNr">119 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L119" class="LineNr">119 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L120" class="LineNr">120 </span>    5d/pop-to-EBP
 <span id="L121" class="LineNr">121 </span>    c3/return
 <span id="L122" class="LineNr">122 </span>
-<span id="L123" class="LineNr">123 </span><span class="subxTest">test-write-single</span>:
+<span id="L123" class="LineNr">123 </span><span class="subxTest"><a href='056write.subx.html#L123'>test-write-single</a></span>:
 <span id="L124" class="LineNr">124 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
 <span id="L125" class="LineNr">125 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L126" class="LineNr">126 </span>    68/push  _test-stream/imm32
+<span id="L126" class="LineNr">126 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L127" class="LineNr">127 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L128" class="LineNr">128 </span>    e8/call  clear-stream/disp32
+<span id="L128" class="LineNr">128 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L131" class="LineNr">131 </span>    <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
 <span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L133" class="LineNr">133 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L134" class="LineNr">134 </span>    68/push  _test-stream/imm32
+<span id="L134" class="LineNr">134 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L136" class="LineNr">136 </span>    e8/call  write/disp32
+<span id="L136" class="LineNr">136 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L139" class="LineNr">139 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 41/A 62/b 00 00, msg)</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L141" class="LineNr">141 </span>    68/push  <span class="Constant">&quot;F - test-write-single&quot;</span>/imm32
 <span id="L142" class="LineNr">142 </span>    68/push  0x006241/imm32/Ab
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L144" class="LineNr">144 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L145" class="LineNr">145 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L144" class="LineNr">144 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L145" class="LineNr">145 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L147" class="LineNr">147 </span>    e8/call  check-ints-equal/disp32
+<span id="L147" class="LineNr">147 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L149" class="LineNr">149 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L149" class="LineNr">149 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L150" class="LineNr">150 </span>    <span class="subxComment"># end</span>
 <span id="L151" class="LineNr">151 </span>    c3/return
 <span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="subxTest">test-write-appends</span>:
+<span id="L153" class="LineNr">153 </span><span class="subxTest"><a href='056write.subx.html#L153'>test-write-appends</a></span>:
 <span id="L154" class="LineNr">154 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
 <span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L156" class="LineNr">156 </span>    68/push  _test-stream/imm32
+<span id="L156" class="LineNr">156 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L158" class="LineNr">158 </span>    e8/call  clear-stream/disp32
+<span id="L158" class="LineNr">158 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L160" class="LineNr">160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L160" class="LineNr">160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L161" class="LineNr">161 </span>    <span class="subxComment"># write(_test-stream, &quot;C&quot;)</span>
 <span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L163" class="LineNr">163 </span>    68/push  <span class="Constant">&quot;C&quot;</span>/imm32
-<span id="L164" class="LineNr">164 </span>    68/push  _test-stream/imm32
+<span id="L164" class="LineNr">164 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L166" class="LineNr">166 </span>    e8/call  write/disp32
+<span id="L166" class="LineNr">166 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L167" class="LineNr">167 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L168" class="LineNr">168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L168" class="LineNr">168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L169" class="LineNr">169 </span>    <span class="subxComment"># write(_test-stream, &quot;D&quot;)</span>
 <span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L171" class="LineNr">171 </span>    68/push  <span class="Constant">&quot;D&quot;</span>/imm32
-<span id="L172" class="LineNr">172 </span>    68/push  _test-stream/imm32
+<span id="L172" class="LineNr">172 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L174" class="LineNr">174 </span>    e8/call  write/disp32
+<span id="L174" class="LineNr">174 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L175" class="LineNr">175 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L176" class="LineNr">176 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L176" class="LineNr">176 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L177" class="LineNr">177 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 43/C 44/D 00 00, msg)</span>
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L179" class="LineNr">179 </span>    68/push  <span class="Constant">&quot;F - test-write-appends&quot;</span>/imm32
 <span id="L180" class="LineNr">180 </span>    68/push  0x00004443/imm32/C-D
 <span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L182" class="LineNr">182 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L182" class="LineNr">182 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L185" class="LineNr">185 </span>    e8/call  check-ints-equal/disp32
+<span id="L185" class="LineNr">185 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L186" class="LineNr">186 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L188" class="LineNr">188 </span>    <span class="subxComment"># end</span>
 <span id="L189" class="LineNr">189 </span>    c3/return
 <span id="L190" class="LineNr">190 </span>
 <span id="L191" class="LineNr">191 </span>== data
 <span id="L192" class="LineNr">192 </span>
-<span id="L193" class="LineNr">193 </span><span class="subxMinorFunction">_test-stream</span>:
+<span id="L193" class="LineNr">193 </span><span class="subxMinorFunction"><a href='056write.subx.html#L193'>_test-stream</a></span>:
 <span id="L194" class="LineNr">194 </span>    <span class="subxComment"># current write index</span>
 <span id="L195" class="LineNr">195 </span>    00 00 00 00
 <span id="L196" class="LineNr">196 </span>    <span class="subxComment"># current read index</span>
diff --git a/html/subx/057stop.subx.html b/html/subx/057stop.subx.html
index 56d235ae..265ec210 100644
--- a/html/subx/057stop.subx.html
+++ b/html/subx/057stop.subx.html
@@ -7,26 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
 .subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
 .SpecialChar { color: #d70000; }
 -->
 </style>
@@ -106,22 +102,22 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L42" class="LineNr"> 42 </span><span class="CommentedCode">#?     e8/call test-stop-skips-returns-on-exit/disp32</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L44" class="LineNr"> 44 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L45" class="LineNr"> 45 </span>    b8/copy-to-EAX  1/imm32
+<span id="L44" class="LineNr"> 44 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L45" class="LineNr"> 45 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L46" class="LineNr"> 46 </span>    cd/syscall  0x80/imm8
 <span id="L47" class="LineNr"> 47 </span>
 <span id="L48" class="LineNr"> 48 </span><span class="subxComment"># Configure an exit-descriptor for a call pushing 'nbytes' bytes of args to</span>
 <span id="L49" class="LineNr"> 49 </span><span class="subxComment"># the stack.</span>
 <span id="L50" class="LineNr"> 50 </span><span class="subxComment"># Ugly that we need to know the size of args, but so it goes.</span>
-<span id="L51" class="LineNr"> 51 </span><span class="subxFunction">tailor-exit-descriptor</span>:  <span class="subxComment"># ed : (address exit-descriptor), nbytes : int -&gt; &lt;void&gt;</span>
+<span id="L51" class="LineNr"> 51 </span><span class="subxFunction"><a href='057stop.subx.html#L51'>tailor-exit-descriptor</a></span>:  <span class="subxComment"># ed : (address exit-descriptor), nbytes : int -&gt; &lt;void&gt;</span>
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L53" class="LineNr"> 53 </span>    55/push-EBP
-<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L56" class="LineNr"> 56 </span>    50/push-EAX
 <span id="L57" class="LineNr"> 57 </span>    51/push-ECX
 <span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># EAX = nbytes</span>
-<span id="L59" class="LineNr"> 59 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L59" class="LineNr"> 59 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># Let X be the value of ESP in the caller, before the call to tailor-exit-descriptor.</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># The return address for a call in the caller's body will be at:</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="subxComment">#   X-8 if the caller takes 4 bytes of args for the exit-descriptor (add 4 bytes for the return address)</span>
@@ -145,44 +141,44 @@ if ('onhashchange' in window) {
 <span id="L80" class="LineNr"> 80 </span><span class="CommentedCode">#?     2d/subtract                     3/mod/direct    0/rm32/EAX    .           .             .           .           .               8/imm32           # subtract from EAX</span>
 <span id="L81" class="LineNr"> 81 </span><span class="CommentedCode">#?     8d/copy-address                 0/mod/indirect  4/rm32/sib    5/base/EBP  0/index/EAX   .           0/r32/EAX   .               .                 # copy EBP+EAX to EAX</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxComment"># option 2: 2 + 4 bytes</span>
-<span id="L83" class="LineNr"> 83 </span>    f7          3/subop/negate      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># negate EAX</span>
-<span id="L84" class="LineNr"> 84 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    5/base/EBP  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8        <span class="CommentedCode"> . </span>              <span class="subxComment"># copy EBP+EAX+12 to EAX</span>
+<span id="L83" class="LineNr"> 83 </span>    f7          3/subop/negate      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># negate EAX</span>
+<span id="L84" class="LineNr"> 84 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    5/base/EBP  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8        <span class="Normal"> . </span>              <span class="subxComment"># copy EBP+EAX+12 to EAX</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># copy EAX to ed-&gt;target</span>
-<span id="L86" class="LineNr"> 86 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
-<span id="L87" class="LineNr"> 87 </span>    89/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *ECX</span>
+<span id="L86" class="LineNr"> 86 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L87" class="LineNr"> 87 </span>    89/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *ECX</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># initialize ed-&gt;value</span>
-<span id="L89" class="LineNr"> 89 </span>    c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(ECX+4)</span>
+<span id="L89" class="LineNr"> 89 </span>    c7          0/subop/copy        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># copy to *(ECX+4)</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Constant">$tailor-exit-descriptor:end</span>:
 <span id="L91" class="LineNr"> 91 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L92" class="LineNr"> 92 </span>    59/pop-to-ECX
 <span id="L93" class="LineNr"> 93 </span>    58/pop-to-EAX
 <span id="L94" class="LineNr"> 94 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L95" class="LineNr"> 95 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L95" class="LineNr"> 95 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L96" class="LineNr"> 96 </span>    5d/pop-to-EBP
 <span id="L97" class="LineNr"> 97 </span>    c3/return
 <span id="L98" class="LineNr"> 98 </span>
-<span id="L99" class="LineNr"> 99 </span><span class="subxFunction">stop</span>:  <span class="subxComment"># ed : (address exit-descriptor), value : int</span>
+<span id="L99" class="LineNr"> 99 </span><span class="subxFunction"><a href='057stop.subx.html#L99'>stop</a></span>:  <span class="subxComment"># ed : (address exit-descriptor), value : int</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxComment"># no prolog; one way or another, we're going to clobber registers</span>
 <span id="L101" class="LineNr">101 </span>    <span class="subxComment"># EAX = ed</span>
-<span id="L102" class="LineNr">102 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
+<span id="L102" class="LineNr">102 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
 <span id="L103" class="LineNr">103 </span>    <span class="subxComment"># exit(value) if ed-&gt;target == 0</span>
-<span id="L104" class="LineNr">104 </span>    81          7/subop/compare     0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare *EAX</span>
+<span id="L104" class="LineNr">104 </span>    81          7/subop/compare     0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare *EAX</span>
 <span id="L105" class="LineNr">105 </span>    75/jump-if-not-equal  $stop:fake/disp8
 <span id="L106" class="LineNr">106 </span>    <span class="subxComment"># syscall(exit, value)</span>
-<span id="L107" class="LineNr">107 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to EBX</span>
-<span id="L108" class="LineNr">108 </span>    b8/copy-to-EAX  1/imm32
+<span id="L107" class="LineNr">107 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+8) to EBX</span>
+<span id="L108" class="LineNr">108 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L109" class="LineNr">109 </span>    cd/syscall  0x80/imm8
 <span id="L110" class="LineNr">110 </span><span class="Constant">$stop:fake</span>:
 <span id="L111" class="LineNr">111 </span>    <span class="subxComment"># ed-&gt;value = value+1</span>
-<span id="L112" class="LineNr">112 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to ECX</span>
+<span id="L112" class="LineNr">112 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+8) to ECX</span>
 <span id="L113" class="LineNr">113 </span>    41/inc-ECX
-<span id="L114" class="LineNr">114 </span>    89/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX to *(EAX+4)</span>
+<span id="L114" class="LineNr">114 </span>    89/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *(EAX+4)</span>
 <span id="L115" class="LineNr">115 </span>    <span class="subxComment"># non-local jump to ed-&gt;target</span>
-<span id="L116" class="LineNr">116 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ESP</span>
+<span id="L116" class="LineNr">116 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ESP</span>
 <span id="L117" class="LineNr">117 </span><span class="Constant">$stop:end</span>:
 <span id="L118" class="LineNr">118 </span>    c3/return  <span class="subxComment"># doesn't return to caller</span>
 <span id="L119" class="LineNr">119 </span>
-<span id="L120" class="LineNr">120 </span><span class="subxTest">test-stop-skips-returns-on-exit</span>:
+<span id="L120" class="LineNr">120 </span><span class="subxTest"><a href='057stop.subx.html#L120'>test-stop-skips-returns-on-exit</a></span>:
 <span id="L121" class="LineNr">121 </span>    <span class="subxComment"># This looks like the standard prolog, but is here for different reasons.</span>
 <span id="L122" class="LineNr">122 </span>    <span class="subxComment"># A function calling 'stop' can't rely on EBP persisting past the call.</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxComment">#</span>
@@ -190,27 +186,27 @@ if ('onhashchange' in window) {
 <span id="L125" class="LineNr">125 </span>    <span class="subxComment"># presence of push/pop/call instructions.</span>
 <span id="L126" class="LineNr">126 </span>    <span class="subxComment"># *Don't* use EBP as a way to restore ESP.</span>
 <span id="L127" class="LineNr">127 </span>    55/push-EBP
-<span id="L128" class="LineNr">128 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L128" class="LineNr">128 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L129" class="LineNr">129 </span>    <span class="subxComment"># Make room for an exit descriptor on the stack. That's almost always the</span>
 <span id="L130" class="LineNr">130 </span>    <span class="subxComment"># right place for it, available only as long as it's legal to use. Once this</span>
 <span id="L131" class="LineNr">131 </span>    <span class="subxComment"># containing function returns we'll need a new exit descriptor.</span>
 <span id="L132" class="LineNr">132 </span>    <span class="subxComment"># var ed/EAX : (address exit-descriptor)</span>
-<span id="L133" class="LineNr">133 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L134" class="LineNr">134 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L133" class="LineNr">133 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L134" class="LineNr">134 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L135" class="LineNr">135 </span>    <span class="subxComment"># Size the exit-descriptor precisely for the next call below, to _test-stop-1.</span>
 <span id="L136" class="LineNr">136 </span>    <span class="subxComment"># tailor-exit-descriptor(ed, 4)</span>
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L138" class="LineNr">138 </span>    68/push  4/imm32/nbytes-of-args-for-_test-stop-1
 <span id="L139" class="LineNr">139 </span>    50/push-EAX
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L141" class="LineNr">141 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L141" class="LineNr">141 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L142" class="LineNr">142 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L143" class="LineNr">143 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L143" class="LineNr">143 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L144" class="LineNr">144 </span>    <span class="subxS1Comment"># . _test-stop-1(ed)</span>
 <span id="L145" class="LineNr">145 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L146" class="LineNr">146 </span>    50/push-EAX
 <span id="L147" class="LineNr">147 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L148" class="LineNr">148 </span>    e8/call  _test-stop-1/disp32
+<span id="L148" class="LineNr">148 </span>    e8/call  <a href='057stop.subx.html#L169'>_test-stop-1</a>/disp32
 <span id="L149" class="LineNr">149 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L150" class="LineNr">150 </span>    <span class="subxComment"># restore args</span>
 <span id="L151" class="LineNr">151 </span>    58/pop-to-EAX
@@ -220,58 +216,58 @@ if ('onhashchange' in window) {
 <span id="L155" class="LineNr">155 </span>    68/push  <span class="Constant">&quot;F - test-stop-skips-returns-on-exit&quot;</span>/imm32
 <span id="L156" class="LineNr">156 </span>    68/push  2/imm32
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L158" class="LineNr">158 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L158" class="LineNr">158 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
 <span id="L159" class="LineNr">159 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L160" class="LineNr">160 </span>    e8/call  check-ints-equal/disp32
+<span id="L160" class="LineNr">160 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L161" class="LineNr">161 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L162" class="LineNr">162 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L162" class="LineNr">162 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L163" class="LineNr">163 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L164" class="LineNr">164 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L165" class="LineNr">165 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L165" class="LineNr">165 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L166" class="LineNr">166 </span>    5d/pop-to-EBP
 <span id="L167" class="LineNr">167 </span>    c3/return
 <span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="subxMinorFunction">_test-stop-1</span>:  <span class="subxComment"># ed : (address exit-descriptor)</span>
+<span id="L169" class="LineNr">169 </span><span class="subxMinorFunction"><a href='057stop.subx.html#L169'>_test-stop-1</a></span>:  <span class="subxComment"># ed : (address exit-descriptor)</span>
 <span id="L170" class="LineNr">170 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L171" class="LineNr">171 </span>    55/push-EBP
-<span id="L172" class="LineNr">172 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L172" class="LineNr">172 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L173" class="LineNr">173 </span>    <span class="subxComment"># _test-stop-2(ed)</span>
 <span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L175" class="LineNr">175 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L175" class="LineNr">175 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L177" class="LineNr">177 </span>    e8/call  _test-stop-2/disp32
+<span id="L177" class="LineNr">177 </span>    e8/call  <a href='057stop.subx.html#L196'>_test-stop-2</a>/disp32
 <span id="L178" class="LineNr">178 </span>    <span class="subxComment"># should never get past this point</span>
 <span id="L179" class="LineNr">179 </span><span class="Constant">$_test-stop-1:dead-end</span>:
 <span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L182" class="LineNr">182 </span>    <span class="subxComment"># signal test failed: check-ints-equal(1, 0, msg)</span>
 <span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L184" class="LineNr">184 </span>    68/push  <span class="Constant">&quot;F - test-stop-skips-returns-on-exit&quot;</span>/imm32
 <span id="L185" class="LineNr">185 </span>    68/push  0/imm32
 <span id="L186" class="LineNr">186 </span>    68/push  1/imm32
 <span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L188" class="LineNr">188 </span>    e8/call  check-ints-equal/disp32
+<span id="L188" class="LineNr">188 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L191" class="LineNr">191 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L192" class="LineNr">192 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L192" class="LineNr">192 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L193" class="LineNr">193 </span>    5d/pop-to-EBP
 <span id="L194" class="LineNr">194 </span>    c3/return
 <span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="subxMinorFunction">_test-stop-2</span>:  <span class="subxComment"># ed : (address exit-descriptor)</span>
+<span id="L196" class="LineNr">196 </span><span class="subxMinorFunction"><a href='057stop.subx.html#L196'>_test-stop-2</a></span>:  <span class="subxComment"># ed : (address exit-descriptor)</span>
 <span id="L197" class="LineNr">197 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L198" class="LineNr">198 </span>    55/push-EBP
-<span id="L199" class="LineNr">199 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L199" class="LineNr">199 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L200" class="LineNr">200 </span>    <span class="subxS1Comment"># . stop(ed, 1)</span>
 <span id="L201" class="LineNr">201 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L202" class="LineNr">202 </span>    68/push  1/imm32
-<span id="L203" class="LineNr">203 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L203" class="LineNr">203 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L204" class="LineNr">204 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L205" class="LineNr">205 </span>    e8/call  stop/disp32
+<span id="L205" class="LineNr">205 </span>    e8/call  <a href='057stop.subx.html#L99'>stop</a>/disp32
 <span id="L206" class="LineNr">206 </span>    <span class="subxComment"># should never get past this point</span>
 <span id="L207" class="LineNr">207 </span><span class="Constant">$_test-stop-2:dead-end</span>:
 <span id="L208" class="LineNr">208 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L209" class="LineNr">209 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L209" class="LineNr">209 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L210" class="LineNr">210 </span>    5d/pop-to-EBP
 <span id="L211" class="LineNr">211 </span>    c3/return
 <span id="L212" class="LineNr">212 </span>
diff --git a/html/subx/058read.subx.html b/html/subx/058read.subx.html
index 3446d4c0..47defabc 100644
--- a/html/subx/058read.subx.html
+++ b/html/subx/058read.subx.html
@@ -7,28 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.subxFunction { color: #af5f00; text-decoration: underline; }
-.subxTest { color: #5f8700; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
 .subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -114,24 +109,24 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span><span class="subxComment"># main:</span>
 <span id="L49" class="LineNr"> 49 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L51" class="LineNr"> 51 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L52" class="LineNr"> 52 </span>    b8/copy-to-EAX  1/imm32
+<span id="L51" class="LineNr"> 51 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L52" class="LineNr"> 52 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L53" class="LineNr"> 53 </span>    cd/syscall  0x80/imm8
 <span id="L54" class="LineNr"> 54 </span>
-<span id="L55" class="LineNr"> 55 </span><span class="subxFunction">read</span>:  <span class="subxComment"># f : fd or (address stream), s : (address stream) -&gt; num-bytes-read/EAX</span>
+<span id="L55" class="LineNr"> 55 </span><span class="subxFunction"><a href='058read.subx.html#L55'>read</a></span>:  <span class="subxComment"># f : fd or (address stream), s : (address stream) -&gt; num-bytes-read/EAX</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L57" class="LineNr"> 57 </span>    55/push-EBP
-<span id="L58" class="LineNr"> 58 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L58" class="LineNr"> 58 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxComment"># if (f &lt; 0x08000000) return _read(f, s)  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
-<span id="L60" class="LineNr"> 60 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L60" class="LineNr"> 60 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L61" class="LineNr"> 61 </span>    7d/jump-if-greater-or-equal  $read:fake/disp8
 <span id="L62" class="LineNr"> 62 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L63" class="LineNr"> 63 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L64" class="LineNr"> 64 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L63" class="LineNr"> 63 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L64" class="LineNr"> 64 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L66" class="LineNr"> 66 </span>    e8/call  _read/disp32
+<span id="L66" class="LineNr"> 66 </span>    e8/call  <a href='058read.subx.html#L121'>_read</a>/disp32
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L68" class="LineNr"> 68 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L68" class="LineNr"> 68 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># return</span>
 <span id="L70" class="LineNr"> 70 </span>    eb/jump  $read:end/disp8
 <span id="L71" class="LineNr"> 71 </span><span class="Constant">$read:fake</span>:
@@ -140,41 +135,41 @@ if ('onhashchange' in window) {
 <span id="L74" class="LineNr"> 74 </span>    56/push-ESI
 <span id="L75" class="LineNr"> 75 </span>    57/push-EDI
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxComment"># ESI = f</span>
-<span id="L77" class="LineNr"> 77 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L77" class="LineNr"> 77 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># EDI = s</span>
-<span id="L79" class="LineNr"> 79 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L79" class="LineNr"> 79 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># EAX = _append-4(out = &amp;s-&gt;data[s-&gt;write], outend = &amp;s-&gt;data[s-&gt;length],</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="subxComment">#                 in  = &amp;f-&gt;data[f-&gt;read],  inend  = &amp;f-&gt;data[f-&gt;write])</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxS2Comment"># . . push &amp;f-&gt;data[f-&gt;write]</span>
-<span id="L83" class="LineNr"> 83 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
-<span id="L84" class="LineNr"> 84 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
+<span id="L83" class="LineNr"> 83 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L84" class="LineNr"> 84 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L85" class="LineNr"> 85 </span>    50/push-EAX
 <span id="L86" class="LineNr"> 86 </span>    <span class="subxS2Comment"># . . push &amp;f-&gt;data[f-&gt;read]</span>
-<span id="L87" class="LineNr"> 87 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
-<span id="L88" class="LineNr"> 88 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
+<span id="L87" class="LineNr"> 87 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
+<span id="L88" class="LineNr"> 88 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L89" class="LineNr"> 89 </span>    50/push-EAX
 <span id="L90" class="LineNr"> 90 </span>    <span class="subxS2Comment"># . . push &amp;s-&gt;data[s-&gt;length]</span>
-<span id="L91" class="LineNr"> 91 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EAX</span>
-<span id="L92" class="LineNr"> 92 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
+<span id="L91" class="LineNr"> 91 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+8) to EAX</span>
+<span id="L92" class="LineNr"> 92 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L93" class="LineNr"> 93 </span>    50/push-EAX
 <span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . push &amp;s-&gt;data[s-&gt;write]</span>
-<span id="L95" class="LineNr"> 95 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to EAX</span>
-<span id="L96" class="LineNr"> 96 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
+<span id="L95" class="LineNr"> 95 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to EAX</span>
+<span id="L96" class="LineNr"> 96 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L97" class="LineNr"> 97 </span>    50/push-EAX
 <span id="L98" class="LineNr"> 98 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L99" class="LineNr"> 99 </span>    e8/call  _append-4/disp32
+<span id="L99" class="LineNr"> 99 </span>    e8/call  <a href='055trace.subx.html#L311'>_append-4</a>/disp32
 <span id="L100" class="LineNr">100 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L101" class="LineNr">101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L101" class="LineNr">101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L102" class="LineNr">102 </span>    <span class="subxComment"># s-&gt;write += EAX</span>
-<span id="L103" class="LineNr">103 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
+<span id="L103" class="LineNr">103 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
 <span id="L104" class="LineNr">104 </span>    <span class="subxComment"># f-&gt;read += EAX</span>
-<span id="L105" class="LineNr">105 </span>    01/add                          1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *(ESI+4)</span>
+<span id="L105" class="LineNr">105 </span>    01/add                          1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *(ESI+4)</span>
 <span id="L106" class="LineNr">106 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L107" class="LineNr">107 </span>    5f/pop-to-EDI
 <span id="L108" class="LineNr">108 </span>    5e/pop-to-ESI
 <span id="L109" class="LineNr">109 </span><span class="Constant">$read:end</span>:
 <span id="L110" class="LineNr">110 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L111" class="LineNr">111 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L111" class="LineNr">111 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L112" class="LineNr">112 </span>    5d/pop-to-EBP
 <span id="L113" class="LineNr">113 </span>    c3/return
 <span id="L114" class="LineNr">114 </span>
@@ -184,33 +179,33 @@ if ('onhashchange' in window) {
 <span id="L118" class="LineNr">118 </span><span class="subxComment"># Unclear how I'd use it, though. Callers seem to need the check anyway.</span>
 <span id="L119" class="LineNr">119 </span><span class="subxComment"># Maybe a better helper would be 'empty-stream?'</span>
 <span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="subxMinorFunction">_read</span>:  <span class="subxComment"># fd : int, s : (address stream) -&gt; num-bytes-read/EAX</span>
+<span id="L121" class="LineNr">121 </span><span class="subxMinorFunction"><a href='058read.subx.html#L121'>_read</a></span>:  <span class="subxComment"># fd : int, s : (address stream) -&gt; num-bytes-read/EAX</span>
 <span id="L122" class="LineNr">122 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L123" class="LineNr">123 </span>    55/push-EBP
-<span id="L124" class="LineNr">124 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L124" class="LineNr">124 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L125" class="LineNr">125 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L126" class="LineNr">126 </span>    51/push-ECX
 <span id="L127" class="LineNr">127 </span>    52/push-EDX
 <span id="L128" class="LineNr">128 </span>    53/push-EBX
 <span id="L129" class="LineNr">129 </span>    56/push-ESI
 <span id="L130" class="LineNr">130 </span>    <span class="subxComment"># ESI = s</span>
-<span id="L131" class="LineNr">131 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L131" class="LineNr">131 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
 <span id="L132" class="LineNr">132 </span>    <span class="subxComment"># EAX = s-&gt;write</span>
-<span id="L133" class="LineNr">133 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L133" class="LineNr">133 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
 <span id="L134" class="LineNr">134 </span>    <span class="subxComment"># EDX = s-&gt;length</span>
-<span id="L135" class="LineNr">135 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+8) to EDX</span>
+<span id="L135" class="LineNr">135 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+8) to EDX</span>
 <span id="L136" class="LineNr">136 </span>    <span class="subxComment"># syscall(read, fd, &amp;s-&gt;data[s-&gt;write], s-&gt;length - s-&gt;write)</span>
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . fd : EBX</span>
-<span id="L138" class="LineNr">138 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L138" class="LineNr">138 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
 <span id="L139" class="LineNr">139 </span>    <span class="subxS2Comment"># . . data : ECX = &amp;s-&gt;data[s-&gt;write]</span>
-<span id="L140" class="LineNr">140 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to ECX</span>
+<span id="L140" class="LineNr">140 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to ECX</span>
 <span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . size : EDX = s-&gt;length - s-&gt;write</span>
-<span id="L142" class="LineNr">142 </span>    29/subtract                     3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract EAX from EDX</span>
+<span id="L142" class="LineNr">142 </span>    29/subtract                     3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EAX from EDX</span>
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . syscall</span>
 <span id="L144" class="LineNr">144 </span>    b8/copy-to-EAX  3/imm32/read
 <span id="L145" class="LineNr">145 </span>    cd/syscall  0x80/imm8
 <span id="L146" class="LineNr">146 </span>    <span class="subxComment"># add the result EAX to s-&gt;write</span>
-<span id="L147" class="LineNr">147 </span>    01/add                          0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *ESI</span>
+<span id="L147" class="LineNr">147 </span>    01/add                          0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *ESI</span>
 <span id="L148" class="LineNr">148 </span><span class="Constant">$_read:end</span>:
 <span id="L149" class="LineNr">149 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L150" class="LineNr">150 </span>    5e/pop-to-ESI
@@ -218,7 +213,7 @@ if ('onhashchange' in window) {
 <span id="L152" class="LineNr">152 </span>    5a/pop-to-EDX
 <span id="L153" class="LineNr">153 </span>    59/pop-to-ECX
 <span id="L154" class="LineNr">154 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L155" class="LineNr">155 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L155" class="LineNr">155 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L156" class="LineNr">156 </span>    5d/pop-to-EBP
 <span id="L157" class="LineNr">157 </span>    c3/return
 <span id="L158" class="LineNr">158 </span>
@@ -245,181 +240,181 @@ if ('onhashchange' in window) {
 <span id="L179" class="LineNr">179 </span>
 <span id="L180" class="LineNr">180 </span><span class="subxH1Comment"># - tests</span>
 <span id="L181" class="LineNr">181 </span>
-<span id="L182" class="LineNr">182 </span><span class="subxTest">test-read-single</span>:
+<span id="L182" class="LineNr">182 </span><span class="subxTest"><a href='058read.subx.html#L182'>test-read-single</a></span>:
 <span id="L183" class="LineNr">183 </span>    <span class="subxH1Comment"># - write a single character into _test-stream, then read from its buffered-file</span>
 <span id="L184" class="LineNr">184 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
 <span id="L185" class="LineNr">185 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L186" class="LineNr">186 </span>    68/push  _test-stream/imm32
+<span id="L186" class="LineNr">186 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L188" class="LineNr">188 </span>    e8/call  clear-stream/disp32
+<span id="L188" class="LineNr">188 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L191" class="LineNr">191 </span>    <span class="subxComment"># clear-stream(_test-stream-buffer)</span>
 <span id="L192" class="LineNr">192 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L193" class="LineNr">193 </span>    68/push  _test-stream-buffer/imm32
+<span id="L193" class="LineNr">193 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
 <span id="L194" class="LineNr">194 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L195" class="LineNr">195 </span>    e8/call  clear-stream/disp32
+<span id="L195" class="LineNr">195 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L196" class="LineNr">196 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L197" class="LineNr">197 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L197" class="LineNr">197 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L198" class="LineNr">198 </span>    <span class="subxComment"># write(_test-stream, &quot;Ab&quot;)</span>
 <span id="L199" class="LineNr">199 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L200" class="LineNr">200 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L201" class="LineNr">201 </span>    68/push  _test-stream/imm32
+<span id="L201" class="LineNr">201 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L202" class="LineNr">202 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L203" class="LineNr">203 </span>    e8/call  write/disp32
+<span id="L203" class="LineNr">203 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L204" class="LineNr">204 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L205" class="LineNr">205 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L205" class="LineNr">205 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L206" class="LineNr">206 </span>    <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
 <span id="L207" class="LineNr">207 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L208" class="LineNr">208 </span>    68/push  _test-stream-buffer/imm32
-<span id="L209" class="LineNr">209 </span>    68/push  _test-stream/imm32
+<span id="L208" class="LineNr">208 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L209" class="LineNr">209 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L210" class="LineNr">210 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L211" class="LineNr">211 </span>    e8/call  read/disp32
+<span id="L211" class="LineNr">211 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
 <span id="L212" class="LineNr">212 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L213" class="LineNr">213 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L213" class="LineNr">213 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L214" class="LineNr">214 </span>    <span class="subxComment"># check-ints-equal(EAX, 2, msg)</span>
 <span id="L215" class="LineNr">215 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L216" class="LineNr">216 </span>    68/push  <span class="Constant">&quot;F - test-read-single: return EAX&quot;</span>/imm32
+<span id="L216" class="LineNr">216 </span>    68/push  <span class="Constant">&quot;F - <a href='058read.subx.html#L182'>test-read-single</a>: return EAX&quot;</span>/imm32
 <span id="L217" class="LineNr">217 </span>    68/push  2/imm32
 <span id="L218" class="LineNr">218 </span>    50/push-EAX
 <span id="L219" class="LineNr">219 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L220" class="LineNr">220 </span>    e8/call  check-ints-equal/disp32
+<span id="L220" class="LineNr">220 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L221" class="LineNr">221 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L222" class="LineNr">222 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L222" class="LineNr">222 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L223" class="LineNr">223 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-buffer-&gt;data, 41/A 62/b 00 00, msg)</span>
 <span id="L224" class="LineNr">224 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L225" class="LineNr">225 </span>    68/push  <span class="Constant">&quot;F - test-read-single&quot;</span>/imm32
 <span id="L226" class="LineNr">226 </span>    68/push  0x006241/imm32/Ab
 <span id="L227" class="LineNr">227 </span>    <span class="subxS2Comment"># . . push *_test-stream-buffer-&gt;data</span>
-<span id="L228" class="LineNr">228 </span>    b8/copy-to-EAX  _test-stream-buffer/imm32
-<span id="L229" class="LineNr">229 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L228" class="LineNr">228 </span>    b8/copy-to-EAX  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L229" class="LineNr">229 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L230" class="LineNr">230 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L231" class="LineNr">231 </span>    e8/call  check-ints-equal/disp32
+<span id="L231" class="LineNr">231 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L232" class="LineNr">232 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L233" class="LineNr">233 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L233" class="LineNr">233 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L234" class="LineNr">234 </span>    <span class="subxComment"># end</span>
 <span id="L235" class="LineNr">235 </span>    c3/return
 <span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="subxTest">test-read-is-stateful</span>:
+<span id="L237" class="LineNr">237 </span><span class="subxTest"><a href='058read.subx.html#L237'>test-read-is-stateful</a></span>:
 <span id="L238" class="LineNr">238 </span>    <span class="subxH1Comment"># - make two consecutive reads, check that their results are appended</span>
 <span id="L239" class="LineNr">239 </span>    <span class="subxComment"># clear-stream(_test-stream)</span>
 <span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L241" class="LineNr">241 </span>    68/push  _test-stream/imm32
+<span id="L241" class="LineNr">241 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L242" class="LineNr">242 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L243" class="LineNr">243 </span>    e8/call  clear-stream/disp32
+<span id="L243" class="LineNr">243 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L244" class="LineNr">244 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L245" class="LineNr">245 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L245" class="LineNr">245 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L246" class="LineNr">246 </span>    <span class="subxComment"># clear-stream(_test-stream-buffer)</span>
 <span id="L247" class="LineNr">247 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L248" class="LineNr">248 </span>    68/push  _test-stream-buffer/imm32
+<span id="L248" class="LineNr">248 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
 <span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L250" class="LineNr">250 </span>    e8/call  clear-stream/disp32
+<span id="L250" class="LineNr">250 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L251" class="LineNr">251 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L252" class="LineNr">252 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L252" class="LineNr">252 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L253" class="LineNr">253 </span>    <span class="subxComment"># write(_test-stream, &quot;C&quot;)</span>
 <span id="L254" class="LineNr">254 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L255" class="LineNr">255 </span>    68/push  <span class="Constant">&quot;C&quot;</span>/imm32
-<span id="L256" class="LineNr">256 </span>    68/push  _test-stream/imm32
+<span id="L256" class="LineNr">256 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L257" class="LineNr">257 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L258" class="LineNr">258 </span>    e8/call  write/disp32
+<span id="L258" class="LineNr">258 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L259" class="LineNr">259 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L260" class="LineNr">260 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L260" class="LineNr">260 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L261" class="LineNr">261 </span>    <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
 <span id="L262" class="LineNr">262 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L263" class="LineNr">263 </span>    68/push  _test-stream-buffer/imm32
-<span id="L264" class="LineNr">264 </span>    68/push  _test-stream/imm32
+<span id="L263" class="LineNr">263 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L264" class="LineNr">264 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L265" class="LineNr">265 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L266" class="LineNr">266 </span>    e8/call  read/disp32
+<span id="L266" class="LineNr">266 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
 <span id="L267" class="LineNr">267 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L268" class="LineNr">268 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L268" class="LineNr">268 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L269" class="LineNr">269 </span>    <span class="subxComment"># write(_test-stream, &quot;D&quot;)</span>
 <span id="L270" class="LineNr">270 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L271" class="LineNr">271 </span>    68/push  <span class="Constant">&quot;D&quot;</span>/imm32
-<span id="L272" class="LineNr">272 </span>    68/push  _test-stream/imm32
+<span id="L272" class="LineNr">272 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L273" class="LineNr">273 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L274" class="LineNr">274 </span>    e8/call  write/disp32
+<span id="L274" class="LineNr">274 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L275" class="LineNr">275 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L276" class="LineNr">276 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L276" class="LineNr">276 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L277" class="LineNr">277 </span>    <span class="subxComment"># read(_test-stream, _test-stream-buffer)</span>
 <span id="L278" class="LineNr">278 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L279" class="LineNr">279 </span>    68/push  _test-stream-buffer/imm32
-<span id="L280" class="LineNr">280 </span>    68/push  _test-stream/imm32
+<span id="L279" class="LineNr">279 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L280" class="LineNr">280 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L281" class="LineNr">281 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L282" class="LineNr">282 </span>    e8/call  read/disp32
+<span id="L282" class="LineNr">282 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
 <span id="L283" class="LineNr">283 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L284" class="LineNr">284 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L284" class="LineNr">284 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L285" class="LineNr">285 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-buffer-&gt;data, 43/C 44/D 00 00, msg)</span>
 <span id="L286" class="LineNr">286 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L287" class="LineNr">287 </span>    68/push  <span class="Constant">&quot;F - test-read-is-stateful&quot;</span>/imm32
 <span id="L288" class="LineNr">288 </span>    68/push  0x00004443/imm32/C-D
 <span id="L289" class="LineNr">289 </span>    <span class="subxS2Comment"># . . push *_test-stream-buffer-&gt;data</span>
-<span id="L290" class="LineNr">290 </span>    b8/copy-to-EAX  _test-stream-buffer/imm32
-<span id="L291" class="LineNr">291 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L290" class="LineNr">290 </span>    b8/copy-to-EAX  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L291" class="LineNr">291 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L292" class="LineNr">292 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L293" class="LineNr">293 </span>    e8/call  check-ints-equal/disp32
+<span id="L293" class="LineNr">293 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L294" class="LineNr">294 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L295" class="LineNr">295 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L295" class="LineNr">295 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L296" class="LineNr">296 </span>    <span class="subxComment"># end</span>
 <span id="L297" class="LineNr">297 </span>    c3/return
 <span id="L298" class="LineNr">298 </span>
-<span id="L299" class="LineNr">299 </span><span class="subxTest">test-read-returns-0-on-end-of-file</span>:
+<span id="L299" class="LineNr">299 </span><span class="subxTest"><a href='058read.subx.html#L299'>test-read-returns-0-on-end-of-file</a></span>:
 <span id="L300" class="LineNr">300 </span>    <span class="subxH1Comment"># - read after hitting end-of-file, check that result is 0</span>
 <span id="L301" class="LineNr">301 </span>    <span class="subxComment"># setup</span>
 <span id="L302" class="LineNr">302 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L303" class="LineNr">303 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L304" class="LineNr">304 </span>    68/push  _test-stream/imm32
+<span id="L304" class="LineNr">304 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L305" class="LineNr">305 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L306" class="LineNr">306 </span>    e8/call  clear-stream/disp32
+<span id="L306" class="LineNr">306 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L307" class="LineNr">307 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L308" class="LineNr">308 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L308" class="LineNr">308 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L309" class="LineNr">309 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream-buffer)</span>
 <span id="L310" class="LineNr">310 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L311" class="LineNr">311 </span>    68/push  _test-stream-buffer/imm32
+<span id="L311" class="LineNr">311 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
 <span id="L312" class="LineNr">312 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L313" class="LineNr">313 </span>    e8/call  clear-stream/disp32
+<span id="L313" class="LineNr">313 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L314" class="LineNr">314 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L315" class="LineNr">315 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L315" class="LineNr">315 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L316" class="LineNr">316 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Ab&quot;)</span>
 <span id="L317" class="LineNr">317 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L318" class="LineNr">318 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L319" class="LineNr">319 </span>    68/push  _test-stream/imm32
+<span id="L319" class="LineNr">319 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L320" class="LineNr">320 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L321" class="LineNr">321 </span>    e8/call  write/disp32
+<span id="L321" class="LineNr">321 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L322" class="LineNr">322 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L323" class="LineNr">323 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L323" class="LineNr">323 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L324" class="LineNr">324 </span>    <span class="subxComment"># first read gets to end-of-file</span>
 <span id="L325" class="LineNr">325 </span>    <span class="subxS1Comment"># . read(_test-stream, _test-stream-buffer)</span>
 <span id="L326" class="LineNr">326 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L327" class="LineNr">327 </span>    68/push  _test-stream-buffer/imm32
-<span id="L328" class="LineNr">328 </span>    68/push  _test-stream/imm32
+<span id="L327" class="LineNr">327 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L328" class="LineNr">328 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L329" class="LineNr">329 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L330" class="LineNr">330 </span>    e8/call  read/disp32
+<span id="L330" class="LineNr">330 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
 <span id="L331" class="LineNr">331 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L332" class="LineNr">332 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L332" class="LineNr">332 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L333" class="LineNr">333 </span>    <span class="subxComment"># second read</span>
 <span id="L334" class="LineNr">334 </span>    <span class="subxS1Comment"># . read(_test-stream, _test-stream-buffer)</span>
 <span id="L335" class="LineNr">335 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L336" class="LineNr">336 </span>    68/push  _test-stream-buffer/imm32
-<span id="L337" class="LineNr">337 </span>    68/push  _test-stream/imm32
+<span id="L336" class="LineNr">336 </span>    68/push  <a href='058read.subx.html#L356'>_test-stream-buffer</a>/imm32
+<span id="L337" class="LineNr">337 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L338" class="LineNr">338 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L339" class="LineNr">339 </span>    e8/call  read/disp32
+<span id="L339" class="LineNr">339 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
 <span id="L340" class="LineNr">340 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L341" class="LineNr">341 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L341" class="LineNr">341 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L342" class="LineNr">342 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L343" class="LineNr">343 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L344" class="LineNr">344 </span>    68/push  <span class="Constant">&quot;F - test-read-returns-0-on-end-of-file&quot;</span>/imm32
 <span id="L345" class="LineNr">345 </span>    68/push  0/imm32
 <span id="L346" class="LineNr">346 </span>    50/push-EAX
 <span id="L347" class="LineNr">347 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L348" class="LineNr">348 </span>    e8/call  check-ints-equal/disp32
+<span id="L348" class="LineNr">348 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L349" class="LineNr">349 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L350" class="LineNr">350 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L350" class="LineNr">350 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L351" class="LineNr">351 </span>    <span class="subxComment"># end</span>
 <span id="L352" class="LineNr">352 </span>    c3/return
 <span id="L353" class="LineNr">353 </span>
 <span id="L354" class="LineNr">354 </span>== data
 <span id="L355" class="LineNr">355 </span>
-<span id="L356" class="LineNr">356 </span><span class="subxMinorFunction">_test-stream-buffer</span>:
+<span id="L356" class="LineNr">356 </span><span class="subxMinorFunction"><a href='058read.subx.html#L356'>_test-stream-buffer</a></span>:
 <span id="L357" class="LineNr">357 </span>    <span class="subxComment"># current write index</span>
 <span id="L358" class="LineNr">358 </span>    00 00 00 00
 <span id="L359" class="LineNr">359 </span>    <span class="subxComment"># current read index</span>
diff --git a/html/subx/059read-byte.subx.html b/html/subx/059read-byte.subx.html
index 34bf1a1a..962d7828 100644
--- a/html/subx/059read-byte.subx.html
+++ b/html/subx/059read-byte.subx.html
@@ -7,28 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.subxMinorFunction { color: #875f5f; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
-.CommentedCode { color: #6c6c6c; }
-.subxH1Comment { color:#00ffff; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.CommentedCode { color: #8a8a8a; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -77,7 +73,7 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr"> 11 </span>
 <span id="L12" class="LineNr"> 12 </span><span class="subxComment"># The buffered file for standard input. Also illustrates the layout for</span>
 <span id="L13" class="LineNr"> 13 </span><span class="subxComment"># buffered-file.</span>
-<span id="L14" class="LineNr"> 14 </span><span class="SpecialChar">Stdin</span>:
+<span id="L14" class="LineNr"> 14 </span><span class="SpecialChar"><a href='059read-byte.subx.html#L14'>Stdin</a></span>:
 <span id="L15" class="LineNr"> 15 </span>    <span class="subxComment"># file descriptor or (address stream)</span>
 <span id="L16" class="LineNr"> 16 </span>    00 00 00 00  <span class="subxComment"># 0 = standard input</span>
 <span id="L17" class="LineNr"> 17 </span>    <span class="subxComment"># current write index</span>
@@ -102,260 +98,260 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span><span class="CommentedCode">#?     e8/call test-read-byte-multiple/disp32</span>
 <span id="L37" class="LineNr"> 37 </span><span class="CommentedCode">#?     e8/call test-read-byte-refills-buffer/disp32</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L39" class="LineNr"> 39 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L40" class="LineNr"> 40 </span>    b8/copy-to-EAX  1/imm32
+<span id="L39" class="LineNr"> 39 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L40" class="LineNr"> 40 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L41" class="LineNr"> 41 </span>    cd/syscall  0x80/imm8
 <span id="L42" class="LineNr"> 42 </span>
 <span id="L43" class="LineNr"> 43 </span><span class="subxComment"># return next byte value in EAX, with top 3 bytes cleared.</span>
 <span id="L44" class="LineNr"> 44 </span><span class="subxComment"># On EOF, return 0xffffffff.</span>
-<span id="L45" class="LineNr"> 45 </span><span class="subxFunction">read-byte</span>:  <span class="subxComment"># f : (address buffered-file) -&gt; byte-or-eof/EAX</span>
+<span id="L45" class="LineNr"> 45 </span><span class="subxFunction"><a href='059read-byte.subx.html#L45'>read-byte</a></span>:  <span class="subxComment"># f : (address buffered-file) -&gt; byte-or-eof/EAX</span>
 <span id="L46" class="LineNr"> 46 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L47" class="LineNr"> 47 </span>    55/push-EBP
-<span id="L48" class="LineNr"> 48 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L48" class="LineNr"> 48 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L50" class="LineNr"> 50 </span>    51/push-ECX
 <span id="L51" class="LineNr"> 51 </span>    56/push-ESI
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxComment"># ESI = f</span>
-<span id="L53" class="LineNr"> 53 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L53" class="LineNr"> 53 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
 <span id="L54" class="LineNr"> 54 </span>    <span class="subxComment"># ECX = f-&gt;read</span>
-<span id="L55" class="LineNr"> 55 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+8) to ECX</span>
+<span id="L55" class="LineNr"> 55 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+8) to ECX</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># if (f-&gt;read &gt;= f-&gt;write) populate stream from file</span>
-<span id="L57" class="LineNr"> 57 </span>    3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with *(ESI+4)</span>
+<span id="L57" class="LineNr"> 57 </span>    3b/compare                      1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *(ESI+4)</span>
 <span id="L58" class="LineNr"> 58 </span>    7c/jump-if-lesser  $read-byte:from-stream/disp8
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L61" class="LineNr"> 61 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+4 to EAX</span>
+<span id="L61" class="LineNr"> 61 </span>    8d/copy-address                 1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+4 to EAX</span>
 <span id="L62" class="LineNr"> 62 </span>    50/push-EAX
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L64" class="LineNr"> 64 </span>    e8/call  clear-stream/disp32
+<span id="L64" class="LineNr"> 64 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L66" class="LineNr"> 66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L66" class="LineNr"> 66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxS1Comment"># . f-&gt;read must now be 0; update ECX</span>
-<span id="L68" class="LineNr"> 68 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># clear ECX</span>
+<span id="L68" class="LineNr"> 68 </span>    31/xor                          3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear ECX</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . EAX = read(f-&gt;fd, stream = f+4)</span>
 <span id="L70" class="LineNr"> 70 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L71" class="LineNr"> 71 </span>    50/push-EAX
-<span id="L72" class="LineNr"> 72 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># push *ESI</span>
+<span id="L72" class="LineNr"> 72 </span>    ff          6/subop/push        0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ESI</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L74" class="LineNr"> 74 </span>    e8/call  read/disp32
+<span id="L74" class="LineNr"> 74 </span>    e8/call  <a href='058read.subx.html#L55'>read</a>/disp32
 <span id="L75" class="LineNr"> 75 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L76" class="LineNr"> 76 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L76" class="LineNr"> 76 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxComment"># if EAX = 0 return 0xffffffff</span>
-<span id="L78" class="LineNr"> 78 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L78" class="LineNr"> 78 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
 <span id="L79" class="LineNr"> 79 </span>    75/jump-if-not-equal  $read-byte:from-stream/disp8
 <span id="L80" class="LineNr"> 80 </span>    b8/copy-to-EAX  0xffffffff/imm32
 <span id="L81" class="LineNr"> 81 </span>    eb/jump  $read-byte:end/disp8
 <span id="L82" class="LineNr"> 82 </span><span class="Constant">$read-byte:from-stream</span>:
 <span id="L83" class="LineNr"> 83 </span>    <span class="subxComment"># read byte from stream</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="subxComment"># AL = f-&gt;data[f-&gt;read]</span>
-<span id="L85" class="LineNr"> 85 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L86" class="LineNr"> 86 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="CommentedCode"> . </span>          0/r32/AL    0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+16) to AL</span>
+<span id="L85" class="LineNr"> 85 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L86" class="LineNr"> 86 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(ESI+ECX+16) to AL</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="subxComment"># ++f-&gt;read</span>
-<span id="L88" class="LineNr"> 88 </span>    ff          0/subop/increment   1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># increment *(ESI+8)</span>
+<span id="L88" class="LineNr"> 88 </span>    ff          0/subop/increment   1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># increment *(ESI+8)</span>
 <span id="L89" class="LineNr"> 89 </span><span class="Constant">$read-byte:end</span>:
 <span id="L90" class="LineNr"> 90 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L91" class="LineNr"> 91 </span>    5e/pop-to-ESI
 <span id="L92" class="LineNr"> 92 </span>    59/pop-to-ECX
 <span id="L93" class="LineNr"> 93 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L94" class="LineNr"> 94 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L94" class="LineNr"> 94 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L95" class="LineNr"> 95 </span>    5d/pop-to-EBP
 <span id="L96" class="LineNr"> 96 </span>    c3/return
 <span id="L97" class="LineNr"> 97 </span>
 <span id="L98" class="LineNr"> 98 </span><span class="subxH1Comment"># - tests</span>
 <span id="L99" class="LineNr"> 99 </span>
-<span id="L100" class="LineNr">100 </span><span class="subxTest">test-read-byte-single</span>:
+<span id="L100" class="LineNr">100 </span><span class="subxTest"><a href='059read-byte.subx.html#L100'>test-read-byte-single</a></span>:
 <span id="L101" class="LineNr">101 </span>    <span class="subxH1Comment"># - check that read-byte returns first byte of 'file'</span>
 <span id="L102" class="LineNr">102 </span>    <span class="subxComment"># setup</span>
 <span id="L103" class="LineNr">103 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L104" class="LineNr">104 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L105" class="LineNr">105 </span>    68/push  _test-stream/imm32
+<span id="L105" class="LineNr">105 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L106" class="LineNr">106 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L107" class="LineNr">107 </span>    e8/call  clear-stream/disp32
+<span id="L107" class="LineNr">107 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L109" class="LineNr">109 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L109" class="LineNr">109 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L110" class="LineNr">110 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L111" class="LineNr">111 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L112" class="LineNr">112 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L112" class="LineNr">112 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L113" class="LineNr">113 </span>    05/add-to-EAX  4/imm32
 <span id="L114" class="LineNr">114 </span>    50/push-EAX
 <span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L116" class="LineNr">116 </span>    e8/call  clear-stream/disp32
+<span id="L116" class="LineNr">116 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L118" class="LineNr">118 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L118" class="LineNr">118 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L119" class="LineNr">119 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Ab&quot;)</span>
 <span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L121" class="LineNr">121 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L122" class="LineNr">122 </span>    68/push  _test-stream/imm32
+<span id="L122" class="LineNr">122 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L124" class="LineNr">124 </span>    e8/call  write/disp32
+<span id="L124" class="LineNr">124 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L125" class="LineNr">125 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L127" class="LineNr">127 </span>    <span class="subxComment"># read-byte(_test-buffered-file)</span>
 <span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L129" class="LineNr">129 </span>    68/push  _test-buffered-file/imm32
+<span id="L129" class="LineNr">129 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L130" class="LineNr">130 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L131" class="LineNr">131 </span>    e8/call  read-byte/disp32
+<span id="L131" class="LineNr">131 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L133" class="LineNr">133 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L133" class="LineNr">133 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L134" class="LineNr">134 </span>    <span class="subxComment"># check-ints-equal(EAX, 'A', msg)</span>
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L136" class="LineNr">136 </span>    68/push  <span class="Constant">&quot;F - test-read-byte-single&quot;</span>/imm32
 <span id="L137" class="LineNr">137 </span>    68/push  0x41/imm32
 <span id="L138" class="LineNr">138 </span>    50/push-EAX
 <span id="L139" class="LineNr">139 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L140" class="LineNr">140 </span>    e8/call  check-ints-equal/disp32
+<span id="L140" class="LineNr">140 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L142" class="LineNr">142 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L142" class="LineNr">142 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L143" class="LineNr">143 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L144" class="LineNr">144 </span>    c3/return
 <span id="L145" class="LineNr">145 </span>
-<span id="L146" class="LineNr">146 </span><span class="subxTest">test-read-byte-multiple</span>:
+<span id="L146" class="LineNr">146 </span><span class="subxTest"><a href='059read-byte.subx.html#L146'>test-read-byte-multiple</a></span>:
 <span id="L147" class="LineNr">147 </span>    <span class="subxH1Comment"># - call read-byte twice, check that second call returns second byte</span>
 <span id="L148" class="LineNr">148 </span>    <span class="subxComment"># setup</span>
 <span id="L149" class="LineNr">149 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L150" class="LineNr">150 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L151" class="LineNr">151 </span>    68/push  _test-stream/imm32
+<span id="L151" class="LineNr">151 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L152" class="LineNr">152 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L153" class="LineNr">153 </span>    e8/call  clear-stream/disp32
+<span id="L153" class="LineNr">153 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L155" class="LineNr">155 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L155" class="LineNr">155 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L156" class="LineNr">156 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L158" class="LineNr">158 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L158" class="LineNr">158 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L159" class="LineNr">159 </span>    05/add-to-EAX  4/imm32
 <span id="L160" class="LineNr">160 </span>    50/push-EAX
 <span id="L161" class="LineNr">161 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L162" class="LineNr">162 </span>    e8/call  clear-stream/disp32
+<span id="L162" class="LineNr">162 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L163" class="LineNr">163 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L164" class="LineNr">164 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L164" class="LineNr">164 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L165" class="LineNr">165 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Ab&quot;)</span>
 <span id="L166" class="LineNr">166 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L167" class="LineNr">167 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L168" class="LineNr">168 </span>    68/push  _test-stream/imm32
+<span id="L168" class="LineNr">168 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L169" class="LineNr">169 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L170" class="LineNr">170 </span>    e8/call  write/disp32
+<span id="L170" class="LineNr">170 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L171" class="LineNr">171 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L172" class="LineNr">172 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L172" class="LineNr">172 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L173" class="LineNr">173 </span>    <span class="subxComment"># read-byte(_test-buffered-file)</span>
 <span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L175" class="LineNr">175 </span>    68/push  _test-buffered-file/imm32
+<span id="L175" class="LineNr">175 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L177" class="LineNr">177 </span>    e8/call  read-byte/disp32
+<span id="L177" class="LineNr">177 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L179" class="LineNr">179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L179" class="LineNr">179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L180" class="LineNr">180 </span>    <span class="subxComment"># read-byte(_test-buffered-file)</span>
 <span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L182" class="LineNr">182 </span>    68/push  _test-buffered-file/imm32
+<span id="L182" class="LineNr">182 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L184" class="LineNr">184 </span>    e8/call  read-byte/disp32
+<span id="L184" class="LineNr">184 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L185" class="LineNr">185 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L186" class="LineNr">186 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L186" class="LineNr">186 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L187" class="LineNr">187 </span>    <span class="subxComment"># check-ints-equal(EAX, 'b', msg)</span>
 <span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L189" class="LineNr">189 </span>    68/push  <span class="Constant">&quot;F - test-read-byte-multiple&quot;</span>/imm32
 <span id="L190" class="LineNr">190 </span>    68/push  0x62/imm32
 <span id="L191" class="LineNr">191 </span>    50/push-EAX
 <span id="L192" class="LineNr">192 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L193" class="LineNr">193 </span>    e8/call  check-ints-equal/disp32
+<span id="L193" class="LineNr">193 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L194" class="LineNr">194 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L195" class="LineNr">195 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L195" class="LineNr">195 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L196" class="LineNr">196 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L197" class="LineNr">197 </span>    c3/return
 <span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="subxTest">test-read-byte-end-of-file</span>:
+<span id="L199" class="LineNr">199 </span><span class="subxTest"><a href='059read-byte.subx.html#L199'>test-read-byte-end-of-file</a></span>:
 <span id="L200" class="LineNr">200 </span>    <span class="subxH1Comment"># - call read-byte on an empty 'file', check that it returns 0xffffffff</span>
 <span id="L201" class="LineNr">201 </span>    <span class="subxComment"># setup</span>
 <span id="L202" class="LineNr">202 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L204" class="LineNr">204 </span>    68/push  _test-stream/imm32
+<span id="L204" class="LineNr">204 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L205" class="LineNr">205 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L206" class="LineNr">206 </span>    e8/call  clear-stream/disp32
+<span id="L206" class="LineNr">206 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L207" class="LineNr">207 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L208" class="LineNr">208 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L208" class="LineNr">208 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L209" class="LineNr">209 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L210" class="LineNr">210 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L211" class="LineNr">211 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L211" class="LineNr">211 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L212" class="LineNr">212 </span>    05/add-to-EAX  4/imm32
 <span id="L213" class="LineNr">213 </span>    50/push-EAX
 <span id="L214" class="LineNr">214 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L215" class="LineNr">215 </span>    e8/call  clear-stream/disp32
+<span id="L215" class="LineNr">215 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L216" class="LineNr">216 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L217" class="LineNr">217 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L217" class="LineNr">217 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L218" class="LineNr">218 </span>    <span class="subxComment"># read-byte(_test-buffered-file)</span>
 <span id="L219" class="LineNr">219 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L220" class="LineNr">220 </span>    68/push  _test-buffered-file/imm32
+<span id="L220" class="LineNr">220 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L221" class="LineNr">221 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L222" class="LineNr">222 </span>    e8/call  read-byte/disp32
+<span id="L222" class="LineNr">222 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L224" class="LineNr">224 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L224" class="LineNr">224 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L225" class="LineNr">225 </span>    <span class="subxComment"># check-ints-equal(EAX, 0xffffffff, msg)</span>
 <span id="L226" class="LineNr">226 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L227" class="LineNr">227 </span>    68/push  <span class="Constant">&quot;F - test-read-byte-end-of-file&quot;</span>/imm32
 <span id="L228" class="LineNr">228 </span>    68/push  0xffffffff/imm32
 <span id="L229" class="LineNr">229 </span>    50/push-EAX
 <span id="L230" class="LineNr">230 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L231" class="LineNr">231 </span>    e8/call  check-ints-equal/disp32
+<span id="L231" class="LineNr">231 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L232" class="LineNr">232 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L233" class="LineNr">233 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L233" class="LineNr">233 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L234" class="LineNr">234 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L235" class="LineNr">235 </span>    c3/return
 <span id="L236" class="LineNr">236 </span>
-<span id="L237" class="LineNr">237 </span><span class="subxTest">test-read-byte-refills-buffer</span>:
+<span id="L237" class="LineNr">237 </span><span class="subxTest"><a href='059read-byte.subx.html#L237'>test-read-byte-refills-buffer</a></span>:
 <span id="L238" class="LineNr">238 </span>    <span class="subxH1Comment"># - consume buffered-file's buffer, check that next read-byte still works</span>
 <span id="L239" class="LineNr">239 </span>    <span class="subxComment"># setup</span>
 <span id="L240" class="LineNr">240 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L241" class="LineNr">241 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L242" class="LineNr">242 </span>    68/push  _test-stream/imm32
+<span id="L242" class="LineNr">242 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L243" class="LineNr">243 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L244" class="LineNr">244 </span>    e8/call  clear-stream/disp32
+<span id="L244" class="LineNr">244 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L245" class="LineNr">245 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L246" class="LineNr">246 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L246" class="LineNr">246 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L247" class="LineNr">247 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L248" class="LineNr">248 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L249" class="LineNr">249 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L249" class="LineNr">249 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L250" class="LineNr">250 </span>    05/add-to-EAX  4/imm32
 <span id="L251" class="LineNr">251 </span>    50/push-EAX
 <span id="L252" class="LineNr">252 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L253" class="LineNr">253 </span>    e8/call  clear-stream/disp32
+<span id="L253" class="LineNr">253 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L254" class="LineNr">254 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L255" class="LineNr">255 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L255" class="LineNr">255 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L256" class="LineNr">256 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;Abcdefgh&quot;)</span>
 <span id="L257" class="LineNr">257 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L258" class="LineNr">258 </span>    68/push  <span class="Constant">&quot;Abcdefgh&quot;</span>/imm32
-<span id="L259" class="LineNr">259 </span>    68/push  _test-stream/imm32
+<span id="L259" class="LineNr">259 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L260" class="LineNr">260 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L261" class="LineNr">261 </span>    e8/call  write/disp32
+<span id="L261" class="LineNr">261 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L262" class="LineNr">262 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L263" class="LineNr">263 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L263" class="LineNr">263 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L264" class="LineNr">264 </span>    <span class="subxComment"># pretend buffer is full</span>
 <span id="L265" class="LineNr">265 </span>    <span class="subxS1Comment"># . _test-buffered-file-&gt;read = 6  # &gt;= _test-buffered-file-&gt;length</span>
-<span id="L266" class="LineNr">266 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
-<span id="L267" class="LineNr">267 </span>    c7/copy                         1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         6/imm32           <span class="subxComment"># copy to *(EAX+8)</span>
+<span id="L266" class="LineNr">266 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L267" class="LineNr">267 </span>    c7          0/subop/copy        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         6/imm32           <span class="subxComment"># copy to *(EAX+8)</span>
 <span id="L268" class="LineNr">268 </span>    <span class="subxComment"># read-byte(_test-buffered-file)</span>
 <span id="L269" class="LineNr">269 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L270" class="LineNr">270 </span>    68/push  _test-buffered-file/imm32
+<span id="L270" class="LineNr">270 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L271" class="LineNr">271 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L272" class="LineNr">272 </span>    e8/call  read-byte/disp32
+<span id="L272" class="LineNr">272 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L273" class="LineNr">273 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L274" class="LineNr">274 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L274" class="LineNr">274 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L275" class="LineNr">275 </span>    <span class="subxComment"># check-ints-equal(EAX, 'A', msg)</span>
 <span id="L276" class="LineNr">276 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L277" class="LineNr">277 </span>    68/push  <span class="Constant">&quot;F - test-read-byte-refills-buffer&quot;</span>/imm32
 <span id="L278" class="LineNr">278 </span>    68/push  0x41/imm32
 <span id="L279" class="LineNr">279 </span>    50/push-EAX
 <span id="L280" class="LineNr">280 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L281" class="LineNr">281 </span>    e8/call  check-ints-equal/disp32
+<span id="L281" class="LineNr">281 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L282" class="LineNr">282 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L283" class="LineNr">283 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L283" class="LineNr">283 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L284" class="LineNr">284 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L285" class="LineNr">285 </span>    c3/return
 <span id="L286" class="LineNr">286 </span>
 <span id="L287" class="LineNr">287 </span>== data
 <span id="L288" class="LineNr">288 </span>
 <span id="L289" class="LineNr">289 </span><span class="subxComment"># a test buffered file for _test-stream</span>
-<span id="L290" class="LineNr">290 </span><span class="subxMinorFunction">_test-buffered-file</span>:
+<span id="L290" class="LineNr">290 </span><span class="subxMinorFunction"><a href='059read-byte.subx.html#L290'>_test-buffered-file</a></span>:
 <span id="L291" class="LineNr">291 </span>    <span class="subxComment"># file descriptor or (address stream)</span>
-<span id="L292" class="LineNr">292 </span>    _test-stream/imm32
+<span id="L292" class="LineNr">292 </span>    <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L293" class="LineNr">293 </span>    <span class="subxComment"># current write index</span>
 <span id="L294" class="LineNr">294 </span>    00 00 00 00
 <span id="L295" class="LineNr">295 </span>    <span class="subxComment"># current read index</span>
diff --git a/html/subx/060write-stream.subx.html b/html/subx/060write-stream.subx.html
index d8fd2059..1a3da3d8 100644
--- a/html/subx/060write-stream.subx.html
+++ b/html/subx/060write-stream.subx.html
@@ -7,26 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.subxMinorFunction { color: #875f5f; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.subxMinorFunction { color: #875f5f; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .SpecialChar { color: #d70000; }
 -->
 </style>
@@ -80,24 +76,24 @@ if ('onhashchange' in window) {
 <span id="L15" class="LineNr"> 15 </span><span class="CommentedCode">#?     e8/call test-write-stream-appends/disp32</span>
 <span id="L16" class="LineNr"> 16 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L17" class="LineNr"> 17 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L18" class="LineNr"> 18 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L19" class="LineNr"> 19 </span>    b8/copy-to-EAX  1/imm32
+<span id="L18" class="LineNr"> 18 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L19" class="LineNr"> 19 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L20" class="LineNr"> 20 </span>    cd/syscall  0x80/imm8
 <span id="L21" class="LineNr"> 21 </span>
-<span id="L22" class="LineNr"> 22 </span><span class="subxFunction">write-stream</span>:  <span class="subxComment"># f : fd or (address stream), s : (address stream) -&gt; &lt;void&gt;</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxFunction"><a href='060write-stream.subx.html#L22'>write-stream</a></span>:  <span class="subxComment"># f : fd or (address stream), s : (address stream) -&gt; &lt;void&gt;</span>
 <span id="L23" class="LineNr"> 23 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L24" class="LineNr"> 24 </span>    55/push-EBP
-<span id="L25" class="LineNr"> 25 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L25" class="LineNr"> 25 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L26" class="LineNr"> 26 </span>    <span class="subxComment"># if (f &lt; 0x08000000) _write-stream(f, s), return  # f can't be a user-mode address, so treat it as a kernel file descriptor</span>
-<span id="L27" class="LineNr"> 27 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L27" class="LineNr"> 27 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x08000000/imm32  <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L28" class="LineNr"> 28 </span>    7d/jump-if-greater-or-equal  $write-stream:fake/disp8
 <span id="L29" class="LineNr"> 29 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L30" class="LineNr"> 30 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L31" class="LineNr"> 31 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L30" class="LineNr"> 30 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L31" class="LineNr"> 31 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L33" class="LineNr"> 33 </span>    e8/call  _write-stream/disp32
+<span id="L33" class="LineNr"> 33 </span>    e8/call  <a href='060write-stream.subx.html#L82'>_write-stream</a>/disp32
 <span id="L34" class="LineNr"> 34 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L35" class="LineNr"> 35 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L35" class="LineNr"> 35 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L36" class="LineNr"> 36 </span>    eb/jump  $write-stream:end/disp8
 <span id="L37" class="LineNr"> 37 </span><span class="Constant">$write-stream:fake</span>:
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxComment"># otherwise, treat 'f' as a stream to append to</span>
@@ -106,48 +102,48 @@ if ('onhashchange' in window) {
 <span id="L41" class="LineNr"> 41 </span>    56/push-ESI
 <span id="L42" class="LineNr"> 42 </span>    57/push-EDI
 <span id="L43" class="LineNr"> 43 </span>    <span class="subxComment"># EDI = f</span>
-<span id="L44" class="LineNr"> 44 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L44" class="LineNr"> 44 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># ESI = s</span>
-<span id="L46" class="LineNr"> 46 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L46" class="LineNr"> 46 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># EAX = _append-4(&amp;f-&gt;data[f-&gt;write], &amp;f-&gt;data[f-&gt;length], &amp;s-&gt;data[s-&gt;read], &amp;s-&gt;data[s-&gt;write])</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . push &amp;s-&gt;data[s-&gt;write]</span>
-<span id="L49" class="LineNr"> 49 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
-<span id="L50" class="LineNr"> 50 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
+<span id="L49" class="LineNr"> 49 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EAX</span>
+<span id="L50" class="LineNr"> 50 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L51" class="LineNr"> 51 </span>    50/push-EAX
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS2Comment"># . . push &amp;s-&gt;data[s-&gt;read]</span>
-<span id="L53" class="LineNr"> 53 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
-<span id="L54" class="LineNr"> 54 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
+<span id="L53" class="LineNr"> 53 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EAX</span>
+<span id="L54" class="LineNr"> 54 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EAX+12 to EAX</span>
 <span id="L55" class="LineNr"> 55 </span>    50/push-EAX
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxS2Comment"># . . push &amp;f-&gt;data[f-&gt;length]</span>
-<span id="L57" class="LineNr"> 57 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EAX</span>
-<span id="L58" class="LineNr"> 58 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
+<span id="L57" class="LineNr"> 57 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+8) to EAX</span>
+<span id="L58" class="LineNr"> 58 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L59" class="LineNr"> 59 </span>    50/push-EAX
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxS2Comment"># . . push &amp;f-&gt;data[f-&gt;write]</span>
-<span id="L61" class="LineNr"> 61 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to EAX</span>
-<span id="L62" class="LineNr"> 62 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
+<span id="L61" class="LineNr"> 61 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to EAX</span>
+<span id="L62" class="LineNr"> 62 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  0/index/EAX  <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+EAX+12 to EAX</span>
 <span id="L63" class="LineNr"> 63 </span>    50/push-EAX
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L65" class="LineNr"> 65 </span>    e8/call  _append-4/disp32
+<span id="L65" class="LineNr"> 65 </span>    e8/call  <a href='055trace.subx.html#L311'>_append-4</a>/disp32
 <span id="L66" class="LineNr"> 66 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L67" class="LineNr"> 67 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L67" class="LineNr"> 67 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># f-&gt;write += EAX</span>
-<span id="L69" class="LineNr"> 69 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
+<span id="L69" class="LineNr"> 69 </span>    01/add                          0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *EDI</span>
 <span id="L70" class="LineNr"> 70 </span>    <span class="subxComment"># s-&gt;read += EAX</span>
-<span id="L71" class="LineNr"> 71 </span>    01/add                          1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># add EAX to *(ESI+4)</span>
+<span id="L71" class="LineNr"> 71 </span>    01/add                          1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># add EAX to *(ESI+4)</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L73" class="LineNr"> 73 </span>    5f/pop-to-EDI
 <span id="L74" class="LineNr"> 74 </span>    5e/pop-to-ESI
 <span id="L75" class="LineNr"> 75 </span>    58/pop-to-EAX
 <span id="L76" class="LineNr"> 76 </span><span class="Constant">$write-stream:end</span>:
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L78" class="LineNr"> 78 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L78" class="LineNr"> 78 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L79" class="LineNr"> 79 </span>    5d/pop-to-EBP
 <span id="L80" class="LineNr"> 80 </span>    c3/return
 <span id="L81" class="LineNr"> 81 </span>
-<span id="L82" class="LineNr"> 82 </span><span class="subxMinorFunction">_write-stream</span>:  <span class="subxComment"># fd : int, s : (address stream) -&gt; &lt;void&gt;</span>
+<span id="L82" class="LineNr"> 82 </span><span class="subxMinorFunction"><a href='060write-stream.subx.html#L82'>_write-stream</a></span>:  <span class="subxComment"># fd : int, s : (address stream) -&gt; &lt;void&gt;</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L84" class="LineNr"> 84 </span>    55/push-EBP
-<span id="L85" class="LineNr"> 85 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L85" class="LineNr"> 85 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L86" class="LineNr"> 86 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L87" class="LineNr"> 87 </span>    50/push-EAX
 <span id="L88" class="LineNr"> 88 </span>    51/push-ECX
@@ -156,18 +152,18 @@ if ('onhashchange' in window) {
 <span id="L91" class="LineNr"> 91 </span>    56/push-ESI
 <span id="L92" class="LineNr"> 92 </span>    57/push-EDI
 <span id="L93" class="LineNr"> 93 </span>    <span class="subxComment"># ESI = s</span>
-<span id="L94" class="LineNr"> 94 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L94" class="LineNr"> 94 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="subxComment"># EDI = s-&gt;read</span>
-<span id="L96" class="LineNr"> 96 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          7/r32/EDI   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESI+4) to EDI</span>
+<span id="L96" class="LineNr"> 96 </span>    8b/copy                         1/mod/*+disp8   6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESI+4) to EDI</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxComment"># EDX = s-&gt;write</span>
-<span id="L98" class="LineNr"> 98 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ESI to EDX</span>
+<span id="L98" class="LineNr"> 98 </span>    8b/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ESI to EDX</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="subxComment"># syscall(write, fd, &amp;s-&gt;data[s-&gt;read], s-&gt;write-s-&gt;read)</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxS2Comment"># . . fd : EBX</span>
-<span id="L101" class="LineNr">101 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L101" class="LineNr">101 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
 <span id="L102" class="LineNr">102 </span>    <span class="subxS2Comment"># . . data : ECX = &amp;s-&gt;data[s-&gt;read]</span>
-<span id="L103" class="LineNr">103 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  7/index/EDI  <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+EDI+12 to ECX</span>
+<span id="L103" class="LineNr">103 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    6/base/ESI  7/index/EDI  <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+EDI+12 to ECX</span>
 <span id="L104" class="LineNr">104 </span>    <span class="subxS2Comment"># . . size : EDX = s-&gt;write - s-&gt;read</span>
-<span id="L105" class="LineNr">105 </span>    29/subtract                     3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          7/r32/EDI  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract EDI from EDX</span>
+<span id="L105" class="LineNr">105 </span>    29/subtract                     3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract EDI from EDX</span>
 <span id="L106" class="LineNr">106 </span>    <span class="subxS2Comment"># . . syscall</span>
 <span id="L107" class="LineNr">107 </span>    b8/copy-to-EAX  4/imm32/write
 <span id="L108" class="LineNr">108 </span>    cd/syscall  0x80/imm8
@@ -179,123 +175,123 @@ if ('onhashchange' in window) {
 <span id="L114" class="LineNr">114 </span>    59/pop-to-ECX
 <span id="L115" class="LineNr">115 </span>    58/pop-to-EAX
 <span id="L116" class="LineNr">116 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L117" class="LineNr">117 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L117" class="LineNr">117 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L118" class="LineNr">118 </span>    5d/pop-to-EBP
 <span id="L119" class="LineNr">119 </span>    c3/return
 <span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="subxTest">test-write-stream-single</span>:
+<span id="L121" class="LineNr">121 </span><span class="subxTest"><a href='060write-stream.subx.html#L121'>test-write-stream-single</a></span>:
 <span id="L122" class="LineNr">122 </span>    <span class="subxComment"># setup</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L125" class="LineNr">125 </span>    68/push  _test-stream/imm32
+<span id="L125" class="LineNr">125 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L127" class="LineNr">127 </span>    e8/call  clear-stream/disp32
+<span id="L127" class="LineNr">127 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L129" class="LineNr">129 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L129" class="LineNr">129 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L130" class="LineNr">130 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream2)</span>
 <span id="L131" class="LineNr">131 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L132" class="LineNr">132 </span>    68/push  _test-stream2/imm32
+<span id="L132" class="LineNr">132 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
 <span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L134" class="LineNr">134 </span>    e8/call  clear-stream/disp32
+<span id="L134" class="LineNr">134 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L136" class="LineNr">136 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L136" class="LineNr">136 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L137" class="LineNr">137 </span>    <span class="subxS1Comment"># . write(_test-stream2, &quot;Ab&quot;)</span>
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L139" class="LineNr">139 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L140" class="LineNr">140 </span>    68/push  _test-stream2/imm32
+<span id="L140" class="LineNr">140 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
 <span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L142" class="LineNr">142 </span>    e8/call  write/disp32
+<span id="L142" class="LineNr">142 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L144" class="LineNr">144 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L144" class="LineNr">144 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L145" class="LineNr">145 </span>    <span class="subxComment"># write-stream(_test-stream, _test-stream2)</span>
 <span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L147" class="LineNr">147 </span>    68/push  _test-stream2/imm32
-<span id="L148" class="LineNr">148 </span>    68/push  _test-stream/imm32
+<span id="L147" class="LineNr">147 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
+<span id="L148" class="LineNr">148 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L150" class="LineNr">150 </span>    e8/call  write-stream/disp32
+<span id="L150" class="LineNr">150 </span>    e8/call  <a href='060write-stream.subx.html#L22'>write-stream</a>/disp32
 <span id="L151" class="LineNr">151 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L152" class="LineNr">152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L152" class="LineNr">152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L153" class="LineNr">153 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 41/A 62/b 00 00, msg)</span>
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L155" class="LineNr">155 </span>    68/push  <span class="Constant">&quot;F - test-write-stream-single&quot;</span>/imm32
 <span id="L156" class="LineNr">156 </span>    68/push  0x006241/imm32/Ab
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L158" class="LineNr">158 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L159" class="LineNr">159 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L158" class="LineNr">158 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L159" class="LineNr">159 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L161" class="LineNr">161 </span>    e8/call  check-ints-equal/disp32
+<span id="L161" class="LineNr">161 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L163" class="LineNr">163 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L164" class="LineNr">164 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L165" class="LineNr">165 </span>    c3/return
 <span id="L166" class="LineNr">166 </span>
-<span id="L167" class="LineNr">167 </span><span class="subxTest">test-write-stream-appends</span>:
+<span id="L167" class="LineNr">167 </span><span class="subxTest"><a href='060write-stream.subx.html#L167'>test-write-stream-appends</a></span>:
 <span id="L168" class="LineNr">168 </span>    <span class="subxComment"># setup</span>
 <span id="L169" class="LineNr">169 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L171" class="LineNr">171 </span>    68/push  _test-stream/imm32
+<span id="L171" class="LineNr">171 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L172" class="LineNr">172 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L173" class="LineNr">173 </span>    e8/call  clear-stream/disp32
+<span id="L173" class="LineNr">173 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L175" class="LineNr">175 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L175" class="LineNr">175 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L176" class="LineNr">176 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream2)</span>
 <span id="L177" class="LineNr">177 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L178" class="LineNr">178 </span>    68/push  _test-stream2/imm32
+<span id="L178" class="LineNr">178 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
 <span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L180" class="LineNr">180 </span>    e8/call  clear-stream/disp32
+<span id="L180" class="LineNr">180 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L182" class="LineNr">182 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L182" class="LineNr">182 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L183" class="LineNr">183 </span>    <span class="subxS1Comment"># . write(_test-stream2, &quot;C&quot;)</span>
 <span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L185" class="LineNr">185 </span>    68/push  <span class="Constant">&quot;C&quot;</span>/imm32
-<span id="L186" class="LineNr">186 </span>    68/push  _test-stream2/imm32
+<span id="L186" class="LineNr">186 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
 <span id="L187" class="LineNr">187 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L188" class="LineNr">188 </span>    e8/call  write/disp32
+<span id="L188" class="LineNr">188 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L191" class="LineNr">191 </span>    <span class="subxComment"># first write</span>
 <span id="L192" class="LineNr">192 </span>    <span class="subxS1Comment"># . write-stream(_test-stream, _test-stream2)</span>
 <span id="L193" class="LineNr">193 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L194" class="LineNr">194 </span>    68/push  _test-stream2/imm32
-<span id="L195" class="LineNr">195 </span>    68/push  _test-stream/imm32
+<span id="L194" class="LineNr">194 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
+<span id="L195" class="LineNr">195 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L196" class="LineNr">196 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L197" class="LineNr">197 </span>    e8/call  write-stream/disp32
+<span id="L197" class="LineNr">197 </span>    e8/call  <a href='060write-stream.subx.html#L22'>write-stream</a>/disp32
 <span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L199" class="LineNr">199 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L199" class="LineNr">199 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L200" class="LineNr">200 </span>    <span class="subxComment"># second write</span>
 <span id="L201" class="LineNr">201 </span>    <span class="subxS1Comment"># . write(_test-stream2, &quot;D&quot;)</span>
 <span id="L202" class="LineNr">202 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L203" class="LineNr">203 </span>    68/push  <span class="Constant">&quot;D&quot;</span>/imm32
-<span id="L204" class="LineNr">204 </span>    68/push  _test-stream2/imm32
+<span id="L204" class="LineNr">204 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
 <span id="L205" class="LineNr">205 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L206" class="LineNr">206 </span>    e8/call  write/disp32
+<span id="L206" class="LineNr">206 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L207" class="LineNr">207 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L208" class="LineNr">208 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L208" class="LineNr">208 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L209" class="LineNr">209 </span>    <span class="subxS1Comment"># . write-stream(_test-stream, _test-stream2)</span>
 <span id="L210" class="LineNr">210 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L211" class="LineNr">211 </span>    68/push  _test-stream2/imm32
-<span id="L212" class="LineNr">212 </span>    68/push  _test-stream/imm32
+<span id="L211" class="LineNr">211 </span>    68/push  <a href='060write-stream.subx.html#L233'>_test-stream2</a>/imm32
+<span id="L212" class="LineNr">212 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L213" class="LineNr">213 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L214" class="LineNr">214 </span>    e8/call  write-stream/disp32
+<span id="L214" class="LineNr">214 </span>    e8/call  <a href='060write-stream.subx.html#L22'>write-stream</a>/disp32
 <span id="L215" class="LineNr">215 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L216" class="LineNr">216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L216" class="LineNr">216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L217" class="LineNr">217 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 43/C 44/D 00 00, msg)</span>
 <span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L219" class="LineNr">219 </span>    68/push  <span class="Constant">&quot;F - test-write-stream-appends&quot;</span>/imm32
 <span id="L220" class="LineNr">220 </span>    68/push  0x00004443/imm32/C-D
 <span id="L221" class="LineNr">221 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L222" class="LineNr">222 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L223" class="LineNr">223 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L222" class="LineNr">222 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L223" class="LineNr">223 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L224" class="LineNr">224 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L225" class="LineNr">225 </span>    e8/call  check-ints-equal/disp32
+<span id="L225" class="LineNr">225 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L226" class="LineNr">226 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L227" class="LineNr">227 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L227" class="LineNr">227 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L228" class="LineNr">228 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L229" class="LineNr">229 </span>    c3/return
 <span id="L230" class="LineNr">230 </span>
 <span id="L231" class="LineNr">231 </span>== data
 <span id="L232" class="LineNr">232 </span>
-<span id="L233" class="LineNr">233 </span><span class="subxMinorFunction">_test-stream2</span>:
+<span id="L233" class="LineNr">233 </span><span class="subxMinorFunction"><a href='060write-stream.subx.html#L233'>_test-stream2</a></span>:
 <span id="L234" class="LineNr">234 </span>    <span class="subxComment"># current write index</span>
 <span id="L235" class="LineNr">235 </span>    04 00 00 00
 <span id="L236" class="LineNr">236 </span>    <span class="subxComment"># current read index</span>
diff --git a/html/subx/061error.subx.html b/html/subx/061error.subx.html
index 04b6ee26..30d502bd 100644
--- a/html/subx/061error.subx.html
+++ b/html/subx/061error.subx.html
@@ -7,25 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.subxFunction { color: #af5f00; text-decoration: underline; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -71,49 +66,49 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="subxComment"># main:</span>
 <span id="L9" class="LineNr"> 9 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L10" class="LineNr">10 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L11" class="LineNr">11 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L12" class="LineNr">12 </span>    b8/copy-to-EAX  1/imm32
+<span id="L11" class="LineNr">11 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L12" class="LineNr">12 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L13" class="LineNr">13 </span>    cd/syscall  0x80/imm8
 <span id="L14" class="LineNr">14 </span>
 <span id="L15" class="LineNr">15 </span><span class="subxComment"># write(out, &quot;Error: &quot;+msg+&quot;\n&quot;) then stop(ed, 1)</span>
-<span id="L16" class="LineNr">16 </span><span class="subxFunction">error</span>:  <span class="subxComment"># ed : (address exit-descriptor), out : fd or (address stream), msg : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L16" class="LineNr">16 </span><span class="subxFunction"><a href='061error.subx.html#L16'>error</a></span>:  <span class="subxComment"># ed : (address exit-descriptor), out : fd or (address stream), msg : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L17" class="LineNr">17 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L18" class="LineNr">18 </span>    55/push-EBP
-<span id="L19" class="LineNr">19 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L19" class="LineNr">19 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L20" class="LineNr">20 </span>    <span class="subxComment"># write(out, &quot;Error: &quot;)</span>
 <span id="L21" class="LineNr">21 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L22" class="LineNr">22 </span>    68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L23" class="LineNr">23 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L23" class="LineNr">23 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L24" class="LineNr">24 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L25" class="LineNr">25 </span>    e8/call  write/disp32
+<span id="L25" class="LineNr">25 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L26" class="LineNr">26 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L27" class="LineNr">27 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L27" class="LineNr">27 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L28" class="LineNr">28 </span>    <span class="subxComment"># write(out, msg)</span>
 <span id="L29" class="LineNr">29 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L30" class="LineNr">30 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L31" class="LineNr">31 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L30" class="LineNr">30 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L31" class="LineNr">31 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L32" class="LineNr">32 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L33" class="LineNr">33 </span>    e8/call  write/disp32
+<span id="L33" class="LineNr">33 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L34" class="LineNr">34 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L35" class="LineNr">35 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L35" class="LineNr">35 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L36" class="LineNr">36 </span>    <span class="subxComment"># write(out, Newline)</span>
 <span id="L37" class="LineNr">37 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L38" class="LineNr">38 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L39" class="LineNr">39 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L38" class="LineNr">38 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L39" class="LineNr">39 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L40" class="LineNr">40 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L41" class="LineNr">41 </span>    e8/call  write/disp32
+<span id="L41" class="LineNr">41 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L42" class="LineNr">42 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L43" class="LineNr">43 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L43" class="LineNr">43 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L44" class="LineNr">44 </span>    <span class="subxComment"># stop(ed, 1)</span>
 <span id="L45" class="LineNr">45 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L46" class="LineNr">46 </span>    68/push  1/imm32
-<span id="L47" class="LineNr">47 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L47" class="LineNr">47 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L48" class="LineNr">48 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L49" class="LineNr">49 </span>    e8/call  stop/disp32
+<span id="L49" class="LineNr">49 </span>    e8/call  <a href='057stop.subx.html#L99'>stop</a>/disp32
 <span id="L50" class="LineNr">50 </span>    <span class="subxComment"># should never get past this point</span>
 <span id="L51" class="LineNr">51 </span><span class="Constant">$error:dead-end</span>:
 <span id="L52" class="LineNr">52 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L53" class="LineNr">53 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L53" class="LineNr">53 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L54" class="LineNr">54 </span>    5d/pop-to-EBP
 <span id="L55" class="LineNr">55 </span>    c3/return
 <span id="L56" class="LineNr">56 </span>
diff --git a/html/subx/062write-byte.subx.html b/html/subx/062write-byte.subx.html
index c5e733cc..6b322039 100644
--- a/html/subx/062write-byte.subx.html
+++ b/html/subx/062write-byte.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.Constant { color:#00a0a0; }
-.CommentedCode { color: #6c6c6c; }
-.subxH1Comment { color:#00ffff; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -72,7 +67,7 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr">  7 </span>== data
 <span id="L8" class="LineNr">  8 </span>
 <span id="L9" class="LineNr">  9 </span><span class="subxComment"># The buffered file for standard output.</span>
-<span id="L10" class="LineNr"> 10 </span><span class="SpecialChar">Stdout</span>:
+<span id="L10" class="LineNr"> 10 </span><span class="SpecialChar"><a href='062write-byte.subx.html#L10'>Stdout</a></span>:
 <span id="L11" class="LineNr"> 11 </span>    <span class="subxComment"># file descriptor or (address stream)</span>
 <span id="L12" class="LineNr"> 12 </span>    01 00 00 00  <span class="subxComment"># 1 = standard output</span>
 <span id="L13" class="LineNr"> 13 </span>    <span class="subxComment"># current write index</span>
@@ -95,131 +90,131 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span><span class="subxComment"># main:</span>
 <span id="L31" class="LineNr"> 31 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L33" class="LineNr"> 33 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L34" class="LineNr"> 34 </span>    b8/copy-to-EAX  1/imm32
+<span id="L33" class="LineNr"> 33 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L34" class="LineNr"> 34 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L35" class="LineNr"> 35 </span>    cd/syscall  0x80/imm8
 <span id="L36" class="LineNr"> 36 </span>
 <span id="L37" class="LineNr"> 37 </span><span class="subxComment"># Write lower byte of 'n' to 'f'.</span>
-<span id="L38" class="LineNr"> 38 </span><span class="subxFunction">write-byte</span>:  <span class="subxComment"># f : (address buffered-file), n : num -&gt; &lt;void&gt;</span>
+<span id="L38" class="LineNr"> 38 </span><span class="subxFunction"><a href='062write-byte.subx.html#L38'>write-byte</a></span>:  <span class="subxComment"># f : (address buffered-file), n : int -&gt; &lt;void&gt;</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L40" class="LineNr"> 40 </span>    55/push-EBP
-<span id="L41" class="LineNr"> 41 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L41" class="LineNr"> 41 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L42" class="LineNr"> 42 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L43" class="LineNr"> 43 </span>    51/push-ECX
 <span id="L44" class="LineNr"> 44 </span>    57/push-EDI
 <span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># EDI = f</span>
-<span id="L46" class="LineNr"> 46 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L46" class="LineNr"> 46 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># ECX = f-&gt;write</span>
-<span id="L48" class="LineNr"> 48 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+4) to ECX</span>
+<span id="L48" class="LineNr"> 48 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to ECX</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="subxComment"># if (f-&gt;write &gt;= f-&gt;length) flush and clear f's stream</span>
-<span id="L50" class="LineNr"> 50 </span>    3b/compare                      1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with *(EDI+12)</span>
+<span id="L50" class="LineNr"> 50 </span>    3b/compare                      1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with *(EDI+12)</span>
 <span id="L51" class="LineNr"> 51 </span>    7c/jump-if-lesser  $write-byte:to-stream/disp8
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS1Comment"># . flush(f)</span>
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L54" class="LineNr"> 54 </span>    57/push-EDI
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L56" class="LineNr"> 56 </span>    e8/call  flush/disp32
+<span id="L56" class="LineNr"> 56 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L58" class="LineNr"> 58 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L58" class="LineNr"> 58 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L61" class="LineNr"> 61 </span>    8d/copy-address                 1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+4 to EAX</span>
+<span id="L61" class="LineNr"> 61 </span>    8d/copy-address                 1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+4 to EAX</span>
 <span id="L62" class="LineNr"> 62 </span>    50/push-EAX
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L64" class="LineNr"> 64 </span>    e8/call  clear-stream/disp32
+<span id="L64" class="LineNr"> 64 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L66" class="LineNr"> 66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L66" class="LineNr"> 66 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L67" class="LineNr"> 67 </span><span class="Constant">$write-byte:to-stream</span>:
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># write to stream</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># f-&gt;data[f-&gt;read] = LSB(n)</span>
-<span id="L70" class="LineNr"> 70 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L71" class="LineNr"> 71 </span>    8a/copy-byte                    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/AL    0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *(EBP+12) to AL</span>
-<span id="L72" class="LineNr"> 72 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          0/r32/AL    0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy AL to *(EDI+ECX+16)</span>
+<span id="L70" class="LineNr"> 70 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L71" class="LineNr"> 71 </span>    8a/copy-byte                    1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL    0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *(EBP+12) to AL</span>
+<span id="L72" class="LineNr"> 72 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+ECX+16)</span>
 <span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># ++f-&gt;read</span>
-<span id="L74" class="LineNr"> 74 </span>    ff          0/subop/increment   1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># increment *(EDI+4)</span>
+<span id="L74" class="LineNr"> 74 </span>    ff          0/subop/increment   1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># increment *(EDI+4)</span>
 <span id="L75" class="LineNr"> 75 </span><span class="Constant">$write-byte:end</span>:
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L77" class="LineNr"> 77 </span>    5f/pop-to-EDI
 <span id="L78" class="LineNr"> 78 </span>    59/pop-to-ECX
 <span id="L79" class="LineNr"> 79 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L80" class="LineNr"> 80 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L80" class="LineNr"> 80 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L81" class="LineNr"> 81 </span>    5d/pop-to-EBP
 <span id="L82" class="LineNr"> 82 </span>    c3/return
 <span id="L83" class="LineNr"> 83 </span>
-<span id="L84" class="LineNr"> 84 </span><span class="subxFunction">flush</span>:  <span class="subxComment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
+<span id="L84" class="LineNr"> 84 </span><span class="subxFunction"><a href='062write-byte.subx.html#L84'>flush</a></span>:  <span class="subxComment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L86" class="LineNr"> 86 </span>    55/push-EBP
-<span id="L87" class="LineNr"> 87 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L87" class="LineNr"> 87 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L89" class="LineNr"> 89 </span>    50/push-EAX
 <span id="L90" class="LineNr"> 90 </span>    51/push-ECX
 <span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># EAX = f</span>
-<span id="L92" class="LineNr"> 92 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L92" class="LineNr"> 92 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L93" class="LineNr"> 93 </span>    <span class="subxComment"># write-stream(f-&gt;fd, data = f+4)</span>
 <span id="L94" class="LineNr"> 94 </span>      <span class="subxS2Comment"># . . push args</span>
-<span id="L95" class="LineNr"> 95 </span>    8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+4 to ECX</span>
+<span id="L95" class="LineNr"> 95 </span>    8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+4 to ECX</span>
 <span id="L96" class="LineNr"> 96 </span>    51/push-ECX
-<span id="L97" class="LineNr"> 97 </span>    ff          6/subop/push        0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># push *EAX</span>
+<span id="L97" class="LineNr"> 97 </span>    ff          6/subop/push        0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *EAX</span>
 <span id="L98" class="LineNr"> 98 </span>      <span class="subxS2Comment"># . . call</span>
-<span id="L99" class="LineNr"> 99 </span>    e8/call  write-stream/disp32
+<span id="L99" class="LineNr"> 99 </span>    e8/call  <a href='060write-stream.subx.html#L22'>write-stream</a>/disp32
 <span id="L100" class="LineNr">100 </span>      <span class="subxS2Comment"># . . discard args</span>
-<span id="L101" class="LineNr">101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L101" class="LineNr">101 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L102" class="LineNr">102 </span><span class="Constant">$flush:end</span>:
 <span id="L103" class="LineNr">103 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L104" class="LineNr">104 </span>    59/pop-to-ECX
 <span id="L105" class="LineNr">105 </span>    58/pop-to-EAX
 <span id="L106" class="LineNr">106 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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="subxH1Comment"># - tests</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="subxTest">test-write-byte-single</span>:
+<span id="L113" class="LineNr">113 </span><span class="subxTest"><a href='062write-byte.subx.html#L113'>test-write-byte-single</a></span>:
 <span id="L114" class="LineNr">114 </span>    <span class="subxH1Comment"># - check that read-byte returns first byte of 'file'</span>
 <span id="L115" class="LineNr">115 </span>    <span class="subxComment"># setup</span>
 <span id="L116" class="LineNr">116 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L118" class="LineNr">118 </span>    68/push  _test-stream/imm32
+<span id="L118" class="LineNr">118 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L119" class="LineNr">119 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L120" class="LineNr">120 </span>    e8/call  clear-stream/disp32
+<span id="L120" class="LineNr">120 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L122" class="LineNr">122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L122" class="LineNr">122 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L125" class="LineNr">125 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L125" class="LineNr">125 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L126" class="LineNr">126 </span>    05/add-to-EAX  4/imm32
 <span id="L127" class="LineNr">127 </span>    50/push-EAX
 <span id="L128" class="LineNr">128 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L129" class="LineNr">129 </span>    e8/call  clear-stream/disp32
+<span id="L129" class="LineNr">129 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L130" class="LineNr">130 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L131" class="LineNr">131 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L131" class="LineNr">131 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L132" class="LineNr">132 </span>    <span class="subxComment"># write-byte(_test-buffered-file, 'A')</span>
 <span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L134" class="LineNr">134 </span>    68/push  0x41/imm32
-<span id="L135" class="LineNr">135 </span>    68/push  _test-buffered-file/imm32
+<span id="L135" class="LineNr">135 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L137" class="LineNr">137 </span>    e8/call  write-byte/disp32
+<span id="L137" class="LineNr">137 </span>    e8/call  <a href='062write-byte.subx.html#L38'>write-byte</a>/disp32
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
 <span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L142" class="LineNr">142 </span>    68/push  _test-buffered-file/imm32
+<span id="L142" class="LineNr">142 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L144" class="LineNr">144 </span>    e8/call  flush/disp32
+<span id="L144" class="LineNr">144 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L145" class="LineNr">145 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L146" class="LineNr">146 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L146" class="LineNr">146 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L147" class="LineNr">147 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, 'A', msg)</span>
 <span id="L148" class="LineNr">148 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L149" class="LineNr">149 </span>    68/push  <span class="Constant">&quot;F - test-write-byte-single&quot;</span>/imm32
 <span id="L150" class="LineNr">150 </span>    68/push  0x41/imm32
 <span id="L151" class="LineNr">151 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L152" class="LineNr">152 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L153" class="LineNr">153 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L152" class="LineNr">152 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L153" class="LineNr">153 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L155" class="LineNr">155 </span>    e8/call  check-ints-equal/disp32
+<span id="L155" class="LineNr">155 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L156" class="LineNr">156 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L157" class="LineNr">157 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L157" class="LineNr">157 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L158" class="LineNr">158 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L159" class="LineNr">159 </span>    c3/return
 <span id="L160" class="LineNr">160 </span>
diff --git a/html/subx/063print-byte.subx.html b/html/subx/063print-byte.subx.html
index 1b78bcda..cc2cf660 100644
--- a/html/subx/063print-byte.subx.html
+++ b/html/subx/063print-byte.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.Constant { color:#00a0a0; }
-.SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -73,134 +68,134 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr">  8 </span><span class="subxComment"># main:</span>
 <span id="L9" class="LineNr">  9 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L10" class="LineNr"> 10 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L11" class="LineNr"> 11 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L12" class="LineNr"> 12 </span>    b8/copy-to-EAX  1/imm32
+<span id="L11" class="LineNr"> 11 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L12" class="LineNr"> 12 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L13" class="LineNr"> 13 </span>    cd/syscall  0x80/imm8
 <span id="L14" class="LineNr"> 14 </span>
-<span id="L15" class="LineNr"> 15 </span><span class="subxFunction">print-byte</span>:  <span class="subxComment"># f : (address buffered-file), n : num -&gt; &lt;void&gt;</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxFunction"><a href='063print-byte.subx.html#L15'>print-byte</a></span>:  <span class="subxComment"># f : (address buffered-file), n : int -&gt; &lt;void&gt;</span>
 <span id="L16" class="LineNr"> 16 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L17" class="LineNr"> 17 </span>    55/push-EBP
-<span id="L18" class="LineNr"> 18 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L18" class="LineNr"> 18 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L19" class="LineNr"> 19 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L20" class="LineNr"> 20 </span>    50/push-EAX
 <span id="L21" class="LineNr"> 21 </span>    <span class="subxComment"># AL = convert upper nibble to hex</span>
-<span id="L22" class="LineNr"> 22 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
-<span id="L23" class="LineNr"> 23 </span>    c1/shift    5/subop/logic-right 3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm8            <span class="subxComment"># shift EAX right by 4 bits, while padding zeroes</span>
+<span id="L22" class="LineNr"> 22 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L23" class="LineNr"> 23 </span>    c1/shift    5/subop/logic-right 3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm8            <span class="subxComment"># shift EAX right by 4 bits, while padding zeroes</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxS1Comment"># . hex-char(AL)</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L26" class="LineNr"> 26 </span>    50/push-EAX
 <span id="L27" class="LineNr"> 27 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L28" class="LineNr"> 28 </span>    e8/call  hex-char/disp32
+<span id="L28" class="LineNr"> 28 </span>    e8/call  <a href='063print-byte.subx.html#L68'>hex-char</a>/disp32
 <span id="L29" class="LineNr"> 29 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L30" class="LineNr"> 30 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L30" class="LineNr"> 30 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L31" class="LineNr"> 31 </span>    <span class="subxComment"># write-byte(f, AL)</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L33" class="LineNr"> 33 </span>    50/push-EAX
-<span id="L34" class="LineNr"> 34 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L34" class="LineNr"> 34 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L36" class="LineNr"> 36 </span>    e8/call  write-byte/disp32
+<span id="L36" class="LineNr"> 36 </span>    e8/call  <a href='062write-byte.subx.html#L38'>write-byte</a>/disp32
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L38" class="LineNr"> 38 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L38" class="LineNr"> 38 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="subxComment"># AL = convert lower nibble to hex</span>
-<span id="L40" class="LineNr"> 40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L40" class="LineNr"> 40 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
 <span id="L41" class="LineNr"> 41 </span>    25/and-EAX  0xf/imm32
 <span id="L42" class="LineNr"> 42 </span>    <span class="subxS1Comment"># . hex-char(AL)</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L44" class="LineNr"> 44 </span>    50/push-EAX
 <span id="L45" class="LineNr"> 45 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L46" class="LineNr"> 46 </span>    e8/call  hex-char/disp32
+<span id="L46" class="LineNr"> 46 </span>    e8/call  <a href='063print-byte.subx.html#L68'>hex-char</a>/disp32
 <span id="L47" class="LineNr"> 47 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L48" class="LineNr"> 48 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L48" class="LineNr"> 48 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="subxComment"># write-byte(f, AL)</span>
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L51" class="LineNr"> 51 </span>    50/push-EAX
-<span id="L52" class="LineNr"> 52 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L52" class="LineNr"> 52 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L54" class="LineNr"> 54 </span>    e8/call  write-byte/disp32
+<span id="L54" class="LineNr"> 54 </span>    e8/call  <a href='062write-byte.subx.html#L38'>write-byte</a>/disp32
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L56" class="LineNr"> 56 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L56" class="LineNr"> 56 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L57" class="LineNr"> 57 </span><span class="Constant">$print-byte:end</span>:
 <span id="L58" class="LineNr"> 58 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L59" class="LineNr"> 59 </span>    59/pop-to-ECX
 <span id="L60" class="LineNr"> 60 </span>    58/pop-to-EAX
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L62" class="LineNr"> 62 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L62" class="LineNr"> 62 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L63" class="LineNr"> 63 </span>    5d/pop-to-EBP
 <span id="L64" class="LineNr"> 64 </span>    c3/return
 <span id="L65" class="LineNr"> 65 </span>
 <span id="L66" class="LineNr"> 66 </span><span class="subxComment"># extract lowest 4 bits and convert to 8-byte ascii</span>
 <span id="L67" class="LineNr"> 67 </span><span class="subxComment"># return 0xffffffff if more than 4 bits are set</span>
-<span id="L68" class="LineNr"> 68 </span><span class="subxFunction">hex-char</span>:  <span class="subxComment"># n : num -&gt; char_or_error/EAX</span>
+<span id="L68" class="LineNr"> 68 </span><span class="subxFunction"><a href='063print-byte.subx.html#L68'>hex-char</a></span>:  <span class="subxComment"># n : int -&gt; char_or_error/EAX</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L70" class="LineNr"> 70 </span>    55/push-EBP
-<span id="L71" class="LineNr"> 71 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L71" class="LineNr"> 71 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxComment"># EAX = n</span>
-<span id="L73" class="LineNr"> 73 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L73" class="LineNr"> 73 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxComment"># if it's &lt;= 9 add '0' to it</span>
-<span id="L75" class="LineNr"> 75 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x9/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L75" class="LineNr"> 75 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x9/imm32         <span class="subxComment"># compare EAX</span>
 <span id="L76" class="LineNr"> 76 </span>    7f/jump-if-greater  $hex-char:check2/disp8
 <span id="L77" class="LineNr"> 77 </span>    05/add-to-EAX  0x30/imm32/'0'
 <span id="L78" class="LineNr"> 78 </span>    eb/jump  $hex-char:end/disp8
 <span id="L79" class="LineNr"> 79 </span><span class="Constant">$hex-char:check2</span>:
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># else if it's &lt;= 15 add ('a' - 10) to it</span>
-<span id="L81" class="LineNr"> 81 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xf/imm32         <span class="subxComment"># compare EAX</span>
-<span id="L82" class="LineNr"> 82 </span>    7f/jump-if-greater  $hex-char:error/disp8
+<span id="L81" class="LineNr"> 81 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xf/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L82" class="LineNr"> 82 </span>    7f/jump-if-greater  $hex-char:<a href='061error.subx.html#L16'>error</a>/disp8
 <span id="L83" class="LineNr"> 83 </span>    05/add-to-EAX  0x57/imm32  <span class="subxComment"># 'a' - 10</span>
 <span id="L84" class="LineNr"> 84 </span>    eb/jump  $hex-char:end/disp8
-<span id="L85" class="LineNr"> 85 </span><span class="Constant">$hex-char:error</span>:
+<span id="L85" class="LineNr"> 85 </span><span class="Constant">$hex-char:<a href='061error.subx.html#L16'>error</a></span>:
 <span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># otherwise return 0xffffffff</span>
 <span id="L87" class="LineNr"> 87 </span>    b8/copy-to-EAX  0xffffffff/imm32
 <span id="L88" class="LineNr"> 88 </span><span class="Constant">$hex-char:end</span>:
 <span id="L89" class="LineNr"> 89 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L90" class="LineNr"> 90 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L90" class="LineNr"> 90 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L91" class="LineNr"> 91 </span>    5d/pop-to-EBP
 <span id="L92" class="LineNr"> 92 </span>    c3/return
 <span id="L93" class="LineNr"> 93 </span>
-<span id="L94" class="LineNr"> 94 </span><span class="subxTest">test-print-byte</span>:
+<span id="L94" class="LineNr"> 94 </span><span class="subxTest"><a href='063print-byte.subx.html#L94'>test-print-byte</a></span>:
 <span id="L95" class="LineNr"> 95 </span>    <span class="subxH1Comment"># - check that print-byte prints the hex textual representation</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># setup</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L99" class="LineNr"> 99 </span>    68/push  _test-stream/imm32
+<span id="L99" class="LineNr"> 99 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L100" class="LineNr">100 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L101" class="LineNr">101 </span>    e8/call  clear-stream/disp32
+<span id="L101" class="LineNr">101 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L102" class="LineNr">102 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L103" class="LineNr">103 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L103" class="LineNr">103 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L104" class="LineNr">104 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L105" class="LineNr">105 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L106" class="LineNr">106 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L106" class="LineNr">106 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L107" class="LineNr">107 </span>    05/add-to-EAX  4/imm32
 <span id="L108" class="LineNr">108 </span>    50/push-EAX
 <span id="L109" class="LineNr">109 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L110" class="LineNr">110 </span>    e8/call  clear-stream/disp32
+<span id="L110" class="LineNr">110 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L111" class="LineNr">111 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L112" class="LineNr">112 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L112" class="LineNr">112 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L113" class="LineNr">113 </span>    <span class="subxComment"># print-byte(_test-buffered-file, 0xa)  # exercises digit, non-digit as well as leading zero</span>
 <span id="L114" class="LineNr">114 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L115" class="LineNr">115 </span>    68/push  0xa/imm32
-<span id="L116" class="LineNr">116 </span>    68/push  _test-buffered-file/imm32
+<span id="L116" class="LineNr">116 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L118" class="LineNr">118 </span>    e8/call  print-byte/disp32
+<span id="L118" class="LineNr">118 </span>    e8/call  <a href='063print-byte.subx.html#L15'>print-byte</a>/disp32
 <span id="L119" class="LineNr">119 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L120" class="LineNr">120 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L120" class="LineNr">120 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L121" class="LineNr">121 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
 <span id="L122" class="LineNr">122 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L123" class="LineNr">123 </span>    68/push  _test-buffered-file/imm32
+<span id="L123" class="LineNr">123 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L125" class="LineNr">125 </span>    e8/call  flush/disp32
+<span id="L125" class="LineNr">125 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L127" class="LineNr">127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L127" class="LineNr">127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L128" class="LineNr">128 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, '0a', msg)</span>
 <span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L130" class="LineNr">130 </span>    68/push  <span class="Constant">&quot;F - test-print-byte&quot;</span>/imm32
 <span id="L131" class="LineNr">131 </span>    68/push  0x6130/imm32/0a
 <span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L133" class="LineNr">133 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L134" class="LineNr">134 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L133" class="LineNr">133 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L134" class="LineNr">134 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L136" class="LineNr">136 </span>    e8/call  check-ints-equal/disp32
+<span id="L136" class="LineNr">136 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L137" class="LineNr">137 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L138" class="LineNr">138 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L139" class="LineNr">139 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L140" class="LineNr">140 </span>    c3/return
 <span id="L141" class="LineNr">141 </span>
diff --git a/html/subx/064write-buffered.subx.html b/html/subx/064write-buffered.subx.html
index 9351d258..2886cfb4 100644
--- a/html/subx/064write-buffered.subx.html
+++ b/html/subx/064write-buffered.subx.html
@@ -7,27 +7,23 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.Constant { color:#00a0a0; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
 .SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -75,11 +71,11 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr"> 10 </span><span class="CommentedCode">#?     e8/call test-write-buffered-with-intermediate-flush/disp32</span>
 <span id="L11" class="LineNr"> 11 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L12" class="LineNr"> 12 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
-<span id="L13" class="LineNr"> 13 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L14" class="LineNr"> 14 </span>    b8/copy-to-EAX  1/imm32
+<span id="L13" class="LineNr"> 13 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L14" class="LineNr"> 14 </span>    b8/copy-to-EAX  1/imm32/exit
 <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="subxFunction">write-buffered</span>:  <span class="subxComment"># f : (address buffered-file), msg : (address array byte) -&gt; &lt;void&gt;</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxFunction"><a href='064write-buffered.subx.html#L17'>write-buffered</a></span>:  <span class="subxComment"># f : (address buffered-file), msg : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L18" class="LineNr"> 18 </span>    <span class="subxComment"># pseudocode:</span>
 <span id="L19" class="LineNr"> 19 </span>    <span class="subxComment">#   in = msg-&gt;data</span>
 <span id="L20" class="LineNr"> 20 </span>    <span class="subxComment">#   inend = &amp;msg-&gt;data[msg-&gt;length]</span>
@@ -101,7 +97,7 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span>    <span class="subxComment">#</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L38" class="LineNr"> 38 </span>    55/push-EBP
-<span id="L39" class="LineNr"> 39 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L39" class="LineNr"> 39 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L41" class="LineNr"> 41 </span>    50/push-EAX
 <span id="L42" class="LineNr"> 42 </span>    51/push-ECX
@@ -110,52 +106,52 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span>    56/push-ESI
 <span id="L46" class="LineNr"> 46 </span>    57/push-EDI
 <span id="L47" class="LineNr"> 47 </span>    <span class="subxComment"># EAX = msg</span>
-<span id="L48" class="LineNr"> 48 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              0/r32/EAX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
+<span id="L48" class="LineNr"> 48 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        0/r32/EAX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EAX</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="subxComment"># in/ESI = msg-&gt;data</span>
-<span id="L50" class="LineNr"> 50 </span>    8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          6/r32/ESI   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX+4 to ESI</span>
+<span id="L50" class="LineNr"> 50 </span>    8d/copy-address                 1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX+4 to ESI</span>
 <span id="L51" class="LineNr"> 51 </span>    <span class="subxComment"># inend/ECX = &amp;msg-&gt;data[msg-&gt;length]</span>
-<span id="L52" class="LineNr"> 52 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
-<span id="L53" class="LineNr"> 53 </span>    8d/copy-address                 0/mod/indirect  4/rm32/sib    6/base/ESI  1/index/ECX  <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESI+ECX to ECX</span>
+<span id="L52" class="LineNr"> 52 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to ECX</span>
+<span id="L53" class="LineNr"> 53 </span>    8d/copy-address                 0/mod/indirect  4/rm32/sib    6/base/ESI  1/index/ECX  <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESI+ECX to ECX</span>
 <span id="L54" class="LineNr"> 54 </span>    <span class="subxComment"># EDI = f</span>
-<span id="L55" class="LineNr"> 55 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L55" class="LineNr"> 55 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># EDX = f-&gt;length</span>
-<span id="L57" class="LineNr"> 57 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+12) to EDX</span>
+<span id="L57" class="LineNr"> 57 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+12) to EDX</span>
 <span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># EBX = f-&gt;write</span>
-<span id="L59" class="LineNr"> 59 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+4) to EBX</span>
+<span id="L59" class="LineNr"> 59 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+4) to EBX</span>
 <span id="L60" class="LineNr"> 60 </span><span class="Constant">$write-buffered:loop</span>:
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># if (in &gt;= inend) break</span>
-<span id="L62" class="LineNr"> 62 </span>    39/compare                      3/mod/direct    6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ESI with ECX</span>
+<span id="L62" class="LineNr"> 62 </span>    39/compare                      3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ESI with ECX</span>
 <span id="L63" class="LineNr"> 63 </span>    7d/jump-if-greater-or-equal  $write-buffered:loop-end/disp8
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># if (f-&gt;write &gt;= f-&gt;length) flush and clear f's stream</span>
-<span id="L65" class="LineNr"> 65 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EBX with EDX</span>
+<span id="L65" class="LineNr"> 65 </span>    39/compare                      3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EBX with EDX</span>
 <span id="L66" class="LineNr"> 66 </span>    7c/jump-if-lesser  $write-buffered:to-stream/disp8
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxS1Comment"># . persist f-&gt;write</span>
-<span id="L68" class="LineNr"> 68 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBX to *(EDI+4)</span>
+<span id="L68" class="LineNr"> 68 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EBX to *(EDI+4)</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxS1Comment"># . flush(f)</span>
 <span id="L70" class="LineNr"> 70 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L71" class="LineNr"> 71 </span>    57/push-EDI
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L73" class="LineNr"> 73 </span>    e8/call  flush/disp32
+<span id="L73" class="LineNr"> 73 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L75" class="LineNr"> 75 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L75" class="LineNr"> 75 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxS1Comment"># . clear-stream(stream = f+4)</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L78" class="LineNr"> 78 </span>    8d/copy-address                 1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+4 to EAX</span>
+<span id="L78" class="LineNr"> 78 </span>    8d/copy-address                 1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+4 to EAX</span>
 <span id="L79" class="LineNr"> 79 </span>    50/push-EAX
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L81" class="LineNr"> 81 </span>    e8/call  clear-stream/disp32
+<span id="L81" class="LineNr"> 81 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L83" class="LineNr"> 83 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L83" class="LineNr"> 83 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L84" class="LineNr"> 84 </span>    <span class="subxS1Comment"># . clear EBX (cached f-&gt;write)</span>
-<span id="L85" class="LineNr"> 85 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># clear EBX</span>
+<span id="L85" class="LineNr"> 85 </span>    31/xor                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EBX</span>
 <span id="L86" class="LineNr"> 86 </span><span class="Constant">$write-buffered:to-stream</span>:
 <span id="L87" class="LineNr"> 87 </span>    <span class="subxComment"># write to stream</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxComment"># f-&gt;data[f-&gt;write] = *in</span>
 <span id="L89" class="LineNr"> 89 </span>    <span class="subxS1Comment"># . AL = *in</span>
-<span id="L90" class="LineNr"> 90 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># clear EAX</span>
-<span id="L91" class="LineNr"> 91 </span>    8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/AL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to AL</span>
+<span id="L90" class="LineNr"> 90 </span>    31/xor                          3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># clear EAX</span>
+<span id="L91" class="LineNr"> 91 </span>    8a/copy-byte                    0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ESI to AL</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS1Comment"># . f-&gt;data[f-&gt;write] = AL</span>
-<span id="L93" class="LineNr"> 93 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  3/index/EBX  <span class="CommentedCode"> . </span>          0/r32/AL    0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># copy AL to *(EDI+EBX+16)</span>
+<span id="L93" class="LineNr"> 93 </span>    88/copy-byte                    1/mod/*+disp8   4/rm32/sib    7/base/EDI  3/index/EBX  <span class="Normal"> . </span>          0/r32/AL    0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy AL to *(EDI+EBX+16)</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="subxComment"># ++f-&gt;write</span>
 <span id="L95" class="LineNr"> 95 </span>    43/increment-EBX
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># ++in</span>
@@ -163,7 +159,7 @@ if ('onhashchange' in window) {
 <span id="L98" class="LineNr"> 98 </span>    eb/jump  $write-buffered:loop/disp8
 <span id="L99" class="LineNr"> 99 </span><span class="Constant">$write-buffered:loop-end</span>:
 <span id="L100" class="LineNr">100 </span>    <span class="subxComment"># persist necessary variables from registers</span>
-<span id="L101" class="LineNr">101 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBX to *(EDI+4)</span>
+<span id="L101" class="LineNr">101 </span>    89/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EBX to *(EDI+4)</span>
 <span id="L102" class="LineNr">102 </span><span class="Constant">$write-buffered:end</span>:
 <span id="L103" class="LineNr">103 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L104" class="LineNr">104 </span>    5f/pop-to-EDI
@@ -173,112 +169,112 @@ if ('onhashchange' in window) {
 <span id="L108" class="LineNr">108 </span>    59/pop-to-ECX
 <span id="L109" class="LineNr">109 </span>    58/pop-to-EAX
 <span id="L110" class="LineNr">110 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L111" class="LineNr">111 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L111" class="LineNr">111 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L112" class="LineNr">112 </span>    5d/pop-to-EBP
 <span id="L113" class="LineNr">113 </span>    c3/return
 <span id="L114" class="LineNr">114 </span>
-<span id="L115" class="LineNr">115 </span><span class="subxTest">test-write-buffered</span>:
+<span id="L115" class="LineNr">115 </span><span class="subxTest"><a href='064write-buffered.subx.html#L115'>test-write-buffered</a></span>:
 <span id="L116" class="LineNr">116 </span>    <span class="subxH1Comment"># - check that write-buffered writes to the file</span>
 <span id="L117" class="LineNr">117 </span>    <span class="subxComment"># setup</span>
 <span id="L118" class="LineNr">118 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L119" class="LineNr">119 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L120" class="LineNr">120 </span>    68/push  _test-stream/imm32
+<span id="L120" class="LineNr">120 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L122" class="LineNr">122 </span>    e8/call  clear-stream/disp32
+<span id="L122" class="LineNr">122 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L124" class="LineNr">124 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L124" class="LineNr">124 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L125" class="LineNr">125 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L127" class="LineNr">127 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L127" class="LineNr">127 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L128" class="LineNr">128 </span>    05/add-to-EAX  4/imm32
 <span id="L129" class="LineNr">129 </span>    50/push-EAX
 <span id="L130" class="LineNr">130 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L131" class="LineNr">131 </span>    e8/call  clear-stream/disp32
+<span id="L131" class="LineNr">131 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L132" class="LineNr">132 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L133" class="LineNr">133 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L133" class="LineNr">133 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L134" class="LineNr">134 </span>    <span class="subxComment"># write-buffered(_test-buffered-file, &quot;Abc&quot;)</span>
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L136" class="LineNr">136 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L137" class="LineNr">137 </span>    68/push  _test-buffered-file/imm32
+<span id="L137" class="LineNr">137 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L139" class="LineNr">139 </span>    e8/call  write-buffered/disp32
+<span id="L139" class="LineNr">139 </span>    e8/call  <a href='064write-buffered.subx.html#L17'>write-buffered</a>/disp32
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L142" class="LineNr">142 </span>    <span class="subxComment"># flush(_test-buffered-file)</span>
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L144" class="LineNr">144 </span>    68/push  _test-buffered-file/imm32
+<span id="L144" class="LineNr">144 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L145" class="LineNr">145 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L146" class="LineNr">146 </span>    e8/call  flush/disp32
+<span id="L146" class="LineNr">146 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L147" class="LineNr">147 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L148" class="LineNr">148 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L148" class="LineNr">148 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L149" class="LineNr">149 </span>    <span class="subxComment"># check-ints-equal(*_test-stream-&gt;data, &quot;Abc&quot;, msg)</span>
 <span id="L150" class="LineNr">150 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L151" class="LineNr">151 </span>    68/push  <span class="Constant">&quot;F - test-write-buffered-single&quot;</span>/imm32
 <span id="L152" class="LineNr">152 </span>    68/push  0x636241/imm32
 <span id="L153" class="LineNr">153 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;data</span>
-<span id="L154" class="LineNr">154 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L155" class="LineNr">155 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L154" class="LineNr">154 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L155" class="LineNr">155 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L156" class="LineNr">156 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L157" class="LineNr">157 </span>    e8/call  check-ints-equal/disp32
+<span id="L157" class="LineNr">157 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L158" class="LineNr">158 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L159" class="LineNr">159 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L159" class="LineNr">159 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L160" class="LineNr">160 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L161" class="LineNr">161 </span>    c3/return
 <span id="L162" class="LineNr">162 </span>
-<span id="L163" class="LineNr">163 </span><span class="subxTest">test-write-buffered-with-intermediate-flush</span>:
+<span id="L163" class="LineNr">163 </span><span class="subxTest"><a href='064write-buffered.subx.html#L163'>test-write-buffered-with-intermediate-flush</a></span>:
 <span id="L164" class="LineNr">164 </span>    <span class="subxH1Comment"># - check that write-buffered flushes in the middle if its buffer fills up</span>
 <span id="L165" class="LineNr">165 </span>    <span class="subxComment"># setup</span>
 <span id="L166" class="LineNr">166 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L167" class="LineNr">167 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L168" class="LineNr">168 </span>    68/push  _test-stream/imm32
+<span id="L168" class="LineNr">168 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L169" class="LineNr">169 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L170" class="LineNr">170 </span>    e8/call  clear-stream/disp32
+<span id="L170" class="LineNr">170 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L171" class="LineNr">171 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L172" class="LineNr">172 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L172" class="LineNr">172 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L173" class="LineNr">173 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L175" class="LineNr">175 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L175" class="LineNr">175 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L176" class="LineNr">176 </span>    05/add-to-EAX  4/imm32
 <span id="L177" class="LineNr">177 </span>    50/push-EAX
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L179" class="LineNr">179 </span>    e8/call  clear-stream/disp32
+<span id="L179" class="LineNr">179 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L182" class="LineNr">182 </span>    <span class="subxComment"># _test-stream can hold 8 bytes, but _test-buffered-file can hold only 6.</span>
 <span id="L183" class="LineNr">183 </span>    <span class="subxComment"># Try to write 7 bytes.</span>
 <span id="L184" class="LineNr">184 </span>    <span class="subxS1Comment"># . write-buffered(_test-buffered-file, &quot;Abcdefg&quot;)</span>
 <span id="L185" class="LineNr">185 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L186" class="LineNr">186 </span>    68/push  <span class="Constant">&quot;Abcdefg&quot;</span>/imm32
-<span id="L187" class="LineNr">187 </span>    68/push  _test-buffered-file/imm32
+<span id="L187" class="LineNr">187 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L188" class="LineNr">188 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L189" class="LineNr">189 </span>    e8/call  write-buffered/disp32
+<span id="L189" class="LineNr">189 </span>    e8/call  <a href='064write-buffered.subx.html#L17'>write-buffered</a>/disp32
 <span id="L190" class="LineNr">190 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L191" class="LineNr">191 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L191" class="LineNr">191 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L192" class="LineNr">192 </span>    <span class="subxComment"># don't flush</span>
 <span id="L193" class="LineNr">193 </span>    <span class="subxComment"># 6 bytes should still have gotten to _test-stream</span>
 <span id="L194" class="LineNr">194 </span>    <span class="subxS1Comment"># . check-ints-equal(*_test-stream-&gt;write, 6, msg)</span>
 <span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L196" class="LineNr">196 </span>    68/push  <span class="Constant">&quot;F - test-write-buffered-with-intermediate-flush: flushed data&quot;</span>/imm32
+<span id="L196" class="LineNr">196 </span>    68/push  <span class="Constant">&quot;F - <a href='064write-buffered.subx.html#L163'>test-write-buffered-with-intermediate-flush</a>: flushed data&quot;</span>/imm32
 <span id="L197" class="LineNr">197 </span>    68/push  6/imm32
 <span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . push *_test-stream-&gt;write</span>
-<span id="L199" class="LineNr">199 </span>    b8/copy-to-EAX  _test-stream/imm32
-<span id="L200" class="LineNr">200 </span>    ff          6/subop/push        0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># push *EAX</span>
+<span id="L199" class="LineNr">199 </span>    b8/copy-to-EAX  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
+<span id="L200" class="LineNr">200 </span>    ff          6/subop/push        0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *EAX</span>
 <span id="L201" class="LineNr">201 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L202" class="LineNr">202 </span>    e8/call  check-ints-equal/disp32
+<span id="L202" class="LineNr">202 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L204" class="LineNr">204 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L204" class="LineNr">204 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L205" class="LineNr">205 </span>    <span class="subxComment"># and 1 byte should still be in _test-buffered-file</span>
 <span id="L206" class="LineNr">206 </span>    <span class="subxS1Comment"># . check-ints-equal(*_test-buffered-file&gt;write, 1, msg)</span>
 <span id="L207" class="LineNr">207 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L208" class="LineNr">208 </span>    68/push  <span class="Constant">&quot;F - test-write-buffered-with-intermediate-flush: unflushed bytes&quot;</span>/imm32
+<span id="L208" class="LineNr">208 </span>    68/push  <span class="Constant">&quot;F - <a href='064write-buffered.subx.html#L163'>test-write-buffered-with-intermediate-flush</a>: unflushed bytes&quot;</span>/imm32
 <span id="L209" class="LineNr">209 </span>    68/push  1/imm32
 <span id="L210" class="LineNr">210 </span>    <span class="subxS2Comment"># . . push *_test-buffered-file-&gt;write</span>
-<span id="L211" class="LineNr">211 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
-<span id="L212" class="LineNr">212 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L211" class="LineNr">211 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L212" class="LineNr">212 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
 <span id="L213" class="LineNr">213 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L214" class="LineNr">214 </span>    e8/call  check-ints-equal/disp32
+<span id="L214" class="LineNr">214 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L215" class="LineNr">215 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L216" class="LineNr">216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L216" class="LineNr">216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L217" class="LineNr">217 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L218" class="LineNr">218 </span>    c3/return
 <span id="L219" class="LineNr">219 </span>
diff --git a/html/subx/065error-byte.subx.html b/html/subx/065error-byte.subx.html
index 4aa9b93f..76c30261 100644
--- a/html/subx/065error-byte.subx.html
+++ b/html/subx/065error-byte.subx.html
@@ -7,24 +7,20 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .SpecialChar { color: #d70000; }
 -->
 </style>
@@ -75,7 +71,7 @@ if ('onhashchange' in window) {
 <span id="L12" class="LineNr"> 12 </span><span class="CommentedCode">#?     89/copy                         3/mod/direct    0/rm32/EAX    .           .             .           4/r32/ESP   .               .                 # copy ESP to EAX</span>
 <span id="L13" class="LineNr"> 13 </span><span class="CommentedCode">#?     # . configure ed to really exit()</span>
 <span id="L14" class="LineNr"> 14 </span><span class="CommentedCode">#?     # . . ed-&gt;target = 0</span>
-<span id="L15" class="LineNr"> 15 </span><span class="CommentedCode">#?     c7/copy                         0/mod/direct    0/rm32/EAX    .           .             .           .           .               0/imm32           # copy to *EAX</span>
+<span id="L15" class="LineNr"> 15 </span><span class="CommentedCode">#?     c7          0/subop/copy        0/mod/direct    0/rm32/EAX    .           .             .           .           .               0/imm32           # copy to *EAX</span>
 <span id="L16" class="LineNr"> 16 </span><span class="CommentedCode">#?     # . error-byte(ed, Stdout, msg, 34)</span>
 <span id="L17" class="LineNr"> 17 </span><span class="CommentedCode">#?     68/push  0x34/imm32</span>
 <span id="L18" class="LineNr"> 18 </span><span class="CommentedCode">#?     68/push  &quot;abc&quot;/imm32</span>
@@ -85,79 +81,79 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span>    <span class="subxComment"># automatic test</span>
 <span id="L23" class="LineNr"> 23 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxS1Comment"># . syscall(exit, Num-test-failures)</span>
-<span id="L25" class="LineNr"> 25 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
-<span id="L26" class="LineNr"> 26 </span>    b8/copy-to-EAX  1/imm32
+<span id="L25" class="LineNr"> 25 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L26" class="LineNr"> 26 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L27" class="LineNr"> 27 </span>    cd/syscall  0x80/imm8
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="subxComment"># write(out, &quot;Error: &quot;+msg+&quot;: &quot;+byte) then stop(ed, 1)</span>
-<span id="L30" class="LineNr"> 30 </span><span class="subxFunction">error-byte</span>:  <span class="subxComment"># ed : (address exit-descriptor), out : (address buffered-file), msg : (address array byte), n : byte -&gt; &lt;void&gt;</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxFunction"><a href='065error-byte.subx.html#L30'>error-byte</a></span>:  <span class="subxComment"># ed : (address exit-descriptor), out : (address buffered-file), msg : (address array byte), n : byte -&gt; &lt;void&gt;</span>
 <span id="L31" class="LineNr"> 31 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L32" class="LineNr"> 32 </span>    55/push-EBP
-<span id="L33" class="LineNr"> 33 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L33" class="LineNr"> 33 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L34" class="LineNr"> 34 </span>    <span class="subxComment"># write-buffered(out, &quot;Error: &quot;)</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L36" class="LineNr"> 36 </span>    68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L37" class="LineNr"> 37 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L37" class="LineNr"> 37 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L39" class="LineNr"> 39 </span>    e8/call  write-buffered/disp32
+<span id="L39" class="LineNr"> 39 </span>    e8/call  <a href='064write-buffered.subx.html#L17'>write-buffered</a>/disp32
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L41" class="LineNr"> 41 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L41" class="LineNr"> 41 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L42" class="LineNr"> 42 </span>    <span class="subxComment"># write-buffered(out, msg)</span>
 <span id="L43" class="LineNr"> 43 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L44" class="LineNr"> 44 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L45" class="LineNr"> 45 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L44" class="LineNr"> 44 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L45" class="LineNr"> 45 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L46" class="LineNr"> 46 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L47" class="LineNr"> 47 </span>    e8/call  write-buffered/disp32
+<span id="L47" class="LineNr"> 47 </span>    e8/call  <a href='064write-buffered.subx.html#L17'>write-buffered</a>/disp32
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L49" class="LineNr"> 49 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L49" class="LineNr"> 49 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxComment"># write-buffered(out, &quot;: &quot;)</span>
 <span id="L51" class="LineNr"> 51 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L52" class="LineNr"> 52 </span>    68/push  <span class="Constant">&quot;: &quot;</span>/imm32
-<span id="L53" class="LineNr"> 53 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L53" class="LineNr"> 53 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L54" class="LineNr"> 54 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L55" class="LineNr"> 55 </span>    e8/call  write-buffered/disp32
+<span id="L55" class="LineNr"> 55 </span>    e8/call  <a href='064write-buffered.subx.html#L17'>write-buffered</a>/disp32
 <span id="L56" class="LineNr"> 56 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L57" class="LineNr"> 57 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L57" class="LineNr"> 57 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># print-byte(out, byte)</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L60" class="LineNr"> 60 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
-<span id="L61" class="LineNr"> 61 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L60" class="LineNr"> 60 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L61" class="LineNr"> 61 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L62" class="LineNr"> 62 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L63" class="LineNr"> 63 </span>    e8/call  print-byte/disp32
+<span id="L63" class="LineNr"> 63 </span>    e8/call  <a href='063print-byte.subx.html#L15'>print-byte</a>/disp32
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L65" class="LineNr"> 65 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L65" class="LineNr"> 65 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L66" class="LineNr"> 66 </span>    <span class="subxComment"># write-buffered(out, Newline)</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L68" class="LineNr"> 68 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L69" class="LineNr"> 69 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L68" class="LineNr"> 68 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L69" class="LineNr"> 69 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L70" class="LineNr"> 70 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L71" class="LineNr"> 71 </span>    e8/call  write-buffered/disp32
+<span id="L71" class="LineNr"> 71 </span>    e8/call  <a href='064write-buffered.subx.html#L17'>write-buffered</a>/disp32
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L73" class="LineNr"> 73 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L73" class="LineNr"> 73 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . flush(out)</span>
 <span id="L75" class="LineNr"> 75 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L76" class="LineNr"> 76 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L76" class="LineNr"> 76 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L78" class="LineNr"> 78 </span>    e8/call  flush/disp32
+<span id="L78" class="LineNr"> 78 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L79" class="LineNr"> 79 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L80" class="LineNr"> 80 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L80" class="LineNr"> 80 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L81" class="LineNr"> 81 </span>    <span class="subxComment"># stop(ed, 1)</span>
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L83" class="LineNr"> 83 </span>    68/push  1/imm32
-<span id="L84" class="LineNr"> 84 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L84" class="LineNr"> 84 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L86" class="LineNr"> 86 </span>    e8/call  stop/disp32
+<span id="L86" class="LineNr"> 86 </span>    e8/call  <a href='057stop.subx.html#L99'>stop</a>/disp32
 <span id="L87" class="LineNr"> 87 </span>    <span class="subxComment"># should never get past this point</span>
 <span id="L88" class="LineNr"> 88 </span><span class="Constant">$error-byte:dead-end</span>:
 <span id="L89" class="LineNr"> 89 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L90" class="LineNr"> 90 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L90" class="LineNr"> 90 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L91" class="LineNr"> 91 </span>    5d/pop-to-EBP
 <span id="L92" class="LineNr"> 92 </span>    c3/return
 <span id="L93" class="LineNr"> 93 </span>
 <span id="L94" class="LineNr"> 94 </span>== data
 <span id="L95" class="LineNr"> 95 </span>
 <span id="L96" class="LineNr"> 96 </span><span class="subxComment"># The buffered file for standard error.</span>
-<span id="L97" class="LineNr"> 97 </span><span class="SpecialChar">Stderr</span>:
+<span id="L97" class="LineNr"> 97 </span><span class="SpecialChar"><a href='065error-byte.subx.html#L97'>Stderr</a></span>:
 <span id="L98" class="LineNr"> 98 </span>    <span class="subxComment"># file descriptor or (address stream)</span>
 <span id="L99" class="LineNr"> 99 </span>    02 00 00 00  <span class="subxComment"># 1 = standard error</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxComment"># current write index</span>
diff --git a/html/subx/066allocate.subx.html b/html/subx/066allocate.subx.html
new file mode 100644
index 00000000..b45edb9f
--- /dev/null
+++ b/html/subx/066allocate.subx.html
@@ -0,0 +1,215 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/066allocate.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/066allocate.subx'>https://github.com/akkartik/mu/blob/master/subx/066allocate.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># Helper to dynamically allocate memory on the heap.</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment">#</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment"># We'd like to be able to write tests for functions that allocate memory,</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># making assertions on the precise addresses used. To achieve this we'll pass</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment"># in an *allocation descriptor* to allocate from.</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment"># Allocation descriptors are also useful outside of tests. Assembly and machine</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment"># code are of necessity unsafe languages, and one of the most insidious kinds</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment"># of bugs unsafe languages expose us to are dangling pointers to memory that</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment"># has been freed and potentially even reused for something totally different.</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment"># To reduce the odds of such &quot;use after free&quot; errors, SubX programs tend to not</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment"># reclaim and reuse dynamically allocated memory. (Running out of memory is far</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment"># easier to debug.) Long-running programs that want to reuse memory are mostly</span>
+<span id="L14" class="LineNr"> 14 </span><span class="subxComment"># on their own to be careful. However, they do get one bit of help: they can</span>
+<span id="L15" class="LineNr"> 15 </span><span class="subxComment"># carve out chunks of memory and then allocate from them manually using this</span>
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment"># very same 'allocate' helper. They just need a new allocation descriptor for</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxComment"># their book-keeping.</span>
+<span id="L18" class="LineNr"> 18 </span>
+<span id="L19" class="LineNr"> 19 </span>== data
+<span id="L20" class="LineNr"> 20 </span>
+<span id="L21" class="LineNr"> 21 </span><span class="subxComment"># The 'global' allocation descriptor. Pass this into 'allocate' to claim a</span>
+<span id="L22" class="LineNr"> 22 </span><span class="subxComment"># hitherto unused bit of memory.</span>
+<span id="L23" class="LineNr"> 23 </span><span class="SpecialChar"><a href='066allocate.subx.html#L23'>Heap</a></span>:
+<span id="L24" class="LineNr"> 24 </span>    <span class="SpecialChar">Start-of-heap</span>/imm32  <span class="subxComment"># curr</span>
+<span id="L25" class="LineNr"> 25 </span>    00 00 00 0b  <span class="subxComment"># limit = 0x0b000000; keep sync'd with DATA_SEGMENT + SEGMENT_ALIGNMENT</span>
+<span id="L26" class="LineNr"> 26 </span>
+<span id="L27" class="LineNr"> 27 </span>== code
+<span id="L28" class="LineNr"> 28 </span><span class="subxComment">#   instruction                     effective address                                                   register    displacement    immediate</span>
+<span id="L29" class="LineNr"> 29 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L30" class="LineNr"> 30 </span><span class="subxS1Comment"># . 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="L31" class="LineNr"> 31 </span>
+<span id="L32" class="LineNr"> 32 </span><span class="subxComment"># main:</span>
+<span id="L33" class="LineNr"> 33 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L34" class="LineNr"> 34 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L35" class="LineNr"> 35 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</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><span class="subxComment"># Claim the next 'n' bytes of memory starting at ad-&gt;curr and update ad-&gt;curr.</span>
+<span id="L40" class="LineNr"> 40 </span><span class="subxComment"># If there isn't enough memory before ad-&gt;limit, return 0 and leave 'ad' unmodified.</span>
+<span id="L41" class="LineNr"> 41 </span><span class="subxFunction"><a href='066allocate.subx.html#L41'>allocate</a></span>:  <span class="subxComment"># ad : (address allocation-descriptor), n : int -&gt; address-or-null/EAX</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L43" class="LineNr"> 43 </span>    55/push-EBP
+<span id="L44" class="LineNr"> 44 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L45" class="LineNr"> 45 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L46" class="LineNr"> 46 </span>    51/push-ECX
+<span id="L47" class="LineNr"> 47 </span>    52/push-EDX
+<span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># ECX = ad</span>
+<span id="L49" class="LineNr"> 49 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="subxComment"># save ad-&gt;curr</span>
+<span id="L51" class="LineNr"> 51 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to EAX</span>
+<span id="L52" class="LineNr"> 52 </span>    <span class="subxComment"># check if there's enough space</span>
+<span id="L53" class="LineNr"> 53 </span>    <span class="subxS1Comment"># . EDX = ad-&gt;curr + n</span>
+<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EDX</span>
+<span id="L55" class="LineNr"> 55 </span>    03/add                          1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># add *(EBP+12) to EDX</span>
+<span id="L56" class="LineNr"> 56 </span>    3b/compare                      1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with *(ECX+4)</span>
+<span id="L57" class="LineNr"> 57 </span>    7c/jump-if-lesser  $allocate:commit/disp8
+<span id="L58" class="LineNr"> 58 </span>    <span class="subxComment"># return null if not</span>
+<span id="L59" class="LineNr"> 59 </span>    b8/copy-to-EAX  0/imm32
+<span id="L60" class="LineNr"> 60 </span>    eb/jump  $allocate:end/disp8
+<span id="L61" class="LineNr"> 61 </span><span class="Constant">$allocate:commit</span>:
+<span id="L62" class="LineNr"> 62 </span>    <span class="subxComment"># update ad-&gt;curr</span>
+<span id="L63" class="LineNr"> 63 </span>    89/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EDX to *ECX</span>
+<span id="L64" class="LineNr"> 64 </span><span class="Constant">$allocate:end</span>:
+<span id="L65" class="LineNr"> 65 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L66" class="LineNr"> 66 </span>    5a/pop-to-EDX
+<span id="L67" class="LineNr"> 67 </span>    59/pop-to-ECX
+<span id="L68" class="LineNr"> 68 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L69" class="LineNr"> 69 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L70" class="LineNr"> 70 </span>    5d/pop-to-EBP
+<span id="L71" class="LineNr"> 71 </span>    c3/return
+<span id="L72" class="LineNr"> 72 </span>
+<span id="L73" class="LineNr"> 73 </span><span class="subxTest"><a href='066allocate.subx.html#L73'>test-allocate-success</a></span>:
+<span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L75" class="LineNr"> 75 </span>    55/push-EBP
+<span id="L76" class="LineNr"> 76 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L77" class="LineNr"> 77 </span>    <span class="subxComment"># var ad/ECX : (address allocation-descriptor) = {11, 15}</span>
+<span id="L78" class="LineNr"> 78 </span>    68/push  0xf/imm32/limit
+<span id="L79" class="LineNr"> 79 </span>    68/push  0xb/imm32/curr
+<span id="L80" class="LineNr"> 80 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="subxComment"># EAX = allocate(ad, 3)</span>
+<span id="L82" class="LineNr"> 82 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L83" class="LineNr"> 83 </span>    68/push  3/imm32
+<span id="L84" class="LineNr"> 84 </span>    51/push-ECX
+<span id="L85" class="LineNr"> 85 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L86" class="LineNr"> 86 </span>    e8/call  <a href='066allocate.subx.html#L41'>allocate</a>/disp32
+<span id="L87" class="LineNr"> 87 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L88" class="LineNr"> 88 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxComment"># check-ints-equal(EAX, 11, msg)</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L91" class="LineNr"> 91 </span>    68/push  <span class="Constant">&quot;F - <a href='066allocate.subx.html#L73'>test-allocate-success</a>: returns current pointer of allocation descriptor&quot;</span>/imm32
+<span id="L92" class="LineNr"> 92 </span>    68/push  0xb/imm32
+<span id="L93" class="LineNr"> 93 </span>    50/push-EAX
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L95" class="LineNr"> 95 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L96" class="LineNr"> 96 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L97" class="LineNr"> 97 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxComment"># check-ints-equal(ad-&gt;curr, 14, msg)</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L100" class="LineNr">100 </span>    68/push  <span class="Constant">&quot;F - <a href='066allocate.subx.html#L73'>test-allocate-success</a>: updates allocation descriptor&quot;</span>/imm32
+<span id="L101" class="LineNr">101 </span>    68/push  0xe/imm32
+<span id="L102" class="LineNr">102 </span>    ff          6/subop/push        0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ECX</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L104" class="LineNr">104 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L105" class="LineNr">105 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L106" class="LineNr">106 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L107" class="LineNr">107 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L108" class="LineNr">108 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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="subxTest"><a href='066allocate.subx.html#L112'>test-allocate-failure</a></span>:
+<span id="L113" class="LineNr">113 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L114" class="LineNr">114 </span>    55/push-EBP
+<span id="L115" class="LineNr">115 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># var ad/ECX : (address allocation-descriptor) = {11, 15}</span>
+<span id="L117" class="LineNr">117 </span>    68/push  0xf/imm32/limit
+<span id="L118" class="LineNr">118 </span>    68/push  0xb/imm32/curr
+<span id="L119" class="LineNr">119 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L120" class="LineNr">120 </span>    <span class="subxComment"># EAX = allocate(ad, 6)</span>
+<span id="L121" class="LineNr">121 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L122" class="LineNr">122 </span>    68/push  6/imm32
+<span id="L123" class="LineNr">123 </span>    51/push-ECX
+<span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L125" class="LineNr">125 </span>    e8/call  <a href='066allocate.subx.html#L41'>allocate</a>/disp32
+<span id="L126" class="LineNr">126 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L127" class="LineNr">127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L128" class="LineNr">128 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
+<span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L130" class="LineNr">130 </span>    68/push  <span class="Constant">&quot;F - <a href='066allocate.subx.html#L112'>test-allocate-failure</a>: returns null&quot;</span>/imm32
+<span id="L131" class="LineNr">131 </span>    68/push  0/imm32
+<span id="L132" class="LineNr">132 </span>    50/push-EAX
+<span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L134" class="LineNr">134 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L136" class="LineNr">136 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L137" class="LineNr">137 </span>    <span class="subxComment"># no change to ad-&gt;curr</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxS1Comment"># . check-ints-equal(ad-&gt;curr, 11)</span>
+<span id="L139" class="LineNr">139 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L140" class="LineNr">140 </span>    68/push  <span class="Constant">&quot;F - <a href='066allocate.subx.html#L112'>test-allocate-failure</a>: updates allocation descriptor&quot;</span>/imm32
+<span id="L141" class="LineNr">141 </span>    68/push  0xb/imm32
+<span id="L142" class="LineNr">142 </span>    ff          6/subop/push        0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ECX</span>
+<span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L144" class="LineNr">144 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L145" class="LineNr">145 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L146" class="LineNr">146 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L147" class="LineNr">147 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L148" class="LineNr">148 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L149" class="LineNr">149 </span>    5d/pop-to-EBP
+<span id="L150" class="LineNr">150 </span>    c3/return
+<span id="L151" class="LineNr">151 </span>
+<span id="L152" class="LineNr">152 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/apps/crenshaw2-1.subx.html b/html/subx/apps/crenshaw2-1.subx.html
index d741c108..3d087304 100644
--- a/html/subx/apps/crenshaw2-1.subx.html
+++ b/html/subx/apps/crenshaw2-1.subx.html
@@ -7,28 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
+.Constant { color: #008787; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxMinorFunction { color: #875f5f; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxTest { color: #5f8700; }
 .SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -102,44 +98,44 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span>
 <span id="L37" class="LineNr"> 37 </span><span class="subxComment"># main: run tests if necessary, call 'compile' if not</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L39" class="LineNr"> 39 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L39" class="LineNr"> 39 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot; then return run_tests()</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="subxS1Comment"># . argc &gt; 1</span>
-<span id="L42" class="LineNr"> 42 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
+<span id="L42" class="LineNr"> 42 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L43" class="LineNr"> 43 </span>    7e/jump-if-lesser-or-equal  $run-main/disp8
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxS1Comment"># . argv[1] == &quot;test&quot;</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L46" class="LineNr"> 46 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L47" class="LineNr"> 47 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L47" class="LineNr"> 47 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L49" class="LineNr"> 49 </span>    e8/call  kernel-string-equal/disp32
+<span id="L49" class="LineNr"> 49 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS1Comment"># . check result</span>
 <span id="L53" class="LineNr"> 53 </span>    3d/compare-EAX  1/imm32
 <span id="L54" class="LineNr"> 54 </span>    75/jump-if-not-equal  $run-main/disp8
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxS1Comment"># . run-tests()</span>
 <span id="L56" class="LineNr"> 56 </span>    e8/call  run-tests/disp32
-<span id="L57" class="LineNr"> 57 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L57" class="LineNr"> 57 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L58" class="LineNr"> 58 </span>    eb/jump  $main:end/disp8
 <span id="L59" class="LineNr"> 59 </span><span class="Constant">$run-main</span>:
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxH1Comment"># - otherwise read a program from stdin and emit its translation to stdout</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># var ed/EAX : exit-descriptor</span>
-<span id="L62" class="LineNr"> 62 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L63" class="LineNr"> 63 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L62" class="LineNr"> 62 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L63" class="LineNr"> 63 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># configure ed to really exit()</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxS1Comment"># . ed-&gt;target = 0</span>
-<span id="L66" class="LineNr"> 66 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L66" class="LineNr"> 66 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxComment"># return compile(Stdin, 1/stdout, 2/stderr, ed)</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L69" class="LineNr"> 69 </span>    50/push-EAX/ed
 <span id="L70" class="LineNr"> 70 </span>    68/push  2/imm32/stderr
 <span id="L71" class="LineNr"> 71 </span>    68/push  1/imm32/stdout
-<span id="L72" class="LineNr"> 72 </span>    68/push  <span class="SpecialChar">Stdin</span>/imm32
+<span id="L72" class="LineNr"> 72 </span>    68/push  <span class="SpecialChar"><a href='059read-byte.subx.html#L14'>Stdin</a></span>/imm32
 <span id="L73" class="LineNr"> 73 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L74" class="LineNr"> 74 </span>    e8/call  compile/disp32
 <span id="L75" class="LineNr"> 75 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L76" class="LineNr"> 76 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L76" class="LineNr"> 76 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxS1Comment"># . syscall(exit, 0)</span>
 <span id="L78" class="LineNr"> 78 </span>    bb/copy-to-EBX  0/imm32
 <span id="L79" class="LineNr"> 79 </span><span class="Constant">$main:end</span>:
@@ -150,46 +146,46 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="subxFunction">compile</span>:  <span class="subxComment"># in : (address buffered-file), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L86" class="LineNr"> 86 </span>    55/push-EBP
-<span id="L87" class="LineNr"> 87 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L87" class="LineNr"> 87 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L89" class="LineNr"> 89 </span>    50/push-EAX
 <span id="L90" class="LineNr"> 90 </span>    51/push-ECX
 <span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># prime the pump</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS1Comment"># . Look = get-char(in)</span>
 <span id="L93" class="LineNr"> 93 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L94" class="LineNr"> 94 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L94" class="LineNr"> 94 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8     <span class="Normal"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L96" class="LineNr"> 96 </span>    e8/call  get-char/disp32
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="subxComment"># var num/ECX : (address stream) on the stack</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxComment"># Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.</span>
 <span id="L101" class="LineNr">101 </span>    <span class="subxComment"># Sizing the stream just right buys us overflow-handling for free inside 'get-num'.</span>
 <span id="L102" class="LineNr">102 </span>    <span class="subxComment"># Add 12 bytes for 'read', 'write' and 'length' fields, for a total of 19 bytes, or 0x13 in hex.</span>
 <span id="L103" class="LineNr">103 </span>    <span class="subxComment"># The stack pointer is no longer aligned, so dump_stack() can be misleading past this point.</span>
-<span id="L104" class="LineNr">104 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x13/imm32        <span class="subxComment"># subtract from ESP</span>
-<span id="L105" class="LineNr">105 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L104" class="LineNr">104 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x13/imm32        <span class="subxComment"># subtract from ESP</span>
+<span id="L105" class="LineNr">105 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L106" class="LineNr">106 </span>    <span class="subxComment"># initialize the stream</span>
 <span id="L107" class="LineNr">107 </span>    <span class="subxS1Comment"># . num-&gt;length = 7</span>
-<span id="L108" class="LineNr">108 </span>    c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         7/imm32           <span class="subxComment"># copy to *(ECX+8)</span>
+<span id="L108" class="LineNr">108 </span>    c7          0/subop/copy        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         7/imm32           <span class="subxComment"># copy to *(ECX+8)</span>
 <span id="L109" class="LineNr">109 </span>    <span class="subxS1Comment"># . clear-stream(num)</span>
 <span id="L110" class="LineNr">110 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L111" class="LineNr">111 </span>    51/push-ECX
 <span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L113" class="LineNr">113 </span>    e8/call  clear-stream/disp32
+<span id="L113" class="LineNr">113 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L114" class="LineNr">114 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L115" class="LineNr">115 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L115" class="LineNr">115 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L116" class="LineNr">116 </span>    <span class="subxComment"># read a digit from 'in' into 'num'</span>
 <span id="L117" class="LineNr">117 </span>    <span class="subxS1Comment"># . get-num(in, num, err, ed)</span>
 <span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L119" class="LineNr">119 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
-<span id="L120" class="LineNr">120 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L119" class="LineNr">119 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L120" class="LineNr">120 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
 <span id="L121" class="LineNr">121 </span>    51/push-ECX/num
-<span id="L122" class="LineNr">122 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L122" class="LineNr">122 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8     <span class="Normal"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L124" class="LineNr">124 </span>    e8/call  get-num/disp32
 <span id="L125" class="LineNr">125 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L127" class="LineNr">127 </span>    <span class="subxComment"># render 'num' into the following template on 'out':</span>
 <span id="L128" class="LineNr">128 </span>    <span class="subxComment">#   bb/copy-to-EBX  _num_</span>
 <span id="L129" class="LineNr">129 </span>    <span class="subxComment">#   b8/copy-to-EAX  1/imm32/exit</span>
@@ -198,65 +194,65 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span>    <span class="subxS1Comment"># . write(out, &quot;bb/copy-to-EBX  &quot;)</span>
 <span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L134" class="LineNr">134 </span>    68/push  <span class="Constant">&quot;bb/copy-to-EBX  &quot;</span>/imm32
-<span id="L135" class="LineNr">135 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L135" class="LineNr">135 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L137" class="LineNr">137 </span>    e8/call  write/disp32
+<span id="L137" class="LineNr">137 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxS1Comment"># . write-stream(out, num)</span>
 <span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L142" class="LineNr">142 </span>    51/push-ECX/num
-<span id="L143" class="LineNr">143 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L143" class="LineNr">143 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L144" class="LineNr">144 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L145" class="LineNr">145 </span>    e8/call  write-stream/disp32
+<span id="L145" class="LineNr">145 </span>    e8/call  <a href='060write-stream.subx.html#L22'>write-stream</a>/disp32
 <span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L148" class="LineNr">148 </span>    <span class="subxS1Comment"># . write(out, Newline)</span>
 <span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L150" class="LineNr">150 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L151" class="LineNr">151 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L150" class="LineNr">150 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L151" class="LineNr">151 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L152" class="LineNr">152 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L153" class="LineNr">153 </span>    e8/call  write/disp32
+<span id="L153" class="LineNr">153 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L155" class="LineNr">155 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L155" class="LineNr">155 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L156" class="LineNr">156 </span>    <span class="subxS1Comment"># . write(out, &quot;b8/copy-to-EAX  1/imm32/exit&quot;)</span>
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L158" class="LineNr">158 </span>    68/push  <span class="Constant">&quot;b8/copy-to-EAX  1/imm32/exit&quot;</span>/imm32
-<span id="L159" class="LineNr">159 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L159" class="LineNr">159 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L161" class="LineNr">161 </span>    e8/call  write/disp32
+<span id="L161" class="LineNr">161 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L163" class="LineNr">163 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L164" class="LineNr">164 </span>    <span class="subxS1Comment"># . write(out, Newline)</span>
 <span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L166" class="LineNr">166 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L167" class="LineNr">167 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L166" class="LineNr">166 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L167" class="LineNr">167 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L168" class="LineNr">168 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L169" class="LineNr">169 </span>    e8/call  write/disp32
+<span id="L169" class="LineNr">169 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L171" class="LineNr">171 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L171" class="LineNr">171 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L172" class="LineNr">172 </span>    <span class="subxS1Comment"># . write(out, &quot;cd/syscall  0x80/imm8&quot;)</span>
 <span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L174" class="LineNr">174 </span>    68/push  <span class="Constant">&quot;cd/syscall  0x80/imm8&quot;</span>/imm32
-<span id="L175" class="LineNr">175 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L175" class="LineNr">175 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L177" class="LineNr">177 </span>    e8/call  write/disp32
+<span id="L177" class="LineNr">177 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L179" class="LineNr">179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L179" class="LineNr">179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L180" class="LineNr">180 </span>    <span class="subxS1Comment"># . write(out, Newline)</span>
 <span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L182" class="LineNr">182 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L182" class="LineNr">182 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L185" class="LineNr">185 </span>    e8/call  write/disp32
+<span id="L185" class="LineNr">185 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L186" class="LineNr">186 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L188" class="LineNr">188 </span><span class="Constant">$compile:end</span>:
 <span id="L189" class="LineNr">189 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L190" class="LineNr">190 </span>    59/pop-to-ECX
 <span id="L191" class="LineNr">191 </span>    58/pop-to-EAX
 <span id="L192" class="LineNr">192 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L193" class="LineNr">193 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L193" class="LineNr">193 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L194" class="LineNr">194 </span>    5d/pop-to-EBP
 <span id="L195" class="LineNr">195 </span>    c3/return
 <span id="L196" class="LineNr">196 </span>
@@ -286,27 +282,27 @@ if ('onhashchange' in window) {
 <span id="L220" class="LineNr">220 </span>    <span class="subxComment">#</span>
 <span id="L221" class="LineNr">221 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L222" class="LineNr">222 </span>    55/push-EBP
-<span id="L223" class="LineNr">223 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L223" class="LineNr">223 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L224" class="LineNr">224 </span>    <span class="subxH1Comment"># - if is-digit?(Look) expected(ed, err, &quot;integer&quot;)</span>
 <span id="L225" class="LineNr">225 </span>    <span class="subxS1Comment"># . EAX = is-digit?(Look)</span>
 <span id="L226" class="LineNr">226 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L227" class="LineNr">227 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># push *Look</span>
+<span id="L227" class="LineNr">227 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># push *Look</span>
 <span id="L228" class="LineNr">228 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L229" class="LineNr">229 </span>    e8/call  is-digit?/disp32
 <span id="L230" class="LineNr">230 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L231" class="LineNr">231 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L231" class="LineNr">231 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L232" class="LineNr">232 </span>    <span class="subxS1Comment"># . if EAX == 0</span>
 <span id="L233" class="LineNr">233 </span>    3d/compare-EAX  0/imm32
 <span id="L234" class="LineNr">234 </span>    75/jump-if-not-equal  $get-num:main/disp8
 <span id="L235" class="LineNr">235 </span>    <span class="subxS1Comment"># . expected(ed, err, &quot;integer&quot;)</span>
 <span id="L236" class="LineNr">236 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L237" class="LineNr">237 </span>    68/push  <span class="Constant">&quot;integer&quot;</span>/imm32
-<span id="L238" class="LineNr">238 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L239" class="LineNr">239 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L238" class="LineNr">238 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L239" class="LineNr">239 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
 <span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L241" class="LineNr">241 </span>    e8/call  expected/disp32  <span class="subxComment"># never returns</span>
 <span id="L242" class="LineNr">242 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L243" class="LineNr">243 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L243" class="LineNr">243 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L244" class="LineNr">244 </span><span class="Constant">$get-num:main</span>:
 <span id="L245" class="LineNr">245 </span>    <span class="subxH1Comment"># - otherwise read a digit</span>
 <span id="L246" class="LineNr">246 </span>    <span class="subxS1Comment"># . save registers</span>
@@ -318,30 +314,30 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span>    57/push-EDI
 <span id="L253" class="LineNr">253 </span>    <span class="subxComment"># read necessary variables to registers</span>
 <span id="L254" class="LineNr">254 </span>    <span class="subxComment"># ESI = in</span>
-<span id="L255" class="LineNr">255 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L255" class="LineNr">255 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
 <span id="L256" class="LineNr">256 </span>    <span class="subxComment"># EDI = out</span>
-<span id="L257" class="LineNr">257 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L257" class="LineNr">257 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
 <span id="L258" class="LineNr">258 </span>    <span class="subxComment"># ECX = out-&gt;write</span>
-<span id="L259" class="LineNr">259 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L259" class="LineNr">259 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
 <span id="L260" class="LineNr">260 </span>    <span class="subxComment"># EDX = out-&gt;length</span>
-<span id="L261" class="LineNr">261 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
+<span id="L261" class="LineNr">261 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
 <span id="L262" class="LineNr">262 </span>    <span class="subxComment"># if out-&gt;write &gt;= out-&gt;length error</span>
-<span id="L263" class="LineNr">263 </span>    39/compare                      3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EDX with ECX</span>
+<span id="L263" class="LineNr">263 </span>    39/compare                      3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with ECX</span>
 <span id="L264" class="LineNr">264 </span>    7d/jump-if-lesser  $get-num:stage2/disp8
 <span id="L265" class="LineNr">265 </span>    <span class="subxS1Comment"># . error(ed, err, msg)  # TODO: show full number</span>
 <span id="L266" class="LineNr">266 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L267" class="LineNr">267 </span>    68/push  <span class="Constant">&quot;get-num: too many digits in number&quot;</span>/imm32
-<span id="L268" class="LineNr">268 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L269" class="LineNr">269 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L268" class="LineNr">268 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L269" class="LineNr">269 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
 <span id="L270" class="LineNr">270 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L271" class="LineNr">271 </span>    e8/call  error/disp32  <span class="subxComment"># never returns</span>
+<span id="L271" class="LineNr">271 </span>    e8/call  <a href='061error.subx.html#L16'>error</a>/disp32  <span class="subxComment"># never returns</span>
 <span id="L272" class="LineNr">272 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L273" class="LineNr">273 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L273" class="LineNr">273 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L274" class="LineNr">274 </span><span class="Constant">$get-num:stage2</span>:
 <span id="L275" class="LineNr">275 </span>    <span class="subxComment"># out-&gt;data[out-&gt;write] = LSB(Look)</span>
-<span id="L276" class="LineNr">276 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
-<span id="L277" class="LineNr">277 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *Look to EAX</span>
-<span id="L278" class="LineNr">278 </span>    88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/AL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at AL to *EBX</span>
+<span id="L276" class="LineNr">276 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
+<span id="L277" class="LineNr">277 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Look to EAX</span>
+<span id="L278" class="LineNr">278 </span>    88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at AL to *EBX</span>
 <span id="L279" class="LineNr">279 </span>    <span class="subxComment"># ++out-&gt;write</span>
 <span id="L280" class="LineNr">280 </span>    41/increment-ECX
 <span id="L281" class="LineNr">281 </span>    <span class="subxComment"># Look = get-char(in)</span>
@@ -350,10 +346,10 @@ if ('onhashchange' in window) {
 <span id="L284" class="LineNr">284 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L285" class="LineNr">285 </span>    e8/call  get-char/disp32
 <span id="L286" class="LineNr">286 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L287" class="LineNr">287 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L287" class="LineNr">287 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L288" class="LineNr">288 </span><span class="Constant">$get-num:loop-end</span>:
 <span id="L289" class="LineNr">289 </span>    <span class="subxComment"># persist necessary variables from registers</span>
-<span id="L290" class="LineNr">290 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX to *EDI</span>
+<span id="L290" class="LineNr">290 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EDI</span>
 <span id="L291" class="LineNr">291 </span><span class="Constant">$get-num:end</span>:
 <span id="L292" class="LineNr">292 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L293" class="LineNr">293 </span>    5f/pop-to-EDI
@@ -363,7 +359,7 @@ if ('onhashchange' in window) {
 <span id="L297" class="LineNr">297 </span>    59/pop-to-ECX
 <span id="L298" class="LineNr">298 </span>    58/pop-to-EAX
 <span id="L299" class="LineNr">299 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L300" class="LineNr">300 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L300" class="LineNr">300 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L301" class="LineNr">301 </span>    5d/pop-to-EBP
 <span id="L302" class="LineNr">302 </span>    c3/return
 <span id="L303" class="LineNr">303 </span>
@@ -371,90 +367,90 @@ if ('onhashchange' in window) {
 <span id="L305" class="LineNr">305 </span>    <span class="subxH1Comment"># - check that get-num returns first character if it's a digit</span>
 <span id="L306" class="LineNr">306 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L308" class="LineNr">308 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L309" class="LineNr">309 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L310" class="LineNr">310 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L311" class="LineNr">311 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L312" class="LineNr">312 </span>    68/push  _test-stream/imm32
+<span id="L312" class="LineNr">312 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L313" class="LineNr">313 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L314" class="LineNr">314 </span>    e8/call  clear-stream/disp32
+<span id="L314" class="LineNr">314 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L315" class="LineNr">315 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L316" class="LineNr">316 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L316" class="LineNr">316 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L317" class="LineNr">317 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L318" class="LineNr">318 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L319" class="LineNr">319 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L319" class="LineNr">319 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L320" class="LineNr">320 </span>    05/add-to-EAX  4/imm32
 <span id="L321" class="LineNr">321 </span>    50/push-EAX
 <span id="L322" class="LineNr">322 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L323" class="LineNr">323 </span>    e8/call  clear-stream/disp32
+<span id="L323" class="LineNr">323 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L324" class="LineNr">324 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L325" class="LineNr">325 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L325" class="LineNr">325 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L326" class="LineNr">326 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
 <span id="L327" class="LineNr">327 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L328" class="LineNr">328 </span>    68/push  _test-output-stream/imm32
 <span id="L329" class="LineNr">329 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L330" class="LineNr">330 </span>    e8/call  clear-stream/disp32
+<span id="L330" class="LineNr">330 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L331" class="LineNr">331 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L332" class="LineNr">332 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L332" class="LineNr">332 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L333" class="LineNr">333 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L334" class="LineNr">334 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L335" class="LineNr">335 </span>    68/push  _test-error-stream/imm32
 <span id="L336" class="LineNr">336 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L337" class="LineNr">337 </span>    e8/call  clear-stream/disp32
+<span id="L337" class="LineNr">337 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L338" class="LineNr">338 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L339" class="LineNr">339 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L339" class="LineNr">339 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L340" class="LineNr">340 </span>    <span class="subxComment"># initialize 'in'</span>
 <span id="L341" class="LineNr">341 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;3&quot;)</span>
 <span id="L342" class="LineNr">342 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L343" class="LineNr">343 </span>    68/push  <span class="Constant">&quot;3&quot;</span>/imm32
-<span id="L344" class="LineNr">344 </span>    68/push  _test-stream/imm32
+<span id="L344" class="LineNr">344 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L345" class="LineNr">345 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L346" class="LineNr">346 </span>    e8/call  write/disp32
+<span id="L346" class="LineNr">346 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L347" class="LineNr">347 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L348" class="LineNr">348 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L348" class="LineNr">348 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L349" class="LineNr">349 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'get-num' below</span>
 <span id="L350" class="LineNr">350 </span>    <span class="subxS1Comment"># . var ed/EAX : exit-descriptor</span>
-<span id="L351" class="LineNr">351 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L352" class="LineNr">352 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L351" class="LineNr">351 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L352" class="LineNr">352 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L353" class="LineNr">353 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 16)</span>
 <span id="L354" class="LineNr">354 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L355" class="LineNr">355 </span>    68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L356" class="LineNr">356 </span>    50/push-EAX/ed
 <span id="L357" class="LineNr">357 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L358" class="LineNr">358 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L358" class="LineNr">358 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L359" class="LineNr">359 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L360" class="LineNr">360 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L360" class="LineNr">360 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L361" class="LineNr">361 </span>    <span class="subxComment"># prime the pump</span>
 <span id="L362" class="LineNr">362 </span>    <span class="subxS1Comment"># . get-char(_test-buffered-file)</span>
 <span id="L363" class="LineNr">363 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L364" class="LineNr">364 </span>    68/push  _test-buffered-file/imm32
+<span id="L364" class="LineNr">364 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L365" class="LineNr">365 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L366" class="LineNr">366 </span>    e8/call  get-char/disp32
 <span id="L367" class="LineNr">367 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L368" class="LineNr">368 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L368" class="LineNr">368 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L369" class="LineNr">369 </span>    <span class="subxComment"># get-num(in, out, err, ed)</span>
 <span id="L370" class="LineNr">370 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L371" class="LineNr">371 </span>    50/push-EAX/ed
 <span id="L372" class="LineNr">372 </span>    68/push  _test-error-stream/imm32
 <span id="L373" class="LineNr">373 </span>    68/push  _test-output-stream/imm32
-<span id="L374" class="LineNr">374 </span>    68/push  _test-buffered-file/imm32
+<span id="L374" class="LineNr">374 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L375" class="LineNr">375 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L376" class="LineNr">376 </span>    e8/call  get-num/disp32
 <span id="L377" class="LineNr">377 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L378" class="LineNr">378 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L379" class="LineNr">379 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L379" class="LineNr">379 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L380" class="LineNr">380 </span>    <span class="subxComment"># check-ints-equal(*_test-output-stream-&gt;data, '3', msg)</span>
 <span id="L381" class="LineNr">381 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L382" class="LineNr">382 </span>    68/push  <span class="Constant">&quot;F - test-get-num-reads-single-digit&quot;</span>/imm32
 <span id="L383" class="LineNr">383 </span>    68/push  0x33/imm32
 <span id="L384" class="LineNr">384 </span>    b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L385" class="LineNr">385 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L385" class="LineNr">385 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L386" class="LineNr">386 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L387" class="LineNr">387 </span>    e8/call  check-ints-equal/disp32
+<span id="L387" class="LineNr">387 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L388" class="LineNr">388 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L389" class="LineNr">389 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L389" class="LineNr">389 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L390" class="LineNr">390 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L391" class="LineNr">391 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L391" class="LineNr">391 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L392" class="LineNr">392 </span>    5d/pop-to-EBP
 <span id="L393" class="LineNr">393 </span>    c3/return
 <span id="L394" class="LineNr">394 </span>
@@ -462,84 +458,84 @@ if ('onhashchange' in window) {
 <span id="L396" class="LineNr">396 </span>    <span class="subxH1Comment"># - check that get-num returns first character if it's a digit</span>
 <span id="L397" class="LineNr">397 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L398" class="LineNr">398 </span>    55/push-EBP
-<span id="L399" class="LineNr">399 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L399" class="LineNr">399 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L400" class="LineNr">400 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L401" class="LineNr">401 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L402" class="LineNr">402 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L403" class="LineNr">403 </span>    68/push  _test-stream/imm32
+<span id="L403" class="LineNr">403 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L404" class="LineNr">404 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L405" class="LineNr">405 </span>    e8/call  clear-stream/disp32
+<span id="L405" class="LineNr">405 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L406" class="LineNr">406 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L407" class="LineNr">407 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L407" class="LineNr">407 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L408" class="LineNr">408 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L409" class="LineNr">409 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L410" class="LineNr">410 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L410" class="LineNr">410 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L411" class="LineNr">411 </span>    05/add-to-EAX  4/imm32
 <span id="L412" class="LineNr">412 </span>    50/push-EAX
 <span id="L413" class="LineNr">413 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L414" class="LineNr">414 </span>    e8/call  clear-stream/disp32
+<span id="L414" class="LineNr">414 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L415" class="LineNr">415 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L416" class="LineNr">416 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L416" class="LineNr">416 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L417" class="LineNr">417 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
 <span id="L418" class="LineNr">418 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L419" class="LineNr">419 </span>    68/push  _test-output-stream/imm32
 <span id="L420" class="LineNr">420 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L421" class="LineNr">421 </span>    e8/call  clear-stream/disp32
+<span id="L421" class="LineNr">421 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L422" class="LineNr">422 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L423" class="LineNr">423 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L423" class="LineNr">423 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L424" class="LineNr">424 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L425" class="LineNr">425 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L426" class="LineNr">426 </span>    68/push  _test-error-stream/imm32
 <span id="L427" class="LineNr">427 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L428" class="LineNr">428 </span>    e8/call  clear-stream/disp32
+<span id="L428" class="LineNr">428 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L429" class="LineNr">429 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L430" class="LineNr">430 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L430" class="LineNr">430 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L431" class="LineNr">431 </span>    <span class="subxComment"># initialize 'in'</span>
 <span id="L432" class="LineNr">432 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;3&quot;)</span>
 <span id="L433" class="LineNr">433 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L434" class="LineNr">434 </span>    68/push  <span class="Constant">&quot;3&quot;</span>/imm32
-<span id="L435" class="LineNr">435 </span>    68/push  _test-stream/imm32
+<span id="L435" class="LineNr">435 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L436" class="LineNr">436 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L437" class="LineNr">437 </span>    e8/call  write/disp32
+<span id="L437" class="LineNr">437 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L438" class="LineNr">438 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L439" class="LineNr">439 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L439" class="LineNr">439 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L440" class="LineNr">440 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'get-num' below</span>
 <span id="L441" class="LineNr">441 </span>    <span class="subxS1Comment"># . var ed/EAX : (address exit-descriptor)</span>
-<span id="L442" class="LineNr">442 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L443" class="LineNr">443 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L442" class="LineNr">442 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L443" class="LineNr">443 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L444" class="LineNr">444 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 16)</span>
 <span id="L445" class="LineNr">445 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L446" class="LineNr">446 </span>    68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L447" class="LineNr">447 </span>    50/push-EAX/ed
 <span id="L448" class="LineNr">448 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L449" class="LineNr">449 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L449" class="LineNr">449 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L450" class="LineNr">450 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L451" class="LineNr">451 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L451" class="LineNr">451 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L452" class="LineNr">452 </span>    <span class="subxComment"># *don't* prime the pump</span>
 <span id="L453" class="LineNr">453 </span>    <span class="subxComment"># get-num(in, out, err, ed)</span>
 <span id="L454" class="LineNr">454 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L455" class="LineNr">455 </span>    50/push-EAX/ed
 <span id="L456" class="LineNr">456 </span>    68/push  _test-error-stream/imm32
 <span id="L457" class="LineNr">457 </span>    68/push  _test-output-stream/imm32
-<span id="L458" class="LineNr">458 </span>    68/push  _test-buffered-file/imm32
+<span id="L458" class="LineNr">458 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L459" class="LineNr">459 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L460" class="LineNr">460 </span>    e8/call  get-num/disp32
 <span id="L461" class="LineNr">461 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L462" class="LineNr">462 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L463" class="LineNr">463 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L463" class="LineNr">463 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L464" class="LineNr">464 </span>    <span class="subxComment"># check that get-num tried to call exit(1)</span>
 <span id="L465" class="LineNr">465 </span>    <span class="subxS1Comment"># . check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
 <span id="L466" class="LineNr">466 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L467" class="LineNr">467 </span>    68/push  <span class="Constant">&quot;F - test-get-num-aborts-on-non-digit-in-Look&quot;</span>/imm32
 <span id="L468" class="LineNr">468 </span>    68/push  2/imm32
 <span id="L469" class="LineNr">469 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L470" class="LineNr">470 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L470" class="LineNr">470 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
 <span id="L471" class="LineNr">471 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L472" class="LineNr">472 </span>    e8/call  check-ints-equal/disp32
+<span id="L472" class="LineNr">472 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L473" class="LineNr">473 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L474" class="LineNr">474 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L474" class="LineNr">474 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L475" class="LineNr">475 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L476" class="LineNr">476 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L476" class="LineNr">476 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L477" class="LineNr">477 </span>    5d/pop-to-EBP
 <span id="L478" class="LineNr">478 </span>    c3/return
 <span id="L479" class="LineNr">479 </span>
@@ -549,49 +545,49 @@ if ('onhashchange' in window) {
 <span id="L483" class="LineNr">483 </span><span class="subxFunction">expected</span>:  <span class="subxComment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L484" class="LineNr">484 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L485" class="LineNr">485 </span>    55/push-EBP
-<span id="L486" class="LineNr">486 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L486" class="LineNr">486 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L487" class="LineNr">487 </span>    <span class="subxComment"># write(f, &quot;Error: &quot;)</span>
 <span id="L488" class="LineNr">488 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L489" class="LineNr">489 </span>    68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L490" class="LineNr">490 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L490" class="LineNr">490 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L491" class="LineNr">491 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L492" class="LineNr">492 </span>    e8/call  write/disp32
+<span id="L492" class="LineNr">492 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L493" class="LineNr">493 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L494" class="LineNr">494 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L494" class="LineNr">494 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L495" class="LineNr">495 </span>    <span class="subxComment"># write(f, s)</span>
 <span id="L496" class="LineNr">496 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L497" class="LineNr">497 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L498" class="LineNr">498 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L497" class="LineNr">497 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L498" class="LineNr">498 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L499" class="LineNr">499 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L500" class="LineNr">500 </span>    e8/call  write/disp32
+<span id="L500" class="LineNr">500 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L501" class="LineNr">501 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L502" class="LineNr">502 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L502" class="LineNr">502 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L503" class="LineNr">503 </span>    <span class="subxComment"># write(f, &quot; expected&quot;)</span>
 <span id="L504" class="LineNr">504 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L505" class="LineNr">505 </span>    68/push  <span class="Constant">&quot; expected&quot;</span>/imm32
-<span id="L506" class="LineNr">506 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L506" class="LineNr">506 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L507" class="LineNr">507 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L508" class="LineNr">508 </span>    e8/call  write/disp32
+<span id="L508" class="LineNr">508 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L509" class="LineNr">509 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L510" class="LineNr">510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L510" class="LineNr">510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L511" class="LineNr">511 </span>    <span class="subxComment"># write(f, Newline)</span>
 <span id="L512" class="LineNr">512 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L513" class="LineNr">513 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L514" class="LineNr">514 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L513" class="LineNr">513 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L514" class="LineNr">514 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L515" class="LineNr">515 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L516" class="LineNr">516 </span>    e8/call  write/disp32
+<span id="L516" class="LineNr">516 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L517" class="LineNr">517 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L518" class="LineNr">518 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L518" class="LineNr">518 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L519" class="LineNr">519 </span>    <span class="subxComment"># stop(ed, 1)</span>
 <span id="L520" class="LineNr">520 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L521" class="LineNr">521 </span>    68/push  1/imm32
-<span id="L522" class="LineNr">522 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L522" class="LineNr">522 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L523" class="LineNr">523 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L524" class="LineNr">524 </span>    e8/call  stop/disp32
+<span id="L524" class="LineNr">524 </span>    e8/call  <a href='057stop.subx.html#L99'>stop</a>/disp32
 <span id="L525" class="LineNr">525 </span>    <span class="subxComment"># should never get past this point</span>
 <span id="L526" class="LineNr">526 </span><span class="Constant">$expected:dead-end</span>:
 <span id="L527" class="LineNr">527 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L528" class="LineNr">528 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L528" class="LineNr">528 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L529" class="LineNr">529 </span>    5d/pop-to-EBP
 <span id="L530" class="LineNr">530 </span>    c3/return
 <span id="L531" class="LineNr">531 </span>
@@ -599,43 +595,43 @@ if ('onhashchange' in window) {
 <span id="L533" class="LineNr">533 </span><span class="subxFunction">get-char</span>:  <span class="subxComment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
 <span id="L534" class="LineNr">534 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L535" class="LineNr">535 </span>    55/push-EBP
-<span id="L536" class="LineNr">536 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L536" class="LineNr">536 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L537" class="LineNr">537 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L538" class="LineNr">538 </span>    50/push-EAX
 <span id="L539" class="LineNr">539 </span>    <span class="subxComment"># read-byte(f)</span>
 <span id="L540" class="LineNr">540 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L541" class="LineNr">541 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L541" class="LineNr">541 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L542" class="LineNr">542 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L543" class="LineNr">543 </span>    e8/call  read-byte/disp32
+<span id="L543" class="LineNr">543 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L544" class="LineNr">544 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L545" class="LineNr">545 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L545" class="LineNr">545 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L546" class="LineNr">546 </span>    <span class="subxComment"># save EAX to Look</span>
-<span id="L547" class="LineNr">547 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *Look</span>
+<span id="L547" class="LineNr">547 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *Look</span>
 <span id="L548" class="LineNr">548 </span><span class="Constant">$get-char:end</span>:
 <span id="L549" class="LineNr">549 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L550" class="LineNr">550 </span>    58/pop-to-EAX
 <span id="L551" class="LineNr">551 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L552" class="LineNr">552 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L552" class="LineNr">552 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L553" class="LineNr">553 </span>    5d/pop-to-EBP
 <span id="L554" class="LineNr">554 </span>    c3/return
 <span id="L555" class="LineNr">555 </span>
 <span id="L556" class="LineNr">556 </span><span class="subxFunction">is-digit?</span>:  <span class="subxComment"># c : int -&gt; bool/EAX</span>
 <span id="L557" class="LineNr">557 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L558" class="LineNr">558 </span>    55/push-EBP
-<span id="L559" class="LineNr">559 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L559" class="LineNr">559 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L560" class="LineNr">560 </span>    <span class="subxComment"># EAX = false</span>
 <span id="L561" class="LineNr">561 </span>    b8/copy-to-EAX  0/imm32
 <span id="L562" class="LineNr">562 </span>    <span class="subxComment"># if c &lt; '0' return false</span>
-<span id="L563" class="LineNr">563 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x30/imm32        <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L563" class="LineNr">563 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x30/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L564" class="LineNr">564 </span>    7c/jump-if-lesser  $is-digit?:end/disp8
 <span id="L565" class="LineNr">565 </span>    <span class="subxComment"># if c &gt; '9' return false</span>
-<span id="L566" class="LineNr">566 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x39/imm32        <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L566" class="LineNr">566 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x39/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L567" class="LineNr">567 </span>    7f/jump-if-greater  $is-digit?:end/disp8
 <span id="L568" class="LineNr">568 </span>    <span class="subxComment"># otherwise return true</span>
 <span id="L569" class="LineNr">569 </span>    b8/copy-to-EAX  1/imm32
 <span id="L570" class="LineNr">570 </span><span class="Constant">$is-digit?:end</span>:
 <span id="L571" class="LineNr">571 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L572" class="LineNr">572 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L572" class="LineNr">572 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L573" class="LineNr">573 </span>    5d/pop-to-EBP
 <span id="L574" class="LineNr">574 </span>    c3/return
 <span id="L575" class="LineNr">575 </span>
diff --git a/html/subx/apps/crenshaw2-1b.subx.html b/html/subx/apps/crenshaw2-1b.subx.html
index 041f573f..7da0960a 100644
--- a/html/subx/apps/crenshaw2-1b.subx.html
+++ b/html/subx/apps/crenshaw2-1b.subx.html
@@ -7,28 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
+.Constant { color: #008787; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxMinorFunction { color: #875f5f; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxTest { color: #5f8700; }
 .SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -102,44 +98,44 @@ if ('onhashchange' in window) {
 <span id="L36" class="LineNr"> 36 </span>
 <span id="L37" class="LineNr"> 37 </span><span class="subxComment"># main: run tests if necessary, call 'compile' if not</span>
 <span id="L38" class="LineNr"> 38 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L39" class="LineNr"> 39 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L39" class="LineNr"> 39 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot; then return run_tests()</span>
 <span id="L41" class="LineNr"> 41 </span>    <span class="subxS1Comment"># . argc &gt; 1</span>
-<span id="L42" class="LineNr"> 42 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
+<span id="L42" class="LineNr"> 42 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L43" class="LineNr"> 43 </span>    7e/jump-if-lesser-or-equal  $run-main/disp8
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxS1Comment"># . argv[1] == &quot;test&quot;</span>
 <span id="L45" class="LineNr"> 45 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L46" class="LineNr"> 46 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L47" class="LineNr"> 47 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L47" class="LineNr"> 47 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L49" class="LineNr"> 49 </span>    e8/call  kernel-string-equal/disp32
+<span id="L49" class="LineNr"> 49 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L52" class="LineNr"> 52 </span>    <span class="subxS1Comment"># . check result</span>
 <span id="L53" class="LineNr"> 53 </span>    3d/compare-EAX  1/imm32
 <span id="L54" class="LineNr"> 54 </span>    75/jump-if-not-equal  $run-main/disp8
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxS1Comment"># . run-tests()</span>
 <span id="L56" class="LineNr"> 56 </span>    e8/call  run-tests/disp32
-<span id="L57" class="LineNr"> 57 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L57" class="LineNr"> 57 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L58" class="LineNr"> 58 </span>    eb/jump  $main:end/disp8
 <span id="L59" class="LineNr"> 59 </span><span class="Constant">$run-main</span>:
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxH1Comment"># - otherwise read a program from stdin and emit its translation to stdout</span>
 <span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># var ed/EAX : exit-descriptor</span>
-<span id="L62" class="LineNr"> 62 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L63" class="LineNr"> 63 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L62" class="LineNr"> 62 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L63" class="LineNr"> 63 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxComment"># configure ed to really exit()</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxS1Comment"># . ed-&gt;target = 0</span>
-<span id="L66" class="LineNr"> 66 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L66" class="LineNr"> 66 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxComment"># return compile(Stdin, 1/stdout, 2/stderr, ed)</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L69" class="LineNr"> 69 </span>    50/push-EAX/ed
 <span id="L70" class="LineNr"> 70 </span>    68/push  2/imm32/stderr
 <span id="L71" class="LineNr"> 71 </span>    68/push  1/imm32/stdout
-<span id="L72" class="LineNr"> 72 </span>    68/push  <span class="SpecialChar">Stdin</span>/imm32
+<span id="L72" class="LineNr"> 72 </span>    68/push  <span class="SpecialChar"><a href='059read-byte.subx.html#L14'>Stdin</a></span>/imm32
 <span id="L73" class="LineNr"> 73 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L74" class="LineNr"> 74 </span>    e8/call  compile/disp32
 <span id="L75" class="LineNr"> 75 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L76" class="LineNr"> 76 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L76" class="LineNr"> 76 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxS1Comment"># . syscall(exit, 0)</span>
 <span id="L78" class="LineNr"> 78 </span>    bb/copy-to-EBX  0/imm32
 <span id="L79" class="LineNr"> 79 </span><span class="Constant">$main:end</span>:
@@ -150,46 +146,46 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr"> 84 </span><span class="subxFunction">compile</span>:  <span class="subxComment"># in : (address buffered-file), out : fd or (address stream), err : fd or (address stream), ed : (address exit-descriptor) -&gt; &lt;void&gt;</span>
 <span id="L85" class="LineNr"> 85 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L86" class="LineNr"> 86 </span>    55/push-EBP
-<span id="L87" class="LineNr"> 87 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L87" class="LineNr"> 87 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L88" class="LineNr"> 88 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L89" class="LineNr"> 89 </span>    50/push-EAX
 <span id="L90" class="LineNr"> 90 </span>    51/push-ECX
 <span id="L91" class="LineNr"> 91 </span>    <span class="subxComment"># prime the pump</span>
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS1Comment"># . Look = get-char(in)</span>
 <span id="L93" class="LineNr"> 93 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L94" class="LineNr"> 94 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L94" class="LineNr"> 94 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8     <span class="Normal"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
 <span id="L95" class="LineNr"> 95 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L96" class="LineNr"> 96 </span>    e8/call  get-char/disp32
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L98" class="LineNr"> 98 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L99" class="LineNr"> 99 </span>    <span class="subxComment"># var num/ECX : (address stream) on the stack</span>
 <span id="L100" class="LineNr">100 </span>    <span class="subxComment"># Numbers can be 32 bits or 8 hex bytes long. One of them will be in 'Look', so we need space for 7 bytes.</span>
 <span id="L101" class="LineNr">101 </span>    <span class="subxComment"># Sizing the stream just right buys us overflow-handling for free inside 'get-num'.</span>
 <span id="L102" class="LineNr">102 </span>    <span class="subxComment"># Add 12 bytes for 'read', 'write' and 'length' fields, for a total of 19 bytes, or 0x13 in hex.</span>
 <span id="L103" class="LineNr">103 </span>    <span class="subxComment"># The stack pointer is no longer aligned, so dump_stack() can be misleading past this point.</span>
-<span id="L104" class="LineNr">104 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x13/imm32        <span class="subxComment"># subtract from ESP</span>
-<span id="L105" class="LineNr">105 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L104" class="LineNr">104 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x13/imm32        <span class="subxComment"># subtract from ESP</span>
+<span id="L105" class="LineNr">105 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L106" class="LineNr">106 </span>    <span class="subxComment"># initialize the stream</span>
 <span id="L107" class="LineNr">107 </span>    <span class="subxS1Comment"># . num-&gt;length = 7</span>
-<span id="L108" class="LineNr">108 </span>    c7/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         7/imm32           <span class="subxComment"># copy to *(ECX+8)</span>
+<span id="L108" class="LineNr">108 </span>    c7          0/subop/copy        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         7/imm32           <span class="subxComment"># copy to *(ECX+8)</span>
 <span id="L109" class="LineNr">109 </span>    <span class="subxS1Comment"># . clear-stream(num)</span>
 <span id="L110" class="LineNr">110 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L111" class="LineNr">111 </span>    51/push-ECX
 <span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L113" class="LineNr">113 </span>    e8/call  clear-stream/disp32
+<span id="L113" class="LineNr">113 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L114" class="LineNr">114 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L115" class="LineNr">115 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L115" class="LineNr">115 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L116" class="LineNr">116 </span>    <span class="subxComment"># read a digit from 'in' into 'num'</span>
 <span id="L117" class="LineNr">117 </span>    <span class="subxS1Comment"># . get-num(in, num, err, ed)</span>
 <span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L119" class="LineNr">119 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
-<span id="L120" class="LineNr">120 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L119" class="LineNr">119 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L120" class="LineNr">120 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
 <span id="L121" class="LineNr">121 </span>    51/push-ECX/num
-<span id="L122" class="LineNr">122 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8     <span class="CommentedCode"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
+<span id="L122" class="LineNr">122 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8     <span class="Normal"> . </span>                   <span class="subxComment"># push *(EBP+8)</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L124" class="LineNr">124 </span>    e8/call  get-num/disp32
 <span id="L125" class="LineNr">125 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L126" class="LineNr">126 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L127" class="LineNr">127 </span>    <span class="subxComment"># render 'num' into the following template on 'out':</span>
 <span id="L128" class="LineNr">128 </span>    <span class="subxComment">#   bb/copy-to-EBX  _num_</span>
 <span id="L129" class="LineNr">129 </span>    <span class="subxComment">#   b8/copy-to-EAX  1/imm32/exit</span>
@@ -198,65 +194,65 @@ if ('onhashchange' in window) {
 <span id="L132" class="LineNr">132 </span>    <span class="subxS1Comment"># . write(out, &quot;bb/copy-to-EBX  &quot;)</span>
 <span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L134" class="LineNr">134 </span>    68/push  <span class="Constant">&quot;bb/copy-to-EBX  &quot;</span>/imm32
-<span id="L135" class="LineNr">135 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L135" class="LineNr">135 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L136" class="LineNr">136 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L137" class="LineNr">137 </span>    e8/call  write/disp32
+<span id="L137" class="LineNr">137 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L139" class="LineNr">139 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L140" class="LineNr">140 </span>    <span class="subxS1Comment"># . write-stream(out, num)</span>
 <span id="L141" class="LineNr">141 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L142" class="LineNr">142 </span>    51/push-ECX/num
-<span id="L143" class="LineNr">143 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L143" class="LineNr">143 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L144" class="LineNr">144 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L145" class="LineNr">145 </span>    e8/call  write-stream/disp32
+<span id="L145" class="LineNr">145 </span>    e8/call  <a href='060write-stream.subx.html#L22'>write-stream</a>/disp32
 <span id="L146" class="LineNr">146 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L147" class="LineNr">147 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L148" class="LineNr">148 </span>    <span class="subxS1Comment"># . write(out, Newline)</span>
 <span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L150" class="LineNr">150 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L151" class="LineNr">151 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L150" class="LineNr">150 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L151" class="LineNr">151 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L152" class="LineNr">152 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L153" class="LineNr">153 </span>    e8/call  write/disp32
+<span id="L153" class="LineNr">153 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L154" class="LineNr">154 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L155" class="LineNr">155 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L155" class="LineNr">155 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L156" class="LineNr">156 </span>    <span class="subxS1Comment"># . write(out, &quot;b8/copy-to-EAX  1/imm32/exit&quot;)</span>
 <span id="L157" class="LineNr">157 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L158" class="LineNr">158 </span>    68/push  <span class="Constant">&quot;b8/copy-to-EAX  1/imm32/exit&quot;</span>/imm32
-<span id="L159" class="LineNr">159 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L159" class="LineNr">159 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L161" class="LineNr">161 </span>    e8/call  write/disp32
+<span id="L161" class="LineNr">161 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L162" class="LineNr">162 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L163" class="LineNr">163 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L163" class="LineNr">163 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L164" class="LineNr">164 </span>    <span class="subxS1Comment"># . write(out, Newline)</span>
 <span id="L165" class="LineNr">165 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L166" class="LineNr">166 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L167" class="LineNr">167 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L166" class="LineNr">166 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L167" class="LineNr">167 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L168" class="LineNr">168 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L169" class="LineNr">169 </span>    e8/call  write/disp32
+<span id="L169" class="LineNr">169 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L171" class="LineNr">171 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L171" class="LineNr">171 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L172" class="LineNr">172 </span>    <span class="subxS1Comment"># . write(out, &quot;cd/syscall  0x80/imm8&quot;)</span>
 <span id="L173" class="LineNr">173 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L174" class="LineNr">174 </span>    68/push  <span class="Constant">&quot;cd/syscall  0x80/imm8&quot;</span>/imm32
-<span id="L175" class="LineNr">175 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L175" class="LineNr">175 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L177" class="LineNr">177 </span>    e8/call  write/disp32
+<span id="L177" class="LineNr">177 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L179" class="LineNr">179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L179" class="LineNr">179 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L180" class="LineNr">180 </span>    <span class="subxS1Comment"># . write(out, Newline)</span>
 <span id="L181" class="LineNr">181 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L182" class="LineNr">182 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L182" class="LineNr">182 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L183" class="LineNr">183 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L184" class="LineNr">184 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L185" class="LineNr">185 </span>    e8/call  write/disp32
+<span id="L185" class="LineNr">185 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L186" class="LineNr">186 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L187" class="LineNr">187 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L188" class="LineNr">188 </span><span class="Constant">$compile:end</span>:
 <span id="L189" class="LineNr">189 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L190" class="LineNr">190 </span>    59/pop-to-ECX
 <span id="L191" class="LineNr">191 </span>    58/pop-to-EAX
 <span id="L192" class="LineNr">192 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L193" class="LineNr">193 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L193" class="LineNr">193 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L194" class="LineNr">194 </span>    5d/pop-to-EBP
 <span id="L195" class="LineNr">195 </span>    c3/return
 <span id="L196" class="LineNr">196 </span>
@@ -291,27 +287,27 @@ if ('onhashchange' in window) {
 <span id="L225" class="LineNr">225 </span>    <span class="subxComment">#</span>
 <span id="L226" class="LineNr">226 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L227" class="LineNr">227 </span>    55/push-EBP
-<span id="L228" class="LineNr">228 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L228" class="LineNr">228 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L229" class="LineNr">229 </span>    <span class="subxH1Comment"># - if is-digit?(Look) expected(ed, err, &quot;integer&quot;)</span>
 <span id="L230" class="LineNr">230 </span>    <span class="subxS1Comment"># . EAX = is-digit?(Look)</span>
 <span id="L231" class="LineNr">231 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L232" class="LineNr">232 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># push *Look</span>
+<span id="L232" class="LineNr">232 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># push *Look</span>
 <span id="L233" class="LineNr">233 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L234" class="LineNr">234 </span>    e8/call  is-digit?/disp32
 <span id="L235" class="LineNr">235 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L236" class="LineNr">236 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L236" class="LineNr">236 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L237" class="LineNr">237 </span>    <span class="subxS1Comment"># . if EAX == 0</span>
 <span id="L238" class="LineNr">238 </span>    3d/compare-EAX  0/imm32
 <span id="L239" class="LineNr">239 </span>    75/jump-if-not-equal  $get-num:main/disp8
 <span id="L240" class="LineNr">240 </span>    <span class="subxS1Comment"># . expected(ed, err, &quot;integer&quot;)</span>
 <span id="L241" class="LineNr">241 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L242" class="LineNr">242 </span>    68/push  <span class="Constant">&quot;integer&quot;</span>/imm32
-<span id="L243" class="LineNr">243 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L244" class="LineNr">244 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L243" class="LineNr">243 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L244" class="LineNr">244 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
 <span id="L245" class="LineNr">245 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L246" class="LineNr">246 </span>    e8/call  expected/disp32  <span class="subxComment"># never returns</span>
 <span id="L247" class="LineNr">247 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L248" class="LineNr">248 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L248" class="LineNr">248 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L249" class="LineNr">249 </span><span class="Constant">$get-num:main</span>:
 <span id="L250" class="LineNr">250 </span>    <span class="subxH1Comment"># - otherwise read a digit</span>
 <span id="L251" class="LineNr">251 </span>    <span class="subxS1Comment"># . save registers</span>
@@ -323,31 +319,31 @@ if ('onhashchange' in window) {
 <span id="L257" class="LineNr">257 </span>    57/push-EDI
 <span id="L258" class="LineNr">258 </span>    <span class="subxComment"># read necessary variables to registers</span>
 <span id="L259" class="LineNr">259 </span>    <span class="subxComment"># ESI = in</span>
-<span id="L260" class="LineNr">260 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
+<span id="L260" class="LineNr">260 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ESI</span>
 <span id="L261" class="LineNr">261 </span>    <span class="subxComment"># EDI = out</span>
-<span id="L262" class="LineNr">262 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
+<span id="L262" class="LineNr">262 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDI</span>
 <span id="L263" class="LineNr">263 </span>    <span class="subxComment"># ECX = out-&gt;write</span>
-<span id="L264" class="LineNr">264 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
+<span id="L264" class="LineNr">264 </span>    8b/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDI to ECX</span>
 <span id="L265" class="LineNr">265 </span>    <span class="subxComment"># EDX = out-&gt;length</span>
-<span id="L266" class="LineNr">266 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
+<span id="L266" class="LineNr">266 </span>    8b/copy                         1/mod/*+disp8   7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EDI+8) to EDX</span>
 <span id="L267" class="LineNr">267 </span><span class="Constant">$get-num:loop</span>:
 <span id="L268" class="LineNr">268 </span>    <span class="subxComment"># if out-&gt;write &gt;= out-&gt;length error</span>
-<span id="L269" class="LineNr">269 </span>    39/compare                      3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EDX with ECX</span>
+<span id="L269" class="LineNr">269 </span>    39/compare                      3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EDX with ECX</span>
 <span id="L270" class="LineNr">270 </span>    7d/jump-if-lesser  $get-num:loop-stage2/disp8
 <span id="L271" class="LineNr">271 </span>    <span class="subxS1Comment"># . error(ed, err, msg)  # TODO: show full number</span>
 <span id="L272" class="LineNr">272 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L273" class="LineNr">273 </span>    68/push  <span class="Constant">&quot;get-num: too many digits in number&quot;</span>/imm32
-<span id="L274" class="LineNr">274 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L275" class="LineNr">275 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L274" class="LineNr">274 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L275" class="LineNr">275 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
 <span id="L276" class="LineNr">276 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L277" class="LineNr">277 </span>    e8/call  error/disp32  <span class="subxComment"># never returns</span>
+<span id="L277" class="LineNr">277 </span>    e8/call  <a href='061error.subx.html#L16'>error</a>/disp32  <span class="subxComment"># never returns</span>
 <span id="L278" class="LineNr">278 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L279" class="LineNr">279 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L279" class="LineNr">279 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L280" class="LineNr">280 </span><span class="Constant">$get-num:loop-stage2</span>:
 <span id="L281" class="LineNr">281 </span>    <span class="subxComment"># out-&gt;data[out-&gt;write] = LSB(Look)</span>
-<span id="L282" class="LineNr">282 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
-<span id="L283" class="LineNr">283 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *Look to EAX</span>
-<span id="L284" class="LineNr">284 </span>    88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/AL   <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at AL to *EBX</span>
+<span id="L282" class="LineNr">282 </span>    8d/copy-address                 1/mod/*+disp8   4/rm32/sib    7/base/EDI  1/index/ECX  <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy EDI+ECX+12 to EBX</span>
+<span id="L283" class="LineNr">283 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Look to EAX</span>
+<span id="L284" class="LineNr">284 </span>    88/copy-byte                    0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/AL   <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at AL to *EBX</span>
 <span id="L285" class="LineNr">285 </span>    <span class="subxComment"># ++out-&gt;write</span>
 <span id="L286" class="LineNr">286 </span>    41/increment-ECX
 <span id="L287" class="LineNr">287 </span>    <span class="subxComment"># Look = get-char(in)</span>
@@ -356,21 +352,21 @@ if ('onhashchange' in window) {
 <span id="L290" class="LineNr">290 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L291" class="LineNr">291 </span>    e8/call  get-char/disp32
 <span id="L292" class="LineNr">292 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L293" class="LineNr">293 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L293" class="LineNr">293 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L294" class="LineNr">294 </span>    <span class="subxComment"># if is-digit?(Look) loop</span>
 <span id="L295" class="LineNr">295 </span>    <span class="subxS1Comment"># . EAX = is-digit?(Look)</span>
 <span id="L296" class="LineNr">296 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L297" class="LineNr">297 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># push *Look</span>
+<span id="L297" class="LineNr">297 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># push *Look</span>
 <span id="L298" class="LineNr">298 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L299" class="LineNr">299 </span>    e8/call  is-digit?/disp32
 <span id="L300" class="LineNr">300 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L301" class="LineNr">301 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L301" class="LineNr">301 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L302" class="LineNr">302 </span>    <span class="subxS1Comment"># . if EAX loop</span>
 <span id="L303" class="LineNr">303 </span>    3d/compare-EAX  0/imm32
 <span id="L304" class="LineNr">304 </span>    0f 85/jump-if-not-equal  $get-num:loop/disp32
 <span id="L305" class="LineNr">305 </span><span class="Constant">$get-num:loop-end</span>:
 <span id="L306" class="LineNr">306 </span>    <span class="subxComment"># persist necessary variables from registers</span>
-<span id="L307" class="LineNr">307 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ECX to *EDI</span>
+<span id="L307" class="LineNr">307 </span>    89/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EDI</span>
 <span id="L308" class="LineNr">308 </span><span class="Constant">$get-num:end</span>:
 <span id="L309" class="LineNr">309 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L310" class="LineNr">310 </span>    5f/pop-to-EDI
@@ -380,7 +376,7 @@ if ('onhashchange' in window) {
 <span id="L314" class="LineNr">314 </span>    59/pop-to-ECX
 <span id="L315" class="LineNr">315 </span>    58/pop-to-EAX
 <span id="L316" class="LineNr">316 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L317" class="LineNr">317 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L317" class="LineNr">317 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L318" class="LineNr">318 </span>    5d/pop-to-EBP
 <span id="L319" class="LineNr">319 </span>    c3/return
 <span id="L320" class="LineNr">320 </span>
@@ -388,90 +384,90 @@ if ('onhashchange' in window) {
 <span id="L322" class="LineNr">322 </span>    <span class="subxH1Comment"># - check that get-num returns first character if it's a digit</span>
 <span id="L323" class="LineNr">323 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L324" class="LineNr">324 </span>    55/push-EBP
-<span id="L325" class="LineNr">325 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L325" class="LineNr">325 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L326" class="LineNr">326 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L327" class="LineNr">327 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L328" class="LineNr">328 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L329" class="LineNr">329 </span>    68/push  _test-stream/imm32
+<span id="L329" class="LineNr">329 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L330" class="LineNr">330 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L331" class="LineNr">331 </span>    e8/call  clear-stream/disp32
+<span id="L331" class="LineNr">331 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L332" class="LineNr">332 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L333" class="LineNr">333 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L333" class="LineNr">333 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L334" class="LineNr">334 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L335" class="LineNr">335 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L336" class="LineNr">336 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L336" class="LineNr">336 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L337" class="LineNr">337 </span>    05/add-to-EAX  4/imm32
 <span id="L338" class="LineNr">338 </span>    50/push-EAX
 <span id="L339" class="LineNr">339 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L340" class="LineNr">340 </span>    e8/call  clear-stream/disp32
+<span id="L340" class="LineNr">340 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L341" class="LineNr">341 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L342" class="LineNr">342 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L342" class="LineNr">342 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L343" class="LineNr">343 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
 <span id="L344" class="LineNr">344 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L345" class="LineNr">345 </span>    68/push  _test-output-stream/imm32
 <span id="L346" class="LineNr">346 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L347" class="LineNr">347 </span>    e8/call  clear-stream/disp32
+<span id="L347" class="LineNr">347 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L348" class="LineNr">348 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L349" class="LineNr">349 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L349" class="LineNr">349 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L350" class="LineNr">350 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L351" class="LineNr">351 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L352" class="LineNr">352 </span>    68/push  _test-error-stream/imm32
 <span id="L353" class="LineNr">353 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L354" class="LineNr">354 </span>    e8/call  clear-stream/disp32
+<span id="L354" class="LineNr">354 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L355" class="LineNr">355 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L356" class="LineNr">356 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L356" class="LineNr">356 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L357" class="LineNr">357 </span>    <span class="subxComment"># initialize 'in'</span>
 <span id="L358" class="LineNr">358 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;3&quot;)</span>
 <span id="L359" class="LineNr">359 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L360" class="LineNr">360 </span>    68/push  <span class="Constant">&quot;3&quot;</span>/imm32
-<span id="L361" class="LineNr">361 </span>    68/push  _test-stream/imm32
+<span id="L361" class="LineNr">361 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L362" class="LineNr">362 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L363" class="LineNr">363 </span>    e8/call  write/disp32
+<span id="L363" class="LineNr">363 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L364" class="LineNr">364 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L365" class="LineNr">365 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L365" class="LineNr">365 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L366" class="LineNr">366 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'get-num' below</span>
 <span id="L367" class="LineNr">367 </span>    <span class="subxS1Comment"># . var ed/EAX : exit-descriptor</span>
-<span id="L368" class="LineNr">368 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L369" class="LineNr">369 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L368" class="LineNr">368 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L369" class="LineNr">369 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L370" class="LineNr">370 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 16)</span>
 <span id="L371" class="LineNr">371 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L372" class="LineNr">372 </span>    68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L373" class="LineNr">373 </span>    50/push-EAX/ed
 <span id="L374" class="LineNr">374 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L375" class="LineNr">375 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L375" class="LineNr">375 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L376" class="LineNr">376 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L377" class="LineNr">377 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L377" class="LineNr">377 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L378" class="LineNr">378 </span>    <span class="subxComment"># prime the pump</span>
 <span id="L379" class="LineNr">379 </span>    <span class="subxS1Comment"># . get-char(_test-buffered-file)</span>
 <span id="L380" class="LineNr">380 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L381" class="LineNr">381 </span>    68/push  _test-buffered-file/imm32
+<span id="L381" class="LineNr">381 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L382" class="LineNr">382 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L383" class="LineNr">383 </span>    e8/call  get-char/disp32
 <span id="L384" class="LineNr">384 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L385" class="LineNr">385 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L385" class="LineNr">385 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L386" class="LineNr">386 </span>    <span class="subxComment"># get-num(in, out, err, ed)</span>
 <span id="L387" class="LineNr">387 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L388" class="LineNr">388 </span>    50/push-EAX/ed
 <span id="L389" class="LineNr">389 </span>    68/push  _test-error-stream/imm32
 <span id="L390" class="LineNr">390 </span>    68/push  _test-output-stream/imm32
-<span id="L391" class="LineNr">391 </span>    68/push  _test-buffered-file/imm32
+<span id="L391" class="LineNr">391 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L392" class="LineNr">392 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L393" class="LineNr">393 </span>    e8/call  get-num/disp32
 <span id="L394" class="LineNr">394 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L395" class="LineNr">395 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L396" class="LineNr">396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L396" class="LineNr">396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L397" class="LineNr">397 </span>    <span class="subxComment"># check-ints-equal(*_test-output-stream-&gt;data, '3', msg)</span>
 <span id="L398" class="LineNr">398 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L399" class="LineNr">399 </span>    68/push  <span class="Constant">&quot;F - test-get-num-reads-single-digit&quot;</span>/imm32
 <span id="L400" class="LineNr">400 </span>    68/push  0x33/imm32
 <span id="L401" class="LineNr">401 </span>    b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L402" class="LineNr">402 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L402" class="LineNr">402 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L403" class="LineNr">403 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L404" class="LineNr">404 </span>    e8/call  check-ints-equal/disp32
+<span id="L404" class="LineNr">404 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L405" class="LineNr">405 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L406" class="LineNr">406 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L406" class="LineNr">406 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L407" class="LineNr">407 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L408" class="LineNr">408 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L408" class="LineNr">408 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L409" class="LineNr">409 </span>    5d/pop-to-EBP
 <span id="L410" class="LineNr">410 </span>    c3/return
 <span id="L411" class="LineNr">411 </span>
@@ -479,84 +475,84 @@ if ('onhashchange' in window) {
 <span id="L413" class="LineNr">413 </span>    <span class="subxH1Comment"># - check that get-num returns first character if it's a digit</span>
 <span id="L414" class="LineNr">414 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L415" class="LineNr">415 </span>    55/push-EBP
-<span id="L416" class="LineNr">416 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L416" class="LineNr">416 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L417" class="LineNr">417 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L418" class="LineNr">418 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L419" class="LineNr">419 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L420" class="LineNr">420 </span>    68/push  _test-stream/imm32
+<span id="L420" class="LineNr">420 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L421" class="LineNr">421 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L422" class="LineNr">422 </span>    e8/call  clear-stream/disp32
+<span id="L422" class="LineNr">422 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L423" class="LineNr">423 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L424" class="LineNr">424 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L424" class="LineNr">424 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L425" class="LineNr">425 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L426" class="LineNr">426 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L427" class="LineNr">427 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L427" class="LineNr">427 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L428" class="LineNr">428 </span>    05/add-to-EAX  4/imm32
 <span id="L429" class="LineNr">429 </span>    50/push-EAX
 <span id="L430" class="LineNr">430 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L431" class="LineNr">431 </span>    e8/call  clear-stream/disp32
+<span id="L431" class="LineNr">431 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L432" class="LineNr">432 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L433" class="LineNr">433 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L433" class="LineNr">433 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L434" class="LineNr">434 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
 <span id="L435" class="LineNr">435 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L436" class="LineNr">436 </span>    68/push  _test-output-stream/imm32
 <span id="L437" class="LineNr">437 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L438" class="LineNr">438 </span>    e8/call  clear-stream/disp32
+<span id="L438" class="LineNr">438 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L439" class="LineNr">439 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L440" class="LineNr">440 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L440" class="LineNr">440 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L441" class="LineNr">441 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L442" class="LineNr">442 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L443" class="LineNr">443 </span>    68/push  _test-error-stream/imm32
 <span id="L444" class="LineNr">444 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L445" class="LineNr">445 </span>    e8/call  clear-stream/disp32
+<span id="L445" class="LineNr">445 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L446" class="LineNr">446 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L447" class="LineNr">447 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L447" class="LineNr">447 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L448" class="LineNr">448 </span>    <span class="subxComment"># initialize 'in'</span>
 <span id="L449" class="LineNr">449 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;3&quot;)</span>
 <span id="L450" class="LineNr">450 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L451" class="LineNr">451 </span>    68/push  <span class="Constant">&quot;3&quot;</span>/imm32
-<span id="L452" class="LineNr">452 </span>    68/push  _test-stream/imm32
+<span id="L452" class="LineNr">452 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L453" class="LineNr">453 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L454" class="LineNr">454 </span>    e8/call  write/disp32
+<span id="L454" class="LineNr">454 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L455" class="LineNr">455 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L456" class="LineNr">456 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L456" class="LineNr">456 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L457" class="LineNr">457 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'get-num' below</span>
 <span id="L458" class="LineNr">458 </span>    <span class="subxS1Comment"># . var ed/EAX : (address exit-descriptor)</span>
-<span id="L459" class="LineNr">459 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L460" class="LineNr">460 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L459" class="LineNr">459 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L460" class="LineNr">460 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L461" class="LineNr">461 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 16)</span>
 <span id="L462" class="LineNr">462 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L463" class="LineNr">463 </span>    68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L464" class="LineNr">464 </span>    50/push-EAX/ed
 <span id="L465" class="LineNr">465 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L466" class="LineNr">466 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L466" class="LineNr">466 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L467" class="LineNr">467 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L468" class="LineNr">468 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L468" class="LineNr">468 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L469" class="LineNr">469 </span>    <span class="subxComment"># *don't* prime the pump</span>
 <span id="L470" class="LineNr">470 </span>    <span class="subxComment"># get-num(in, out, err, ed)</span>
 <span id="L471" class="LineNr">471 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L472" class="LineNr">472 </span>    50/push-EAX/ed
 <span id="L473" class="LineNr">473 </span>    68/push  _test-error-stream/imm32
 <span id="L474" class="LineNr">474 </span>    68/push  _test-output-stream/imm32
-<span id="L475" class="LineNr">475 </span>    68/push  _test-buffered-file/imm32
+<span id="L475" class="LineNr">475 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L476" class="LineNr">476 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L477" class="LineNr">477 </span>    e8/call  get-num/disp32
 <span id="L478" class="LineNr">478 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L479" class="LineNr">479 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L480" class="LineNr">480 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L480" class="LineNr">480 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L481" class="LineNr">481 </span>    <span class="subxComment"># check that get-num tried to call exit(1)</span>
 <span id="L482" class="LineNr">482 </span>    <span class="subxS1Comment"># . check-ints-equal(ed-&gt;value, 2, msg)  # i.e. stop was called with value 1</span>
 <span id="L483" class="LineNr">483 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L484" class="LineNr">484 </span>    68/push  <span class="Constant">&quot;F - test-get-num-aborts-on-non-digit-in-Look&quot;</span>/imm32
 <span id="L485" class="LineNr">485 </span>    68/push  2/imm32
 <span id="L486" class="LineNr">486 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L487" class="LineNr">487 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
+<span id="L487" class="LineNr">487 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+4)</span>
 <span id="L488" class="LineNr">488 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L489" class="LineNr">489 </span>    e8/call  check-ints-equal/disp32
+<span id="L489" class="LineNr">489 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L490" class="LineNr">490 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L491" class="LineNr">491 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L491" class="LineNr">491 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L492" class="LineNr">492 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L493" class="LineNr">493 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L493" class="LineNr">493 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L494" class="LineNr">494 </span>    5d/pop-to-EBP
 <span id="L495" class="LineNr">495 </span>    c3/return
 <span id="L496" class="LineNr">496 </span>
@@ -564,90 +560,90 @@ if ('onhashchange' in window) {
 <span id="L498" class="LineNr">498 </span>    <span class="subxH1Comment"># - check that get-num returns all initial digits until it encounters a non-digit</span>
 <span id="L499" class="LineNr">499 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L500" class="LineNr">500 </span>    55/push-EBP
-<span id="L501" class="LineNr">501 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L501" class="LineNr">501 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L502" class="LineNr">502 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L503" class="LineNr">503 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L504" class="LineNr">504 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L505" class="LineNr">505 </span>    68/push  _test-stream/imm32
+<span id="L505" class="LineNr">505 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L506" class="LineNr">506 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L507" class="LineNr">507 </span>    e8/call  clear-stream/disp32
+<span id="L507" class="LineNr">507 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L508" class="LineNr">508 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L509" class="LineNr">509 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L509" class="LineNr">509 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L510" class="LineNr">510 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L511" class="LineNr">511 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L512" class="LineNr">512 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L512" class="LineNr">512 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L513" class="LineNr">513 </span>    05/add-to-EAX  4/imm32
 <span id="L514" class="LineNr">514 </span>    50/push-EAX
 <span id="L515" class="LineNr">515 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L516" class="LineNr">516 </span>    e8/call  clear-stream/disp32
+<span id="L516" class="LineNr">516 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L517" class="LineNr">517 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L518" class="LineNr">518 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L518" class="LineNr">518 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L519" class="LineNr">519 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
 <span id="L520" class="LineNr">520 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L521" class="LineNr">521 </span>    68/push  _test-output-stream/imm32
 <span id="L522" class="LineNr">522 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L523" class="LineNr">523 </span>    e8/call  clear-stream/disp32
+<span id="L523" class="LineNr">523 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L524" class="LineNr">524 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L525" class="LineNr">525 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L525" class="LineNr">525 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L526" class="LineNr">526 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L527" class="LineNr">527 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L528" class="LineNr">528 </span>    68/push  _test-error-stream/imm32
 <span id="L529" class="LineNr">529 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L530" class="LineNr">530 </span>    e8/call  clear-stream/disp32
+<span id="L530" class="LineNr">530 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L531" class="LineNr">531 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L532" class="LineNr">532 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L532" class="LineNr">532 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L533" class="LineNr">533 </span>    <span class="subxComment"># initialize 'in'</span>
 <span id="L534" class="LineNr">534 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;3456 x&quot;)</span>
 <span id="L535" class="LineNr">535 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L536" class="LineNr">536 </span>    68/push  <span class="Constant">&quot;3456&quot;</span>/imm32
-<span id="L537" class="LineNr">537 </span>    68/push  _test-stream/imm32
+<span id="L537" class="LineNr">537 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L538" class="LineNr">538 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L539" class="LineNr">539 </span>    e8/call  write/disp32
+<span id="L539" class="LineNr">539 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L540" class="LineNr">540 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L541" class="LineNr">541 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L541" class="LineNr">541 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L542" class="LineNr">542 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'get-num' below</span>
 <span id="L543" class="LineNr">543 </span>    <span class="subxS1Comment"># . var ed/EAX : (address exit-descriptor)</span>
-<span id="L544" class="LineNr">544 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L545" class="LineNr">545 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L544" class="LineNr">544 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L545" class="LineNr">545 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L546" class="LineNr">546 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 16)</span>
 <span id="L547" class="LineNr">547 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L548" class="LineNr">548 </span>    68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L549" class="LineNr">549 </span>    50/push-EAX/ed
 <span id="L550" class="LineNr">550 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L551" class="LineNr">551 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L551" class="LineNr">551 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L552" class="LineNr">552 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L553" class="LineNr">553 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L553" class="LineNr">553 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L554" class="LineNr">554 </span>    <span class="subxComment"># prime the pump</span>
 <span id="L555" class="LineNr">555 </span>    <span class="subxS1Comment"># . get-char(_test-buffered-file)</span>
 <span id="L556" class="LineNr">556 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L557" class="LineNr">557 </span>    68/push  _test-buffered-file/imm32
+<span id="L557" class="LineNr">557 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L558" class="LineNr">558 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L559" class="LineNr">559 </span>    e8/call  get-char/disp32
 <span id="L560" class="LineNr">560 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L561" class="LineNr">561 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L561" class="LineNr">561 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L562" class="LineNr">562 </span>    <span class="subxComment"># get-num(in, out, err, ed)</span>
 <span id="L563" class="LineNr">563 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L564" class="LineNr">564 </span>    50/push-EAX/ed
 <span id="L565" class="LineNr">565 </span>    68/push  _test-error-stream/imm32
 <span id="L566" class="LineNr">566 </span>    68/push  _test-output-stream/imm32
-<span id="L567" class="LineNr">567 </span>    68/push  _test-buffered-file/imm32
+<span id="L567" class="LineNr">567 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L568" class="LineNr">568 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L569" class="LineNr">569 </span>    e8/call  get-num/disp32
 <span id="L570" class="LineNr">570 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L571" class="LineNr">571 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L572" class="LineNr">572 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L572" class="LineNr">572 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L573" class="LineNr">573 </span>    <span class="subxComment"># check-ints-equal(*_test-output-stream-&gt;data, '3456', msg)</span>
 <span id="L574" class="LineNr">574 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L575" class="LineNr">575 </span>    68/push  <span class="Constant">&quot;F - test-get-num-reads-multiple-digits&quot;</span>/imm32
 <span id="L576" class="LineNr">576 </span>    68/push  0x36353433/imm32
 <span id="L577" class="LineNr">577 </span>    b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L578" class="LineNr">578 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L578" class="LineNr">578 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L579" class="LineNr">579 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L580" class="LineNr">580 </span>    e8/call  check-ints-equal/disp32
+<span id="L580" class="LineNr">580 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L581" class="LineNr">581 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L582" class="LineNr">582 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L582" class="LineNr">582 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L583" class="LineNr">583 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L584" class="LineNr">584 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L584" class="LineNr">584 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L585" class="LineNr">585 </span>    5d/pop-to-EBP
 <span id="L586" class="LineNr">586 </span>    c3/return
 <span id="L587" class="LineNr">587 </span>
@@ -655,90 +651,90 @@ if ('onhashchange' in window) {
 <span id="L589" class="LineNr">589 </span>    <span class="subxH1Comment"># - check that get-num returns all initial digits until it encounters a non-digit</span>
 <span id="L590" class="LineNr">590 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L591" class="LineNr">591 </span>    55/push-EBP
-<span id="L592" class="LineNr">592 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L592" class="LineNr">592 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L593" class="LineNr">593 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L594" class="LineNr">594 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L595" class="LineNr">595 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L596" class="LineNr">596 </span>    68/push  _test-stream/imm32
+<span id="L596" class="LineNr">596 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L597" class="LineNr">597 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L598" class="LineNr">598 </span>    e8/call  clear-stream/disp32
+<span id="L598" class="LineNr">598 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L599" class="LineNr">599 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L600" class="LineNr">600 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L600" class="LineNr">600 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L601" class="LineNr">601 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L602" class="LineNr">602 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L603" class="LineNr">603 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L603" class="LineNr">603 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L604" class="LineNr">604 </span>    05/add-to-EAX  4/imm32
 <span id="L605" class="LineNr">605 </span>    50/push-EAX
 <span id="L606" class="LineNr">606 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L607" class="LineNr">607 </span>    e8/call  clear-stream/disp32
+<span id="L607" class="LineNr">607 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L608" class="LineNr">608 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L609" class="LineNr">609 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L609" class="LineNr">609 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L610" class="LineNr">610 </span>    <span class="subxS1Comment"># . clear-stream(_test-output-stream)</span>
 <span id="L611" class="LineNr">611 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L612" class="LineNr">612 </span>    68/push  _test-output-stream/imm32
 <span id="L613" class="LineNr">613 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L614" class="LineNr">614 </span>    e8/call  clear-stream/disp32
+<span id="L614" class="LineNr">614 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L615" class="LineNr">615 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L616" class="LineNr">616 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L616" class="LineNr">616 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L617" class="LineNr">617 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L618" class="LineNr">618 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L619" class="LineNr">619 </span>    68/push  _test-error-stream/imm32
 <span id="L620" class="LineNr">620 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L621" class="LineNr">621 </span>    e8/call  clear-stream/disp32
+<span id="L621" class="LineNr">621 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L622" class="LineNr">622 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L623" class="LineNr">623 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L623" class="LineNr">623 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L624" class="LineNr">624 </span>    <span class="subxComment"># initialize 'in'</span>
 <span id="L625" class="LineNr">625 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;3456 x&quot;)</span>
 <span id="L626" class="LineNr">626 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L627" class="LineNr">627 </span>    68/push  <span class="Constant">&quot;3456 x&quot;</span>/imm32
-<span id="L628" class="LineNr">628 </span>    68/push  _test-stream/imm32
+<span id="L628" class="LineNr">628 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L629" class="LineNr">629 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L630" class="LineNr">630 </span>    e8/call  write/disp32
+<span id="L630" class="LineNr">630 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L631" class="LineNr">631 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L632" class="LineNr">632 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L632" class="LineNr">632 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L633" class="LineNr">633 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'get-num' below</span>
 <span id="L634" class="LineNr">634 </span>    <span class="subxS1Comment"># . var ed/EAX : (address exit-descriptor)</span>
-<span id="L635" class="LineNr">635 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L636" class="LineNr">636 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L635" class="LineNr">635 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L636" class="LineNr">636 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L637" class="LineNr">637 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 16)</span>
 <span id="L638" class="LineNr">638 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L639" class="LineNr">639 </span>    68/push  0x10/imm32/nbytes-of-args-for-get-num
 <span id="L640" class="LineNr">640 </span>    50/push-EAX/ed
 <span id="L641" class="LineNr">641 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L642" class="LineNr">642 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L642" class="LineNr">642 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L643" class="LineNr">643 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L644" class="LineNr">644 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L644" class="LineNr">644 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L645" class="LineNr">645 </span>    <span class="subxComment"># prime the pump</span>
 <span id="L646" class="LineNr">646 </span>    <span class="subxS1Comment"># . get-char(_test-buffered-file)</span>
 <span id="L647" class="LineNr">647 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L648" class="LineNr">648 </span>    68/push  _test-buffered-file/imm32
+<span id="L648" class="LineNr">648 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L649" class="LineNr">649 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L650" class="LineNr">650 </span>    e8/call  get-char/disp32
 <span id="L651" class="LineNr">651 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L652" class="LineNr">652 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L652" class="LineNr">652 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L653" class="LineNr">653 </span>    <span class="subxComment"># get-num(in, out, err, ed)</span>
 <span id="L654" class="LineNr">654 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L655" class="LineNr">655 </span>    50/push-EAX/ed
 <span id="L656" class="LineNr">656 </span>    68/push  _test-error-stream/imm32
 <span id="L657" class="LineNr">657 </span>    68/push  _test-output-stream/imm32
-<span id="L658" class="LineNr">658 </span>    68/push  _test-buffered-file/imm32
+<span id="L658" class="LineNr">658 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L659" class="LineNr">659 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L660" class="LineNr">660 </span>    e8/call  get-num/disp32
 <span id="L661" class="LineNr">661 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L662" class="LineNr">662 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L663" class="LineNr">663 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L663" class="LineNr">663 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L664" class="LineNr">664 </span>    <span class="subxComment"># check-ints-equal(*_test-output-stream-&gt;data, '3456', msg)</span>
 <span id="L665" class="LineNr">665 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L666" class="LineNr">666 </span>    68/push  <span class="Constant">&quot;F - test-get-num-reads-multiple-digits-followed-by-nondigit&quot;</span>/imm32
 <span id="L667" class="LineNr">667 </span>    68/push  0x36353433/imm32
 <span id="L668" class="LineNr">668 </span>    b8/copy-to-EAX  _test-output-stream/imm32
-<span id="L669" class="LineNr">669 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
+<span id="L669" class="LineNr">669 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+12)</span>
 <span id="L670" class="LineNr">670 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L671" class="LineNr">671 </span>    e8/call  check-ints-equal/disp32
+<span id="L671" class="LineNr">671 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L672" class="LineNr">672 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L673" class="LineNr">673 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L673" class="LineNr">673 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L674" class="LineNr">674 </span>    <span class="subxS1Comment"># . reclaim locals</span>
-<span id="L675" class="LineNr">675 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L675" class="LineNr">675 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L676" class="LineNr">676 </span>    5d/pop-to-EBP
 <span id="L677" class="LineNr">677 </span>    c3/return
 <span id="L678" class="LineNr">678 </span>
@@ -748,48 +744,48 @@ if ('onhashchange' in window) {
 <span id="L682" class="LineNr">682 </span><span class="subxFunction">expected</span>:  <span class="subxComment"># ed : (address exit-descriptor), f : fd or (address stream), s : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L683" class="LineNr">683 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L684" class="LineNr">684 </span>    55/push-EBP
-<span id="L685" class="LineNr">685 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L685" class="LineNr">685 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L686" class="LineNr">686 </span>    <span class="subxComment"># write(f, &quot;Error: &quot;)</span>
 <span id="L687" class="LineNr">687 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L688" class="LineNr">688 </span>    68/push  <span class="Constant">&quot;Error: &quot;</span>/imm32
-<span id="L689" class="LineNr">689 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L689" class="LineNr">689 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L690" class="LineNr">690 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L691" class="LineNr">691 </span>    e8/call  write/disp32
+<span id="L691" class="LineNr">691 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L692" class="LineNr">692 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L693" class="LineNr">693 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L693" class="LineNr">693 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L694" class="LineNr">694 </span>    <span class="subxComment"># write(f, s)</span>
 <span id="L695" class="LineNr">695 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L696" class="LineNr">696 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L697" class="LineNr">697 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L696" class="LineNr">696 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L697" class="LineNr">697 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L698" class="LineNr">698 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L699" class="LineNr">699 </span>    e8/call  write/disp32
+<span id="L699" class="LineNr">699 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L700" class="LineNr">700 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L701" class="LineNr">701 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L701" class="LineNr">701 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L702" class="LineNr">702 </span>    <span class="subxComment"># write(f, &quot; expected&quot;)</span>
 <span id="L703" class="LineNr">703 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L704" class="LineNr">704 </span>    68/push  <span class="Constant">&quot; expected&quot;</span>/imm32
-<span id="L705" class="LineNr">705 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L705" class="LineNr">705 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L706" class="LineNr">706 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L707" class="LineNr">707 </span>    e8/call  write/disp32
+<span id="L707" class="LineNr">707 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L708" class="LineNr">708 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L709" class="LineNr">709 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L709" class="LineNr">709 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L710" class="LineNr">710 </span>    <span class="subxComment"># write(f, Newline)</span>
 <span id="L711" class="LineNr">711 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L712" class="LineNr">712 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L713" class="LineNr">713 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L712" class="LineNr">712 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L713" class="LineNr">713 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L714" class="LineNr">714 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L715" class="LineNr">715 </span>    e8/call  write/disp32
+<span id="L715" class="LineNr">715 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L716" class="LineNr">716 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L717" class="LineNr">717 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L717" class="LineNr">717 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L718" class="LineNr">718 </span>    <span class="subxComment"># stop(ed, 1)</span>
 <span id="L719" class="LineNr">719 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L720" class="LineNr">720 </span>    68/push  1/imm32
-<span id="L721" class="LineNr">721 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L721" class="LineNr">721 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L722" class="LineNr">722 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L723" class="LineNr">723 </span>    e8/call  stop/disp32
+<span id="L723" class="LineNr">723 </span>    e8/call  <a href='057stop.subx.html#L99'>stop</a>/disp32
 <span id="L724" class="LineNr">724 </span>    <span class="subxComment"># should never get past this point</span>
 <span id="L725" class="LineNr">725 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L726" class="LineNr">726 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L726" class="LineNr">726 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L727" class="LineNr">727 </span>    5d/pop-to-EBP
 <span id="L728" class="LineNr">728 </span>    c3/return
 <span id="L729" class="LineNr">729 </span>
@@ -797,42 +793,42 @@ if ('onhashchange' in window) {
 <span id="L731" class="LineNr">731 </span><span class="subxFunction">get-char</span>:  <span class="subxComment"># f : (address buffered-file) -&gt; &lt;void&gt;</span>
 <span id="L732" class="LineNr">732 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L733" class="LineNr">733 </span>    55/push-EBP
-<span id="L734" class="LineNr">734 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L734" class="LineNr">734 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L735" class="LineNr">735 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L736" class="LineNr">736 </span>    50/push-EAX
 <span id="L737" class="LineNr">737 </span>    <span class="subxComment"># read-byte(f)</span>
 <span id="L738" class="LineNr">738 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L739" class="LineNr">739 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L739" class="LineNr">739 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L740" class="LineNr">740 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L741" class="LineNr">741 </span>    e8/call  read-byte/disp32
+<span id="L741" class="LineNr">741 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L742" class="LineNr">742 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L743" class="LineNr">743 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L743" class="LineNr">743 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L744" class="LineNr">744 </span>    <span class="subxComment"># save EAX to Look</span>
-<span id="L745" class="LineNr">745 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *Look</span>
+<span id="L745" class="LineNr">745 </span>    89/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar">Look</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *Look</span>
 <span id="L746" class="LineNr">746 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L747" class="LineNr">747 </span>    58/pop-to-EAX
 <span id="L748" class="LineNr">748 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L749" class="LineNr">749 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L749" class="LineNr">749 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L750" class="LineNr">750 </span>    5d/pop-to-EBP
 <span id="L751" class="LineNr">751 </span>    c3/return
 <span id="L752" class="LineNr">752 </span>
 <span id="L753" class="LineNr">753 </span><span class="subxFunction">is-digit?</span>:  <span class="subxComment"># c : int -&gt; bool/EAX</span>
 <span id="L754" class="LineNr">754 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L755" class="LineNr">755 </span>    55/push-EBP
-<span id="L756" class="LineNr">756 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L756" class="LineNr">756 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L757" class="LineNr">757 </span>    <span class="subxComment"># EAX = false</span>
 <span id="L758" class="LineNr">758 </span>    b8/copy-to-EAX  0/imm32
 <span id="L759" class="LineNr">759 </span>    <span class="subxComment"># if c &lt; '0' return false</span>
-<span id="L760" class="LineNr">760 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x30/imm32        <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L760" class="LineNr">760 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x30/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L761" class="LineNr">761 </span>    7c/jump-if-lesser  $is-digit?:end/disp8
 <span id="L762" class="LineNr">762 </span>    <span class="subxComment"># if c &gt; '9' return false</span>
-<span id="L763" class="LineNr">763 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         0x39/imm32        <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L763" class="LineNr">763 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         0x39/imm32        <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L764" class="LineNr">764 </span>    7f/jump-if-greater  $is-digit?:end/disp8
 <span id="L765" class="LineNr">765 </span>    <span class="subxComment"># otherwise return true</span>
 <span id="L766" class="LineNr">766 </span>    b8/copy-to-EAX  1/imm32
 <span id="L767" class="LineNr">767 </span><span class="Constant">$is-digit?:end</span>:
 <span id="L768" class="LineNr">768 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L769" class="LineNr">769 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L769" class="LineNr">769 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L770" class="LineNr">770 </span>    5d/pop-to-EBP
 <span id="L771" class="LineNr">771 </span>    c3/return
 <span id="L772" class="LineNr">772 </span>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index 026db18a..39715397 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.Constant { color: #008787; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxTest { color: #5f8700; }
-.SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -86,25 +81,25 @@ if ('onhashchange' in window) {
 <span id="L21" class="LineNr"> 21 </span>
 <span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
 <span id="L23" class="LineNr"> 23 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L24" class="LineNr"> 24 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L24" class="LineNr"> 24 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L25" class="LineNr"> 25 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot; then return run_tests()</span>
 <span id="L26" class="LineNr"> 26 </span>    <span class="subxS1Comment"># . argc &gt; 1</span>
-<span id="L27" class="LineNr"> 27 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
+<span id="L27" class="LineNr"> 27 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L28" class="LineNr"> 28 </span>    7e/jump-if-lesser-or-equal  $run-main/disp8
 <span id="L29" class="LineNr"> 29 </span>    <span class="subxS1Comment"># . argv[1] == &quot;test&quot;</span>
 <span id="L30" class="LineNr"> 30 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L31" class="LineNr"> 31 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L32" class="LineNr"> 32 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L32" class="LineNr"> 32 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L33" class="LineNr"> 33 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L34" class="LineNr"> 34 </span>    e8/call  kernel-string-equal/disp32
+<span id="L34" class="LineNr"> 34 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L36" class="LineNr"> 36 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L36" class="LineNr"> 36 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L37" class="LineNr"> 37 </span>    <span class="subxS1Comment"># . check result</span>
 <span id="L38" class="LineNr"> 38 </span>    3d/compare-EAX  1/imm32
 <span id="L39" class="LineNr"> 39 </span>    75/jump-if-not-equal  $run-main/disp8
 <span id="L40" class="LineNr"> 40 </span>    <span class="subxS1Comment"># . run-tests()</span>
 <span id="L41" class="LineNr"> 41 </span>    e8/call  run-tests/disp32
-<span id="L42" class="LineNr"> 42 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EAX</span>
+<span id="L42" class="LineNr"> 42 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EAX</span>
 <span id="L43" class="LineNr"> 43 </span>    eb/jump  $main:end/disp8  <span class="subxComment"># where EAX will get copied to EBX</span>
 <span id="L44" class="LineNr"> 44 </span>    <span class="subxH1Comment"># - otherwise return factorial(5)</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Constant">$run-main</span>:
@@ -113,40 +108,40 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr"> 48 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L49" class="LineNr"> 49 </span>    e8/call  factorial/disp32
 <span id="L50" class="LineNr"> 50 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L51" class="LineNr"> 51 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L52" class="LineNr"> 52 </span><span class="Constant">$main:end</span>:
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
-<span id="L55" class="LineNr"> 55 </span>    b8/copy-to-EAX  1/imm32
+<span id="L54" class="LineNr"> 54 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L55" class="LineNr"> 55 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L56" class="LineNr"> 56 </span>    cd/syscall  0x80/imm8
 <span id="L57" class="LineNr"> 57 </span>
 <span id="L58" class="LineNr"> 58 </span><span class="subxFunction">factorial</span>:  <span class="subxComment"># n : int -&gt; int/EAX</span>
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L60" class="LineNr"> 60 </span>    55/push-EBP
-<span id="L61" class="LineNr"> 61 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L61" class="LineNr"> 61 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L62" class="LineNr"> 62 </span>    53/push-EBX
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># EAX = 1 (base case)</span>
 <span id="L64" class="LineNr"> 64 </span>    b8/copy-to-EAX  1/imm32
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># if (n &lt;= 1) return</span>
-<span id="L66" class="LineNr"> 66 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8         1/imm32           <span class="subxComment"># compare *(EBP+8)</span>
+<span id="L66" class="LineNr"> 66 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8         1/imm32           <span class="subxComment"># compare *(EBP+8)</span>
 <span id="L67" class="LineNr"> 67 </span>    7e/jump-if-&lt;=  $factorial:end/disp8
 <span id="L68" class="LineNr"> 68 </span>    <span class="subxComment"># EBX = n-1</span>
-<span id="L69" class="LineNr"> 69 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none              3/r32/EBX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
-<span id="L70" class="LineNr"> 70 </span>    81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              1/imm32           <span class="subxComment"># subtract from EBX</span>
+<span id="L69" class="LineNr"> 69 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                        3/r32/EBX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EBX</span>
+<span id="L70" class="LineNr"> 70 </span>    81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              1/imm32           <span class="subxComment"># subtract from EBX</span>
 <span id="L71" class="LineNr"> 71 </span>    <span class="subxComment"># EAX = factorial(n-1)</span>
 <span id="L72" class="LineNr"> 72 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L73" class="LineNr"> 73 </span>    53/push-EBX
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L75" class="LineNr"> 75 </span>    e8/call  factorial/disp32
 <span id="L76" class="LineNr"> 76 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L77" class="LineNr"> 77 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L77" class="LineNr"> 77 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L78" class="LineNr"> 78 </span>    <span class="subxComment"># return n * factorial(n-1)</span>
-<span id="L79" class="LineNr"> 79 </span>    f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none                          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># multiply *(EBP+8) into EAX</span>
+<span id="L79" class="LineNr"> 79 </span>    f7          4/subop/multiply    1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>                                    8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># multiply *(EBP+8) into EAX</span>
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># TODO: check for overflow</span>
 <span id="L81" class="LineNr"> 81 </span><span class="Constant">$factorial:end</span>:
 <span id="L82" class="LineNr"> 82 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L83" class="LineNr"> 83 </span>    5b/pop-to-EBX
-<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L85" class="LineNr"> 85 </span>    5d/pop-to-EBP
 <span id="L86" class="LineNr"> 86 </span>    c3/return
 <span id="L87" class="LineNr"> 87 </span>
@@ -157,16 +152,16 @@ if ('onhashchange' in window) {
 <span id="L92" class="LineNr"> 92 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L93" class="LineNr"> 93 </span>    e8/call  factorial/disp32
 <span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L95" class="LineNr"> 95 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L95" class="LineNr"> 95 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L96" class="LineNr"> 96 </span>    <span class="subxComment"># check-ints-equal(EAX, 120, msg)</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L98" class="LineNr"> 98 </span>    68/push  <span class="Constant">&quot;F - test-factorial&quot;</span>/imm32
 <span id="L99" class="LineNr"> 99 </span>    68/push  0x78/imm32/expected-120
 <span id="L100" class="LineNr">100 </span>    50/push-EAX
 <span id="L101" class="LineNr">101 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L102" class="LineNr">102 </span>    e8/call  check-ints-equal/disp32
+<span id="L102" class="LineNr">102 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L104" class="LineNr">104 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L104" class="LineNr">104 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L105" class="LineNr">105 </span>    <span class="subxComment"># end</span>
 <span id="L106" class="LineNr">106 </span>    c3/return
 <span id="L107" class="LineNr">107 </span>
diff --git a/html/subx/apps/handle.subx.html b/html/subx/apps/handle.subx.html
new file mode 100644
index 00000000..f69c2d1a
--- /dev/null
+++ b/html/subx/apps/handle.subx.html
@@ -0,0 +1,275 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=UTF-8">
+<title>Mu - subx/apps/handle.subx</title>
+<meta name="Generator" content="Vim/8.0">
+<meta name="plugin-version" content="vim7.4_v2">
+<meta name="syntax" content="none">
+<meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
+<meta name="colorscheme" content="minimal-light">
+<style type="text/css">
+<!--
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+* { font-size:12pt; font-size: 1em; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
+.subxFunction { color: #af5f00; text-decoration: underline; }
+.subxTest { color: #5f8700; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
+-->
+</style>
+
+<script type='text/javascript'>
+<!--
+
+/* function to open any folds containing a jumped-to line before jumping to it */
+function JumpToLine()
+{
+  var lineNum;
+  lineNum = window.location.hash;
+  lineNum = lineNum.substr(1); /* strip off '#' */
+
+  if (lineNum.indexOf('L') == -1) {
+    lineNum = 'L'+lineNum;
+  }
+  lineElem = document.getElementById(lineNum);
+  /* Always jump to new location even if the line was hidden inside a fold, or
+   * we corrected the raw number to a line ID.
+   */
+  if (lineElem) {
+    lineElem.scrollIntoView(true);
+  }
+  return true;
+}
+if ('onhashchange' in window) {
+  window.onhashchange = JumpToLine;
+}
+
+-->
+</script>
+</head>
+<body onload='JumpToLine();'>
+<a href='https://github.com/akkartik/mu/blob/master/subx/apps/handle.subx'>https://github.com/akkartik/mu/blob/master/subx/apps/handle.subx</a>
+<pre id='vimCodeElement'>
+<span id="L1" class="LineNr">  1 </span><span class="subxComment"># A sketch of Mu-style handles or kinda-safe pointers, that add a modicum of</span>
+<span id="L2" class="LineNr">  2 </span><span class="subxComment"># checking to dynamically allocated memory.</span>
+<span id="L3" class="LineNr">  3 </span><span class="subxComment">#</span>
+<span id="L4" class="LineNr">  4 </span><span class="subxComment"># This approach avoids using 'allocate' directly in favor of two primitives:</span>
+<span id="L5" class="LineNr">  5 </span><span class="subxComment">#   - 'new', which allocates some space (the 'payload'), stores the address</span>
+<span id="L6" class="LineNr">  6 </span><span class="subxComment">#     along with an opaque 'alloc id' in a 'handle', and prepends the same</span>
+<span id="L7" class="LineNr">  7 </span><span class="subxComment">#     alloc id to the payload.</span>
+<span id="L8" class="LineNr">  8 </span><span class="subxComment">#   - 'lookup', which checks that the alloc id at the start of a handle matches</span>
+<span id="L9" class="LineNr">  9 </span><span class="subxComment">#     the alloc id at the start of the payload before returning the address.</span>
+<span id="L10" class="LineNr"> 10 </span><span class="subxComment">#</span>
+<span id="L11" class="LineNr"> 11 </span><span class="subxComment"># Layout of a handle:</span>
+<span id="L12" class="LineNr"> 12 </span><span class="subxComment">#   offset 0: alloc id</span>
+<span id="L13" class="LineNr"> 13 </span><span class="subxComment">#   offset 4: address</span>
+<span id="L14" class="LineNr"> 14 </span>
+<span id="L15" class="LineNr"> 15 </span>== code
+<span id="L16" class="LineNr"> 16 </span><span class="subxComment">#   instruction                     effective address                                                   register    displacement    immediate</span>
+<span id="L17" class="LineNr"> 17 </span><span class="subxS1Comment"># . op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L18" class="LineNr"> 18 </span><span class="subxS1Comment"># . 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="L19" class="LineNr"> 19 </span>
+<span id="L20" class="LineNr"> 20 </span><span class="subxComment"># main:</span>
+<span id="L21" class="LineNr"> 21 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
+<span id="L22" class="LineNr"> 22 </span>    <span class="subxComment"># syscall(exit, Num-test-failures)</span>
+<span id="L23" class="LineNr"> 23 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</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><span class="subxFunction">new</span>:  <span class="subxComment"># ad : (address allocation-descriptor), n : int, out : (address handle)</span>
+<span id="L28" class="LineNr"> 28 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L29" class="LineNr"> 29 </span>    55/push-EBP
+<span id="L30" class="LineNr"> 30 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L31" class="LineNr"> 31 </span>    <span class="subxS1Comment"># . save registers</span>
+<span id="L32" class="LineNr"> 32 </span>    50/push-EAX
+<span id="L33" class="LineNr"> 33 </span>    51/push-ECX
+<span id="L34" class="LineNr"> 34 </span>    52/push-EDX
+<span id="L35" class="LineNr"> 35 </span>    <span class="subxComment"># ECX = n+4</span>
+<span id="L36" class="LineNr"> 36 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ECX</span>
+<span id="L37" class="LineNr"> 37 </span>    81          0/subop/add         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
+<span id="L38" class="LineNr"> 38 </span>    <span class="subxComment"># EAX = allocate(ad, ECX)</span>
+<span id="L39" class="LineNr"> 39 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L40" class="LineNr"> 40 </span>    51/push-ECX
+<span id="L41" class="LineNr"> 41 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L42" class="LineNr"> 42 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L43" class="LineNr"> 43 </span>    e8/call  <a href='066allocate.subx.html#L41'>allocate</a>/disp32
+<span id="L44" class="LineNr"> 44 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L45" class="LineNr"> 45 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L46" class="LineNr"> 46 </span>    <span class="subxComment"># EDX = out</span>
+<span id="L47" class="LineNr"> 47 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+16) to EDX</span>
+<span id="L48" class="LineNr"> 48 </span>    <span class="subxComment"># out-&gt;address = EAX</span>
+<span id="L49" class="LineNr"> 49 </span>    89/copy                         1/mod/*+disp8   2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *(EDX+4)</span>
+<span id="L50" class="LineNr"> 50 </span>    <span class="subxComment"># if (EAX == 0) out-&gt;alloc_id = 0, return</span>
+<span id="L51" class="LineNr"> 51 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L52" class="LineNr"> 52 </span>    75/jump-if-not-equal  $new:continue/disp8
+<span id="L53" class="LineNr"> 53 </span>    c7          0/subop/copy        0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EDX</span>
+<span id="L54" class="LineNr"> 54 </span>    eb/jump  $new:end/disp8
+<span id="L55" class="LineNr"> 55 </span><span class="Constant">$new:continue</span>:
+<span id="L56" class="LineNr"> 56 </span>    <span class="subxComment"># otherwise:</span>
+<span id="L57" class="LineNr"> 57 </span>    <span class="subxComment"># ECX = *Next-alloc-id</span>
+<span id="L58" class="LineNr"> 58 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   <span class="SpecialChar">Next-alloc-id</span>/disp32              <span class="subxComment"># copy *Next-alloc-id to ECX</span>
+<span id="L59" class="LineNr"> 59 </span>    <span class="subxComment"># *EAX = *Next-alloc-id/ECX</span>
+<span id="L60" class="LineNr"> 60 </span>    89/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EAX</span>
+<span id="L61" class="LineNr"> 61 </span>    <span class="subxComment"># out-&gt;alloc_id = *Next-alloc-id</span>
+<span id="L62" class="LineNr"> 62 </span>    89/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ECX to *EDX</span>
+<span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># increment *Next-alloc-id</span>
+<span id="L64" class="LineNr"> 64 </span>    ff          0/subop/increment   0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Next-alloc-id</span>/disp32              <span class="subxComment"># increment *Next-alloc-id</span>
+<span id="L65" class="LineNr"> 65 </span><span class="Constant">$new:end</span>:
+<span id="L66" class="LineNr"> 66 </span>    <span class="subxS1Comment"># . restore registers</span>
+<span id="L67" class="LineNr"> 67 </span>    5a/pop-to-EDX
+<span id="L68" class="LineNr"> 68 </span>    59/pop-to-ECX
+<span id="L69" class="LineNr"> 69 </span>    58/pop-to-EAX
+<span id="L70" class="LineNr"> 70 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L71" class="LineNr"> 71 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L72" class="LineNr"> 72 </span>    5d/pop-to-EBP
+<span id="L73" class="LineNr"> 73 </span>    c3/return
+<span id="L74" class="LineNr"> 74 </span>
+<span id="L75" class="LineNr"> 75 </span><span class="subxTest">test-new</span>:  <span class="subxH1Comment"># - this test uses the bottom of the stack segment as scratch space</span>
+<span id="L76" class="LineNr"> 76 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L77" class="LineNr"> 77 </span>    55/push-EBP
+<span id="L78" class="LineNr"> 78 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="subxComment"># *Next-alloc-id = 0x34</span>
+<span id="L80" class="LineNr"> 80 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>    <span class="SpecialChar">Next-alloc-id</span>/disp32  0x34/imm32        <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L81" class="LineNr"> 81 </span>    <span class="subxComment"># var ad/EAX : (address allocation-descriptor) = {0x0b000000, 0x0b00000a}</span>
+<span id="L82" class="LineNr"> 82 </span>    68/push  0x0b00000a/imm32/limit
+<span id="L83" class="LineNr"> 83 </span>    68/push  0x0b000000/imm32/curr
+<span id="L84" class="LineNr"> 84 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L85" class="LineNr"> 85 </span>    <span class="subxComment"># var handle/ECX = {0, 0}</span>
+<span id="L86" class="LineNr"> 86 </span>    68/push  0/imm32/address
+<span id="L87" class="LineNr"> 87 </span>    68/push  0/imm32/alloc-id
+<span id="L88" class="LineNr"> 88 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L89" class="LineNr"> 89 </span>    <span class="subxComment"># new(ad, 2, handle/ECX)</span>
+<span id="L90" class="LineNr"> 90 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L91" class="LineNr"> 91 </span>    51/push-ECX
+<span id="L92" class="LineNr"> 92 </span>    68/push  2/imm32/size
+<span id="L93" class="LineNr"> 93 </span>    50/push-EAX
+<span id="L94" class="LineNr"> 94 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L95" class="LineNr"> 95 </span>    e8/call  new/disp32
+<span id="L96" class="LineNr"> 96 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L97" class="LineNr"> 97 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L98" class="LineNr"> 98 </span>    <span class="subxComment"># check-ints-equal(handle-&gt;alloc_id, 0x34, msg)</span>
+<span id="L99" class="LineNr"> 99 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L100" class="LineNr">100 </span>    68/push  <span class="Constant">&quot;F - test-new: alloc id of handle&quot;</span>/imm32
+<span id="L101" class="LineNr">101 </span>    68/push  0x34/imm32
+<span id="L102" class="LineNr">102 </span>    ff          6/subop/push        0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ECX</span>
+<span id="L103" class="LineNr">103 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L104" class="LineNr">104 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L105" class="LineNr">105 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L106" class="LineNr">106 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L107" class="LineNr">107 </span>    <span class="subxComment"># check-ints-equal(handle-&gt;address, 0x0b000000, msg)</span>
+<span id="L108" class="LineNr">108 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L109" class="LineNr">109 </span>    68/push  <span class="Constant">&quot;F - test-new: address of handle&quot;</span>/imm32
+<span id="L110" class="LineNr">110 </span>    68/push  0x0b000000/imm32
+<span id="L111" class="LineNr">111 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L112" class="LineNr">112 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L113" class="LineNr">113 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L114" class="LineNr">114 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L115" class="LineNr">115 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L116" class="LineNr">116 </span>    <span class="subxComment"># check-ints-equal(*handle-&gt;address, 0x34, msg)</span>
+<span id="L117" class="LineNr">117 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L118" class="LineNr">118 </span>    68/push  <span class="Constant">&quot;F - test-new: alloc id of payload&quot;</span>/imm32
+<span id="L119" class="LineNr">119 </span>    68/push  0x34/imm32
+<span id="L120" class="LineNr">120 </span>    8b/copy                         1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ECX+4) to EDX</span>
+<span id="L121" class="LineNr">121 </span>    ff          6/subop/push        0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *EDX</span>
+<span id="L122" class="LineNr">122 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L123" class="LineNr">123 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L124" class="LineNr">124 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L125" class="LineNr">125 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L126" class="LineNr">126 </span>    <span class="subxComment"># check-ints-equal(*Next-alloc-id, 0x35)</span>
+<span id="L127" class="LineNr">127 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L128" class="LineNr">128 </span>    68/push  <span class="Constant">&quot;F - test-new: next alloc id&quot;</span>/imm32
+<span id="L129" class="LineNr">129 </span>    68/push  0x35/imm32
+<span id="L130" class="LineNr">130 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Next-alloc-id</span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L131" class="LineNr">131 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L132" class="LineNr">132 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L133" class="LineNr">133 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L134" class="LineNr">134 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L135" class="LineNr">135 </span>    <span class="subxComment"># clean up</span>
+<span id="L136" class="LineNr">136 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
+<span id="L137" class="LineNr">137 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              1/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L138" class="LineNr">138 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L139" class="LineNr">139 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L140" class="LineNr">140 </span>    5d/pop-to-EBP
+<span id="L141" class="LineNr">141 </span>    c3/return
+<span id="L142" class="LineNr">142 </span>
+<span id="L143" class="LineNr">143 </span><span class="subxTest">test-new-failure</span>:
+<span id="L144" class="LineNr">144 </span>    <span class="subxS1Comment"># . prolog</span>
+<span id="L145" class="LineNr">145 </span>    55/push-EBP
+<span id="L146" class="LineNr">146 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L147" class="LineNr">147 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 0x34</span>
+<span id="L148" class="LineNr">148 </span>    c7          0/subop/copy        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Next-alloc-id</span>/disp32  0x34/imm32  <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L149" class="LineNr">149 </span>    <span class="subxComment"># define an allocation-descriptor with no space left</span>
+<span id="L150" class="LineNr">150 </span>    <span class="subxS1Comment"># . var ad/EAX : (address allocation-descriptor) = {0x10, 0x10}</span>
+<span id="L151" class="LineNr">151 </span>    68/push  0x10/imm32/limit
+<span id="L152" class="LineNr">152 </span>    68/push  0x10/imm32/curr
+<span id="L153" class="LineNr">153 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L154" class="LineNr">154 </span>    <span class="subxS1Comment"># . var handle/ECX = {random, random}</span>
+<span id="L155" class="LineNr">155 </span>    68/push  1234/imm32/address
+<span id="L156" class="LineNr">156 </span>    68/push  5678/imm32/alloc-id
+<span id="L157" class="LineNr">157 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L158" class="LineNr">158 </span>    <span class="subxComment"># try to allocate</span>
+<span id="L159" class="LineNr">159 </span>    <span class="subxS1Comment"># . new(ad, 2, handle/ECX)</span>
+<span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L161" class="LineNr">161 </span>    51/push-ECX
+<span id="L162" class="LineNr">162 </span>    68/push  2/imm32/size
+<span id="L163" class="LineNr">163 </span>    50/push-EAX
+<span id="L164" class="LineNr">164 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L165" class="LineNr">165 </span>    e8/call  new/disp32
+<span id="L166" class="LineNr">166 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L167" class="LineNr">167 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L168" class="LineNr">168 </span>    <span class="subxComment"># handle should be cleared</span>
+<span id="L169" class="LineNr">169 </span>    <span class="subxS1Comment"># . check-ints-equal(handle-&gt;alloc_id, 0, msg)</span>
+<span id="L170" class="LineNr">170 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L171" class="LineNr">171 </span>    68/push  <span class="Constant">&quot;F - test-new-failure: alloc id of handle&quot;</span>/imm32
+<span id="L172" class="LineNr">172 </span>    68/push  0/imm32
+<span id="L173" class="LineNr">173 </span>    ff          6/subop/push        0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># push *ECX</span>
+<span id="L174" class="LineNr">174 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L175" class="LineNr">175 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L176" class="LineNr">176 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L177" class="LineNr">177 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L178" class="LineNr">178 </span>    <span class="subxS1Comment"># . check-ints-equal(handle-&gt;address, 0, msg)</span>
+<span id="L179" class="LineNr">179 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L180" class="LineNr">180 </span>    68/push  <span class="Constant">&quot;F - test-new-failure: address of handle&quot;</span>/imm32
+<span id="L181" class="LineNr">181 </span>    68/push  0/imm32
+<span id="L182" class="LineNr">182 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L184" class="LineNr">184 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L185" class="LineNr">185 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L186" class="LineNr">186 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L187" class="LineNr">187 </span>    <span class="subxComment"># Next-alloc-id should be unmodified</span>
+<span id="L188" class="LineNr">188 </span>    <span class="subxS1Comment"># . check-ints-equal(*Next-alloc-id, 0x34)</span>
+<span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . push args</span>
+<span id="L190" class="LineNr">190 </span>    68/push  <span class="Constant">&quot;F - test-new-failure: next alloc id&quot;</span>/imm32
+<span id="L191" class="LineNr">191 </span>    68/push  0x34/imm32
+<span id="L192" class="LineNr">192 </span>    ff          6/subop/push        0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          <span class="SpecialChar">Next-alloc-id</span>/disp32              <span class="subxComment"># copy to *Next-alloc-id</span>
+<span id="L193" class="LineNr">193 </span>    <span class="subxS2Comment"># . . call</span>
+<span id="L194" class="LineNr">194 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
+<span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . discard args</span>
+<span id="L196" class="LineNr">196 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L197" class="LineNr">197 </span>    <span class="subxComment"># clean up</span>
+<span id="L198" class="LineNr">198 </span>    <span class="subxS1Comment"># . *Next-alloc-id = 1</span>
+<span id="L199" class="LineNr">199 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              1/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L200" class="LineNr">200 </span>    <span class="subxS1Comment"># . epilog</span>
+<span id="L201" class="LineNr">201 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L202" class="LineNr">202 </span>    5d/pop-to-EBP
+<span id="L203" class="LineNr">203 </span>    c3/return
+<span id="L204" class="LineNr">204 </span>
+<span id="L205" class="LineNr">205 </span>== data
+<span id="L206" class="LineNr">206 </span>
+<span id="L207" class="LineNr">207 </span><span class="subxComment"># Monotonically increasing counter for calls to 'new'</span>
+<span id="L208" class="LineNr">208 </span><span class="SpecialChar">Next-alloc-id</span>:
+<span id="L209" class="LineNr">209 </span>    01 00 00 00  <span class="subxComment"># 1</span>
+<span id="L210" class="LineNr">210 </span>
+<span id="L211" class="LineNr">211 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
+</pre>
+</body>
+</html>
+<!-- vim: set foldmethod=manual : -->
diff --git a/html/subx/apps/hex.subx.html b/html/subx/apps/hex.subx.html
index 43714f63..11b7ac78 100644
--- a/html/subx/apps/hex.subx.html
+++ b/html/subx/apps/hex.subx.html
@@ -7,28 +7,24 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.CommentedCode { color: #8a8a8a; }
+.Constant { color: #008787; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxMinorFunction { color: #875f5f; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 .subxTest { color: #5f8700; }
 .SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -90,19 +86,19 @@ if ('onhashchange' in window) {
 <span id="L24" class="LineNr">  24 </span>
 <span id="L25" class="LineNr">  25 </span><span class="subxComment"># main: run tests if necessary, convert stdin if not</span>
 <span id="L26" class="LineNr">  26 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L27" class="LineNr">  27 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L27" class="LineNr">  27 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L28" class="LineNr">  28 </span>    <span class="subxH1Comment"># - if argc &gt; 1 and argv[1] == &quot;test&quot; then return run_tests()</span>
 <span id="L29" class="LineNr">  29 </span>    <span class="subxS1Comment"># . argc &gt; 1</span>
-<span id="L30" class="LineNr">  30 </span>    81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
+<span id="L30" class="LineNr">  30 </span>    81          7/subop/compare     1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0/disp8         1/imm32           <span class="subxComment"># compare *EBP</span>
 <span id="L31" class="LineNr">  31 </span>    7e/jump-if-lesser-or-equal  $run-main/disp8
 <span id="L32" class="LineNr">  32 </span>    <span class="subxS1Comment"># . argv[1] == &quot;test&quot;</span>
 <span id="L33" class="LineNr">  33 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L34" class="LineNr">  34 </span>    68/push  <span class="Constant">&quot;test&quot;</span>/imm32
-<span id="L35" class="LineNr">  35 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L35" class="LineNr">  35 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L36" class="LineNr">  36 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L37" class="LineNr">  37 </span>    e8/call  kernel-string-equal/disp32
+<span id="L37" class="LineNr">  37 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L38" class="LineNr">  38 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L39" class="LineNr">  39 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L39" class="LineNr">  39 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L40" class="LineNr">  40 </span>    <span class="subxS1Comment"># . check result</span>
 <span id="L41" class="LineNr">  41 </span>    3d/compare-EAX  1/imm32
 <span id="L42" class="LineNr">  42 </span>    75/jump-if-not-equal  $run-main/disp8
@@ -114,26 +110,26 @@ if ('onhashchange' in window) {
 <span id="L48" class="LineNr">  48 </span><span class="CommentedCode">#?     e8/call test-scan-next-byte-aborts-on-invalid-byte/disp32</span>
 <span id="L49" class="LineNr">  49 </span><span class="CommentedCode">#?     e8/call test-convert-next-octet/disp32</span>
 <span id="L50" class="LineNr">  50 </span>    e8/call  run-tests/disp32
-<span id="L51" class="LineNr">  51 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX   <span class="SpecialChar">Num-test-failures</span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
+<span id="L51" class="LineNr">  51 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   <span class="SpecialChar"><a href='051test.subx.html#L87'>Num-test-failures</a></span>/disp32          <span class="subxComment"># copy *Num-test-failures to EBX</span>
 <span id="L52" class="LineNr">  52 </span>    eb/jump  $main:end/disp8
 <span id="L53" class="LineNr">  53 </span><span class="Constant">$run-main</span>:
 <span id="L54" class="LineNr">  54 </span>    <span class="subxH1Comment"># - otherwise convert stdin</span>
 <span id="L55" class="LineNr">  55 </span>    <span class="subxComment"># var ed/EAX : exit-descriptor</span>
-<span id="L56" class="LineNr">  56 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L57" class="LineNr">  57 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
+<span id="L56" class="LineNr">  56 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L57" class="LineNr">  57 </span>    89/copy                         3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EAX</span>
 <span id="L58" class="LineNr">  58 </span>    <span class="subxComment"># configure ed to really exit()</span>
 <span id="L59" class="LineNr">  59 </span>    <span class="subxS1Comment"># . ed-&gt;target = 0</span>
-<span id="L60" class="LineNr">  60 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
+<span id="L60" class="LineNr">  60 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># copy to *EAX</span>
 <span id="L61" class="LineNr">  61 </span>    <span class="subxComment"># return convert(Stdin, 1/stdout, 2/stderr, ed)</span>
 <span id="L62" class="LineNr">  62 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L63" class="LineNr">  63 </span>    50/push-EAX/ed
-<span id="L64" class="LineNr">  64 </span>    68/push  <span class="SpecialChar">Stderr</span>/imm32
-<span id="L65" class="LineNr">  65 </span>    68/push  <span class="SpecialChar">Stdout</span>/imm32
-<span id="L66" class="LineNr">  66 </span>    68/push  <span class="SpecialChar">Stdin</span>/imm32
+<span id="L64" class="LineNr">  64 </span>    68/push  <span class="SpecialChar"><a href='065error-byte.subx.html#L97'>Stderr</a></span>/imm32
+<span id="L65" class="LineNr">  65 </span>    68/push  <span class="SpecialChar"><a href='062write-byte.subx.html#L10'>Stdout</a></span>/imm32
+<span id="L66" class="LineNr">  66 </span>    68/push  <span class="SpecialChar"><a href='059read-byte.subx.html#L14'>Stdin</a></span>/imm32
 <span id="L67" class="LineNr">  67 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L68" class="LineNr">  68 </span>    e8/call  convert/disp32
 <span id="L69" class="LineNr">  69 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L70" class="LineNr">  70 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
+<span id="L70" class="LineNr">  70 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x10/imm32        <span class="subxComment"># add to ESP</span>
 <span id="L71" class="LineNr">  71 </span>    <span class="subxS1Comment"># . syscall(exit, 0)</span>
 <span id="L72" class="LineNr">  72 </span>    bb/copy-to-EBX  0/imm32
 <span id="L73" class="LineNr">  73 </span><span class="Constant">$main:end</span>:
@@ -151,45 +147,45 @@ if ('onhashchange' in window) {
 <span id="L85" class="LineNr">  85 </span>    <span class="subxComment">#</span>
 <span id="L86" class="LineNr">  86 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L87" class="LineNr">  87 </span>    55/push-EBP
-<span id="L88" class="LineNr">  88 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L88" class="LineNr">  88 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L89" class="LineNr">  89 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L90" class="LineNr">  90 </span>    50/push-EAX
 <span id="L91" class="LineNr">  91 </span><span class="Constant">$convert:loop</span>:
 <span id="L92" class="LineNr">  92 </span>    <span class="subxComment"># EAX = convert-next-octet(in, err, ed)</span>
 <span id="L93" class="LineNr">  93 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L94" class="LineNr">  94 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x14/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
-<span id="L95" class="LineNr">  95 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L96" class="LineNr">  96 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L94" class="LineNr">  94 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x14/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+20)</span>
+<span id="L95" class="LineNr">  95 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L96" class="LineNr">  96 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L97" class="LineNr">  97 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L98" class="LineNr">  98 </span>    e8/call  convert-next-octet/disp32
 <span id="L99" class="LineNr">  99 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L100" class="LineNr"> 100 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L100" class="LineNr"> 100 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L101" class="LineNr"> 101 </span>    <span class="subxComment"># if EAX == 0xffffffff break</span>
-<span id="L102" class="LineNr"> 102 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
+<span id="L102" class="LineNr"> 102 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
 <span id="L103" class="LineNr"> 103 </span>    74/jump-if-equal  $convert:loop-end/disp8
 <span id="L104" class="LineNr"> 104 </span>    <span class="subxComment"># write-byte(out, AL)</span>
 <span id="L105" class="LineNr"> 105 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L106" class="LineNr"> 106 </span>    50/push-EAX
-<span id="L107" class="LineNr"> 107 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L107" class="LineNr"> 107 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L108" class="LineNr"> 108 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L109" class="LineNr"> 109 </span>    e8/call  write-byte/disp32
+<span id="L109" class="LineNr"> 109 </span>    e8/call  <a href='062write-byte.subx.html#L38'>write-byte</a>/disp32
 <span id="L110" class="LineNr"> 110 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L111" class="LineNr"> 111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L111" class="LineNr"> 111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L112" class="LineNr"> 112 </span>    <span class="subxComment"># loop</span>
 <span id="L113" class="LineNr"> 113 </span>    eb/jump  $convert:loop/disp8
 <span id="L114" class="LineNr"> 114 </span><span class="Constant">$convert:loop-end</span>:
 <span id="L115" class="LineNr"> 115 </span>    <span class="subxComment"># flush(out)</span>
 <span id="L116" class="LineNr"> 116 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L117" class="LineNr"> 117 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L117" class="LineNr"> 117 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L118" class="LineNr"> 118 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L119" class="LineNr"> 119 </span>    e8/call  flush/disp32
+<span id="L119" class="LineNr"> 119 </span>    e8/call  <a href='062write-byte.subx.html#L84'>flush</a>/disp32
 <span id="L120" class="LineNr"> 120 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L121" class="LineNr"> 121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L121" class="LineNr"> 121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L122" class="LineNr"> 122 </span><span class="Constant">$convert:end</span>:
 <span id="L123" class="LineNr"> 123 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L124" class="LineNr"> 124 </span>    58/pop-to-EAX
 <span id="L125" class="LineNr"> 125 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L126" class="LineNr"> 126 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L126" class="LineNr"> 126 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L127" class="LineNr"> 127 </span>    5d/pop-to-EBP
 <span id="L128" class="LineNr"> 128 </span>    c3/return
 <span id="L129" class="LineNr"> 129 </span>
@@ -212,58 +208,58 @@ if ('onhashchange' in window) {
 <span id="L146" class="LineNr"> 146 </span>    <span class="subxComment">#</span>
 <span id="L147" class="LineNr"> 147 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L148" class="LineNr"> 148 </span>    55/push-EBP
-<span id="L149" class="LineNr"> 149 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L149" class="LineNr"> 149 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L150" class="LineNr"> 150 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L151" class="LineNr"> 151 </span>    51/push-ECX
 <span id="L152" class="LineNr"> 152 </span>    <span class="subxComment"># EAX = scan-next-byte(in, err, ed)</span>
 <span id="L153" class="LineNr"> 153 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L154" class="LineNr"> 154 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L155" class="LineNr"> 155 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L156" class="LineNr"> 156 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L154" class="LineNr"> 154 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L155" class="LineNr"> 155 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L156" class="LineNr"> 156 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L157" class="LineNr"> 157 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L158" class="LineNr"> 158 </span>    e8/call  scan-next-byte/disp32
 <span id="L159" class="LineNr"> 159 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L160" class="LineNr"> 160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L160" class="LineNr"> 160 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L161" class="LineNr"> 161 </span>    <span class="subxComment"># if (EAX == 0xffffffff) return</span>
-<span id="L162" class="LineNr"> 162 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
+<span id="L162" class="LineNr"> 162 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
 <span id="L163" class="LineNr"> 163 </span>    74/jump-if-equal  $convert-next-octet:end/disp8
 <span id="L164" class="LineNr"> 164 </span>    <span class="subxComment"># EAX = parse-hex-digit(EAX)</span>
 <span id="L165" class="LineNr"> 165 </span>    e8/call parse-hex-digit/disp32
 <span id="L166" class="LineNr"> 166 </span>    <span class="subxComment"># ECX = EAX</span>
-<span id="L167" class="LineNr"> 167 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to ECX</span>
+<span id="L167" class="LineNr"> 167 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to ECX</span>
 <span id="L168" class="LineNr"> 168 </span>    <span class="subxComment"># EAX = scan-next-byte(in, err, ed)</span>
 <span id="L169" class="LineNr"> 169 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L170" class="LineNr"> 170 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
-<span id="L171" class="LineNr"> 171 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L172" class="LineNr"> 172 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L170" class="LineNr"> 170 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L171" class="LineNr"> 171 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L172" class="LineNr"> 172 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L173" class="LineNr"> 173 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L174" class="LineNr"> 174 </span>    e8/call  scan-next-byte/disp32
 <span id="L175" class="LineNr"> 175 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L176" class="LineNr"> 176 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L176" class="LineNr"> 176 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L177" class="LineNr"> 177 </span>    <span class="subxComment"># if (EAX == 0xffffffff) error(ed, err, &quot;partial byte found.&quot;)</span>
-<span id="L178" class="LineNr"> 178 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
+<span id="L178" class="LineNr"> 178 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
 <span id="L179" class="LineNr"> 179 </span>    75/jump-if-not-equal  $convert-next-octet:convert/disp8
 <span id="L180" class="LineNr"> 180 </span>    <span class="subxS1Comment"># . error-byte(ed, err, msg, '.')  # reusing error-byte to avoid creating _yet_ another helper</span>
 <span id="L181" class="LineNr"> 181 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L182" class="LineNr"> 182 </span>    68/push  0x2e/imm32/period/dummy
 <span id="L183" class="LineNr"> 183 </span>    68/push  <span class="Constant">&quot;convert-next-octet: partial byte found&quot;</span>/imm32
-<span id="L184" class="LineNr"> 184 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L185" class="LineNr"> 185 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L184" class="LineNr"> 184 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L185" class="LineNr"> 185 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
 <span id="L186" class="LineNr"> 186 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L187" class="LineNr"> 187 </span>    e8/call  error-byte/disp32  <span class="subxComment"># never returns</span>
+<span id="L187" class="LineNr"> 187 </span>    e8/call  <a href='065error-byte.subx.html#L30'>error-byte</a>/disp32  <span class="subxComment"># never returns</span>
 <span id="L188" class="LineNr"> 188 </span><span class="Constant">$convert-next-octet:convert</span>:
 <span id="L189" class="LineNr"> 189 </span>    <span class="subxComment"># EAX = parse-hex-digit(EAX)</span>
 <span id="L190" class="LineNr"> 190 </span>    e8/call parse-hex-digit/disp32
 <span id="L191" class="LineNr"> 191 </span>    <span class="subxComment"># EAX = (ECX &lt;&lt; 4) | EAX</span>
 <span id="L192" class="LineNr"> 192 </span>    <span class="subxS1Comment"># . ECX &lt;&lt;= 4</span>
-<span id="L193" class="LineNr"> 193 </span>    c1/shift    4/subop/left        3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm8            <span class="subxComment"># shift ECX left by 4 bits</span>
+<span id="L193" class="LineNr"> 193 </span>    c1/shift    4/subop/left        3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm8            <span class="subxComment"># shift ECX left by 4 bits</span>
 <span id="L194" class="LineNr"> 194 </span>    <span class="subxS1Comment"># . EAX |= ECX</span>
-<span id="L195" class="LineNr"> 195 </span>    09/or                           3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># EAX = bitwise OR with ECX</span>
+<span id="L195" class="LineNr"> 195 </span>    09/or                           3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># EAX = bitwise OR with ECX</span>
 <span id="L196" class="LineNr"> 196 </span><span class="Constant">$convert-next-octet:end</span>:
 <span id="L197" class="LineNr"> 197 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L198" class="LineNr"> 198 </span>    59/pop-to-ECX
 <span id="L199" class="LineNr"> 199 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L200" class="LineNr"> 200 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L200" class="LineNr"> 200 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L201" class="LineNr"> 201 </span>    5d/pop-to-EBP
 <span id="L202" class="LineNr"> 202 </span>    c3/return
 <span id="L203" class="LineNr"> 203 </span>
@@ -271,72 +267,72 @@ if ('onhashchange' in window) {
 <span id="L205" class="LineNr"> 205 </span>    <span class="subxH1Comment"># - check that the first two bytes of the input are assembled into the resulting octet</span>
 <span id="L206" class="LineNr"> 206 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L207" class="LineNr"> 207 </span>    55/push-EBP
-<span id="L208" class="LineNr"> 208 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L208" class="LineNr"> 208 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L209" class="LineNr"> 209 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L210" class="LineNr"> 210 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L211" class="LineNr"> 211 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L212" class="LineNr"> 212 </span>    68/push  _test-stream/imm32
+<span id="L212" class="LineNr"> 212 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L213" class="LineNr"> 213 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L214" class="LineNr"> 214 </span>    e8/call  clear-stream/disp32
+<span id="L214" class="LineNr"> 214 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L215" class="LineNr"> 215 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L216" class="LineNr"> 216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L216" class="LineNr"> 216 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L217" class="LineNr"> 217 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L218" class="LineNr"> 218 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L219" class="LineNr"> 219 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L219" class="LineNr"> 219 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L220" class="LineNr"> 220 </span>    05/add-to-EAX  4/imm32
 <span id="L221" class="LineNr"> 221 </span>    50/push-EAX
 <span id="L222" class="LineNr"> 222 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L223" class="LineNr"> 223 </span>    e8/call  clear-stream/disp32
+<span id="L223" class="LineNr"> 223 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L224" class="LineNr"> 224 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L225" class="LineNr"> 225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L225" class="LineNr"> 225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L226" class="LineNr"> 226 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L227" class="LineNr"> 227 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L228" class="LineNr"> 228 </span>    68/push  _test-error-stream/imm32
 <span id="L229" class="LineNr"> 229 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L230" class="LineNr"> 230 </span>    e8/call  clear-stream/disp32
+<span id="L230" class="LineNr"> 230 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L231" class="LineNr"> 231 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L232" class="LineNr"> 232 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L232" class="LineNr"> 232 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L233" class="LineNr"> 233 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L234" class="LineNr"> 234 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L235" class="LineNr"> 235 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L236" class="LineNr"> 236 </span>    05/add-to-EAX  4/imm32
 <span id="L237" class="LineNr"> 237 </span>    50/push-EAX
 <span id="L238" class="LineNr"> 238 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L239" class="LineNr"> 239 </span>    e8/call  clear-stream/disp32
+<span id="L239" class="LineNr"> 239 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L240" class="LineNr"> 240 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L241" class="LineNr"> 241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L241" class="LineNr"> 241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L242" class="LineNr"> 242 </span>    <span class="subxComment"># initialize '_test-stream' to &quot;abc&quot;</span>
 <span id="L243" class="LineNr"> 243 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;abc&quot;)</span>
 <span id="L244" class="LineNr"> 244 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L245" class="LineNr"> 245 </span>    68/push  <span class="Constant">&quot;abc&quot;</span>/imm32
-<span id="L246" class="LineNr"> 246 </span>    68/push  _test-stream/imm32
+<span id="L246" class="LineNr"> 246 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L247" class="LineNr"> 247 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L248" class="LineNr"> 248 </span>    e8/call  write/disp32
+<span id="L248" class="LineNr"> 248 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L249" class="LineNr"> 249 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L250" class="LineNr"> 250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L250" class="LineNr"> 250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L251" class="LineNr"> 251 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'convert-next-octet' below</span>
 <span id="L252" class="LineNr"> 252 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L253" class="LineNr"> 253 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L254" class="LineNr"> 254 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L253" class="LineNr"> 253 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L254" class="LineNr"> 254 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L255" class="LineNr"> 255 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L256" class="LineNr"> 256 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L257" class="LineNr"> 257 </span>    68/push  0xc/imm32/nbytes-of-args-for-convert-next-octet
 <span id="L258" class="LineNr"> 258 </span>    51/push-ECX/ed
 <span id="L259" class="LineNr"> 259 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L260" class="LineNr"> 260 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L260" class="LineNr"> 260 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L261" class="LineNr"> 261 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L262" class="LineNr"> 262 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L262" class="LineNr"> 262 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L263" class="LineNr"> 263 </span>    <span class="subxComment"># EAX = convert-next-octet(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L264" class="LineNr"> 264 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L265" class="LineNr"> 265 </span>    51/push-ECX/ed
 <span id="L266" class="LineNr"> 266 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L267" class="LineNr"> 267 </span>    68/push  _test-buffered-file/imm32
+<span id="L267" class="LineNr"> 267 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L268" class="LineNr"> 268 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L269" class="LineNr"> 269 </span>    e8/call  convert-next-octet/disp32
 <span id="L270" class="LineNr"> 270 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L271" class="LineNr"> 271 </span>    <span class="subxComment"># pop args to convert-next-octet</span>
 <span id="L272" class="LineNr"> 272 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L273" class="LineNr"> 273 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L273" class="LineNr"> 273 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L274" class="LineNr"> 274 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L275" class="LineNr"> 275 </span>    59/pop-to-ECX
 <span id="L276" class="LineNr"> 276 </span>    <span class="subxComment"># check that convert-next-octet didn't abort</span>
@@ -345,13 +341,13 @@ if ('onhashchange' in window) {
 <span id="L279" class="LineNr"> 279 </span>    68/push  <span class="Constant">&quot;F - test-convert-next-octet: unexpected abort&quot;</span>/imm32
 <span id="L280" class="LineNr"> 280 </span>    68/push  0/imm32
 <span id="L281" class="LineNr"> 281 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L282" class="LineNr"> 282 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L282" class="LineNr"> 282 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L283" class="LineNr"> 283 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L284" class="LineNr"> 284 </span>    e8/call  check-ints-equal/disp32
+<span id="L284" class="LineNr"> 284 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L285" class="LineNr"> 285 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L286" class="LineNr"> 286 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L286" class="LineNr"> 286 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L287" class="LineNr"> 287 </span>    <span class="subxComment"># return if abort</span>
-<span id="L288" class="LineNr"> 288 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L288" class="LineNr"> 288 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L289" class="LineNr"> 289 </span>    75/jump-if-not-equal  $test-convert-next-octet:end/disp8
 <span id="L290" class="LineNr"> 290 </span>    <span class="subxComment"># check-ints-equal(EAX, 0xab, msg)</span>
 <span id="L291" class="LineNr"> 291 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -359,13 +355,13 @@ if ('onhashchange' in window) {
 <span id="L293" class="LineNr"> 293 </span>    68/push  0xab/imm32/ab
 <span id="L294" class="LineNr"> 294 </span>    50/push-EAX
 <span id="L295" class="LineNr"> 295 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L296" class="LineNr"> 296 </span>    e8/call  check-ints-equal/disp32
+<span id="L296" class="LineNr"> 296 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L297" class="LineNr"> 297 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L298" class="LineNr"> 298 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L298" class="LineNr"> 298 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L299" class="LineNr"> 299 </span><span class="Constant">$test-convert-next-octet:end</span>:
 <span id="L300" class="LineNr"> 300 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L301" class="LineNr"> 301 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L302" class="LineNr"> 302 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L302" class="LineNr"> 302 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add 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>
@@ -373,64 +369,64 @@ if ('onhashchange' in window) {
 <span id="L307" class="LineNr"> 307 </span>    <span class="subxH1Comment"># - check that eof returns the sentinel octet</span>
 <span id="L308" class="LineNr"> 308 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L309" class="LineNr"> 309 </span>    55/push-EBP
-<span id="L310" class="LineNr"> 310 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L310" class="LineNr"> 310 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L311" class="LineNr"> 311 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L312" class="LineNr"> 312 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L313" class="LineNr"> 313 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L314" class="LineNr"> 314 </span>    68/push  _test-stream/imm32
+<span id="L314" class="LineNr"> 314 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L315" class="LineNr"> 315 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L316" class="LineNr"> 316 </span>    e8/call  clear-stream/disp32
+<span id="L316" class="LineNr"> 316 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L317" class="LineNr"> 317 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L318" class="LineNr"> 318 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L318" class="LineNr"> 318 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L319" class="LineNr"> 319 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L320" class="LineNr"> 320 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L321" class="LineNr"> 321 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L321" class="LineNr"> 321 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L322" class="LineNr"> 322 </span>    05/add-to-EAX  4/imm32
 <span id="L323" class="LineNr"> 323 </span>    50/push-EAX
 <span id="L324" class="LineNr"> 324 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L325" class="LineNr"> 325 </span>    e8/call  clear-stream/disp32
+<span id="L325" class="LineNr"> 325 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L326" class="LineNr"> 326 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L327" class="LineNr"> 327 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L327" class="LineNr"> 327 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L328" class="LineNr"> 328 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L329" class="LineNr"> 329 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L330" class="LineNr"> 330 </span>    68/push  _test-error-stream/imm32
 <span id="L331" class="LineNr"> 331 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L332" class="LineNr"> 332 </span>    e8/call  clear-stream/disp32
+<span id="L332" class="LineNr"> 332 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L333" class="LineNr"> 333 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L334" class="LineNr"> 334 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L334" class="LineNr"> 334 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L335" class="LineNr"> 335 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L336" class="LineNr"> 336 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L337" class="LineNr"> 337 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L338" class="LineNr"> 338 </span>    05/add-to-EAX  4/imm32
 <span id="L339" class="LineNr"> 339 </span>    50/push-EAX
 <span id="L340" class="LineNr"> 340 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L341" class="LineNr"> 341 </span>    e8/call  clear-stream/disp32
+<span id="L341" class="LineNr"> 341 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L342" class="LineNr"> 342 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L343" class="LineNr"> 343 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L343" class="LineNr"> 343 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L344" class="LineNr"> 344 </span>    <span class="subxComment"># don't initialize '_test-stream'</span>
 <span id="L345" class="LineNr"> 345 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'convert-next-octet' below</span>
 <span id="L346" class="LineNr"> 346 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L347" class="LineNr"> 347 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L348" class="LineNr"> 348 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L347" class="LineNr"> 347 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L348" class="LineNr"> 348 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L349" class="LineNr"> 349 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L350" class="LineNr"> 350 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L351" class="LineNr"> 351 </span>    68/push  0xc/imm32/nbytes-of-args-for-convert-next-octet
 <span id="L352" class="LineNr"> 352 </span>    51/push-ECX/ed
 <span id="L353" class="LineNr"> 353 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L354" class="LineNr"> 354 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L354" class="LineNr"> 354 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L355" class="LineNr"> 355 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L356" class="LineNr"> 356 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L356" class="LineNr"> 356 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L357" class="LineNr"> 357 </span>    <span class="subxComment"># EAX = convert-next-octet(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L358" class="LineNr"> 358 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L359" class="LineNr"> 359 </span>    51/push-ECX/ed
 <span id="L360" class="LineNr"> 360 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L361" class="LineNr"> 361 </span>    68/push  _test-buffered-file/imm32
+<span id="L361" class="LineNr"> 361 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L362" class="LineNr"> 362 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L363" class="LineNr"> 363 </span>    e8/call  convert-next-octet/disp32
 <span id="L364" class="LineNr"> 364 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L365" class="LineNr"> 365 </span>    <span class="subxComment"># pop args to convert-next-octet</span>
 <span id="L366" class="LineNr"> 366 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L367" class="LineNr"> 367 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L367" class="LineNr"> 367 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L368" class="LineNr"> 368 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L369" class="LineNr"> 369 </span>    59/pop-to-ECX
 <span id="L370" class="LineNr"> 370 </span>    <span class="subxComment"># check that convert-next-octet didn't abort</span>
@@ -439,13 +435,13 @@ if ('onhashchange' in window) {
 <span id="L373" class="LineNr"> 373 </span>    68/push  <span class="Constant">&quot;F - test-convert-next-octet: unexpected abort&quot;</span>/imm32
 <span id="L374" class="LineNr"> 374 </span>    68/push  0/imm32
 <span id="L375" class="LineNr"> 375 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L376" class="LineNr"> 376 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L376" class="LineNr"> 376 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L377" class="LineNr"> 377 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L378" class="LineNr"> 378 </span>    e8/call  check-ints-equal/disp32
+<span id="L378" class="LineNr"> 378 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L379" class="LineNr"> 379 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L380" class="LineNr"> 380 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L380" class="LineNr"> 380 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L381" class="LineNr"> 381 </span>    <span class="subxComment"># return if abort</span>
-<span id="L382" class="LineNr"> 382 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L382" class="LineNr"> 382 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L383" class="LineNr"> 383 </span>    75/jump-if-not-equal  $test-convert-next-octet-handles-eof:end/disp8
 <span id="L384" class="LineNr"> 384 </span>    <span class="subxComment"># check-ints-equal(EAX, 0xffffffff, msg)</span>
 <span id="L385" class="LineNr"> 385 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -453,13 +449,13 @@ if ('onhashchange' in window) {
 <span id="L387" class="LineNr"> 387 </span>    68/push  0xffffffff/imm32/eof
 <span id="L388" class="LineNr"> 388 </span>    50/push-EAX
 <span id="L389" class="LineNr"> 389 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L390" class="LineNr"> 390 </span>    e8/call  check-ints-equal/disp32
+<span id="L390" class="LineNr"> 390 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L391" class="LineNr"> 391 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L392" class="LineNr"> 392 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L392" class="LineNr"> 392 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L393" class="LineNr"> 393 </span><span class="Constant">$test-convert-next-octet-handles-eof:end</span>:
 <span id="L394" class="LineNr"> 394 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L395" class="LineNr"> 395 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L396" class="LineNr"> 396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L396" class="LineNr"> 396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L397" class="LineNr"> 397 </span>    5d/pop-to-EBP
 <span id="L398" class="LineNr"> 398 </span>    c3/return
 <span id="L399" class="LineNr"> 399 </span>
@@ -467,72 +463,72 @@ if ('onhashchange' in window) {
 <span id="L401" class="LineNr"> 401 </span>    <span class="subxH1Comment"># - check that a single unaccompanied hex byte aborts</span>
 <span id="L402" class="LineNr"> 402 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L403" class="LineNr"> 403 </span>    55/push-EBP
-<span id="L404" class="LineNr"> 404 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L404" class="LineNr"> 404 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L405" class="LineNr"> 405 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L406" class="LineNr"> 406 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L407" class="LineNr"> 407 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L408" class="LineNr"> 408 </span>    68/push  _test-stream/imm32
+<span id="L408" class="LineNr"> 408 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L409" class="LineNr"> 409 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L410" class="LineNr"> 410 </span>    e8/call  clear-stream/disp32
+<span id="L410" class="LineNr"> 410 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L411" class="LineNr"> 411 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L412" class="LineNr"> 412 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L412" class="LineNr"> 412 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L413" class="LineNr"> 413 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L414" class="LineNr"> 414 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L415" class="LineNr"> 415 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L415" class="LineNr"> 415 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L416" class="LineNr"> 416 </span>    05/add-to-EAX  4/imm32
 <span id="L417" class="LineNr"> 417 </span>    50/push-EAX
 <span id="L418" class="LineNr"> 418 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L419" class="LineNr"> 419 </span>    e8/call  clear-stream/disp32
+<span id="L419" class="LineNr"> 419 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L420" class="LineNr"> 420 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L421" class="LineNr"> 421 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L421" class="LineNr"> 421 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L422" class="LineNr"> 422 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L423" class="LineNr"> 423 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L424" class="LineNr"> 424 </span>    68/push  _test-error-stream/imm32
 <span id="L425" class="LineNr"> 425 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L426" class="LineNr"> 426 </span>    e8/call  clear-stream/disp32
+<span id="L426" class="LineNr"> 426 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L427" class="LineNr"> 427 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L428" class="LineNr"> 428 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L428" class="LineNr"> 428 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L429" class="LineNr"> 429 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L430" class="LineNr"> 430 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L431" class="LineNr"> 431 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L432" class="LineNr"> 432 </span>    05/add-to-EAX  4/imm32
 <span id="L433" class="LineNr"> 433 </span>    50/push-EAX
 <span id="L434" class="LineNr"> 434 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L435" class="LineNr"> 435 </span>    e8/call  clear-stream/disp32
+<span id="L435" class="LineNr"> 435 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L436" class="LineNr"> 436 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L437" class="LineNr"> 437 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L437" class="LineNr"> 437 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L438" class="LineNr"> 438 </span>    <span class="subxComment"># initialize '_test-stream' to &quot;a&quot;</span>
 <span id="L439" class="LineNr"> 439 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;a&quot;)</span>
 <span id="L440" class="LineNr"> 440 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L441" class="LineNr"> 441 </span>    68/push  <span class="Constant">&quot;a&quot;</span>/imm32
-<span id="L442" class="LineNr"> 442 </span>    68/push  _test-stream/imm32
+<span id="L442" class="LineNr"> 442 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L443" class="LineNr"> 443 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L444" class="LineNr"> 444 </span>    e8/call  write/disp32
+<span id="L444" class="LineNr"> 444 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L445" class="LineNr"> 445 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L446" class="LineNr"> 446 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L446" class="LineNr"> 446 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L447" class="LineNr"> 447 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'convert-next-octet' below</span>
 <span id="L448" class="LineNr"> 448 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L449" class="LineNr"> 449 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L450" class="LineNr"> 450 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L449" class="LineNr"> 449 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L450" class="LineNr"> 450 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L451" class="LineNr"> 451 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L452" class="LineNr"> 452 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L453" class="LineNr"> 453 </span>    68/push  0xc/imm32/nbytes-of-args-for-convert-next-octet
 <span id="L454" class="LineNr"> 454 </span>    51/push-ECX/ed
 <span id="L455" class="LineNr"> 455 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L456" class="LineNr"> 456 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L456" class="LineNr"> 456 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L457" class="LineNr"> 457 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L458" class="LineNr"> 458 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L458" class="LineNr"> 458 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L459" class="LineNr"> 459 </span>    <span class="subxComment"># EAX = convert-next-octet(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L460" class="LineNr"> 460 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L461" class="LineNr"> 461 </span>    51/push-ECX/ed
 <span id="L462" class="LineNr"> 462 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L463" class="LineNr"> 463 </span>    68/push  _test-buffered-file/imm32
+<span id="L463" class="LineNr"> 463 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L464" class="LineNr"> 464 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L465" class="LineNr"> 465 </span>    e8/call  convert-next-octet/disp32
 <span id="L466" class="LineNr"> 466 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L467" class="LineNr"> 467 </span>    <span class="subxComment"># pop args to convert-next-octet</span>
 <span id="L468" class="LineNr"> 468 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L469" class="LineNr"> 469 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L469" class="LineNr"> 469 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L470" class="LineNr"> 470 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L471" class="LineNr"> 471 </span>    59/pop-to-ECX
 <span id="L472" class="LineNr"> 472 </span>    <span class="subxComment"># check that convert-next-octet aborted</span>
@@ -541,15 +537,15 @@ if ('onhashchange' in window) {
 <span id="L475" class="LineNr"> 475 </span>    68/push  <span class="Constant">&quot;F - test-convert-next-octet-aborts-on-single-hex-byte: unexpected abort&quot;</span>/imm32
 <span id="L476" class="LineNr"> 476 </span>    68/push  2/imm32
 <span id="L477" class="LineNr"> 477 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L478" class="LineNr"> 478 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L478" class="LineNr"> 478 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L479" class="LineNr"> 479 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L480" class="LineNr"> 480 </span>    e8/call  check-ints-equal/disp32
+<span id="L480" class="LineNr"> 480 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L481" class="LineNr"> 481 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L482" class="LineNr"> 482 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L482" class="LineNr"> 482 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L483" class="LineNr"> 483 </span><span class="Constant">$test-convert-next-octet-aborts-on-single-hex-byte:end</span>:
 <span id="L484" class="LineNr"> 484 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L485" class="LineNr"> 485 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L486" class="LineNr"> 486 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L486" class="LineNr"> 486 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L487" class="LineNr"> 487 </span>    5d/pop-to-EBP
 <span id="L488" class="LineNr"> 488 </span>    c3/return
 <span id="L489" class="LineNr"> 489 </span>
@@ -569,16 +565,16 @@ if ('onhashchange' in window) {
 <span id="L503" class="LineNr"> 503 </span>    <span class="subxComment">#</span>
 <span id="L504" class="LineNr"> 504 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L505" class="LineNr"> 505 </span>    55/push-EBP
-<span id="L506" class="LineNr"> 506 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L506" class="LineNr"> 506 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L507" class="LineNr"> 507 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L508" class="LineNr"> 508 </span><span class="Constant">$scan-next-byte:loop</span>:
 <span id="L509" class="LineNr"> 509 </span>    <span class="subxComment"># EAX = read-byte(in)</span>
 <span id="L510" class="LineNr"> 510 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L511" class="LineNr"> 511 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L511" class="LineNr"> 511 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L512" class="LineNr"> 512 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L513" class="LineNr"> 513 </span>    e8/call  read-byte/disp32
+<span id="L513" class="LineNr"> 513 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L514" class="LineNr"> 514 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L515" class="LineNr"> 515 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L515" class="LineNr"> 515 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L516" class="LineNr"> 516 </span>    <span class="subxComment"># if (EAX == 0xffffffff) return EAX</span>
 <span id="L517" class="LineNr"> 517 </span>    3d/compare-with-EAX  0xffffffff/imm32
 <span id="L518" class="LineNr"> 518 </span>    74/jump-if-equal  $scan-next-byte:end/disp8
@@ -591,7 +587,7 @@ if ('onhashchange' in window) {
 <span id="L525" class="LineNr"> 525 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L526" class="LineNr"> 526 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L527" class="LineNr"> 527 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L528" class="LineNr"> 528 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L528" class="LineNr"> 528 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L529" class="LineNr"> 529 </span>    <span class="subxS1Comment"># . compare with 'false'</span>
 <span id="L530" class="LineNr"> 530 </span>    3d/compare-with-EAX  0/imm32
 <span id="L531" class="LineNr"> 531 </span>    <span class="subxS1Comment"># . restore EAX (does not affect flags)</span>
@@ -600,13 +596,13 @@ if ('onhashchange' in window) {
 <span id="L534" class="LineNr"> 534 </span>    75/jump-if-not-equal  $scan-next-byte:end/disp8
 <span id="L535" class="LineNr"> 535 </span><span class="Constant">$scan-next-byte:check1</span>:
 <span id="L536" class="LineNr"> 536 </span>    <span class="subxComment"># if EAX == ' ' continue</span>
-<span id="L537" class="LineNr"> 537 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x20/imm32        <span class="subxComment"># compare EAX</span>
+<span id="L537" class="LineNr"> 537 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x20/imm32        <span class="subxComment"># compare EAX</span>
 <span id="L538" class="LineNr"> 538 </span>    74/jump-if-equal  $scan-next-byte:loop/disp8
 <span id="L539" class="LineNr"> 539 </span>    <span class="subxComment"># if EAX == '\t' continue</span>
-<span id="L540" class="LineNr"> 540 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x9/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L540" class="LineNr"> 540 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x9/imm32         <span class="subxComment"># compare EAX</span>
 <span id="L541" class="LineNr"> 541 </span>    74/jump-if-equal  $scan-next-byte:loop/disp8
 <span id="L542" class="LineNr"> 542 </span>    <span class="subxComment"># if EAX == '\n' continue</span>
-<span id="L543" class="LineNr"> 543 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L543" class="LineNr"> 543 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
 <span id="L544" class="LineNr"> 544 </span>    74/jump-if-equal  $scan-next-byte:loop/disp8
 <span id="L545" class="LineNr"> 545 </span><span class="Constant">$scan-next-byte:check2</span>:
 <span id="L546" class="LineNr"> 546 </span>    <span class="subxComment"># if EAX == '#' skip-until-newline(in)</span>
@@ -614,25 +610,25 @@ if ('onhashchange' in window) {
 <span id="L548" class="LineNr"> 548 </span>    75/jump-if-not-equal  $scan-next-byte:check3/disp8
 <span id="L549" class="LineNr"> 549 </span>    <span class="subxS1Comment"># . skip-until-newline(in)</span>
 <span id="L550" class="LineNr"> 550 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L551" class="LineNr"> 551 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L551" class="LineNr"> 551 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L552" class="LineNr"> 552 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L553" class="LineNr"> 553 </span>    e8/call  skip-until-newline/disp32
 <span id="L554" class="LineNr"> 554 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L555" class="LineNr"> 555 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L555" class="LineNr"> 555 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L556" class="LineNr"> 556 </span>    eb/jump  $scan-next-byte:loop/disp8
 <span id="L557" class="LineNr"> 557 </span><span class="Constant">$scan-next-byte:check3</span>:
 <span id="L558" class="LineNr"> 558 </span>    <span class="subxComment"># otherwise error-byte(ed, err, msg, EAX)</span>
 <span id="L559" class="LineNr"> 559 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L560" class="LineNr"> 560 </span>    50/push-EAX
 <span id="L561" class="LineNr"> 561 </span>    68/push  <span class="Constant">&quot;scan-next-byte: invalid byte&quot;</span>/imm32
-<span id="L562" class="LineNr"> 562 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
-<span id="L563" class="LineNr"> 563 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0x10/disp8     <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
+<span id="L562" class="LineNr"> 562 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L563" class="LineNr"> 563 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0x10/disp8     <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+16)</span>
 <span id="L564" class="LineNr"> 564 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L565" class="LineNr"> 565 </span>    e8/call  error-byte/disp32  <span class="subxComment"># never returns</span>
+<span id="L565" class="LineNr"> 565 </span>    e8/call  <a href='065error-byte.subx.html#L30'>error-byte</a>/disp32  <span class="subxComment"># never returns</span>
 <span id="L566" class="LineNr"> 566 </span><span class="Constant">$scan-next-byte:end</span>:
 <span id="L567" class="LineNr"> 567 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L568" class="LineNr"> 568 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L569" class="LineNr"> 569 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L569" class="LineNr"> 569 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L570" class="LineNr"> 570 </span>    5d/pop-to-EBP
 <span id="L571" class="LineNr"> 571 </span>    c3/return
 <span id="L572" class="LineNr"> 572 </span>
@@ -640,72 +636,72 @@ if ('onhashchange' in window) {
 <span id="L574" class="LineNr"> 574 </span>    <span class="subxH1Comment"># - check that the first byte of the input is returned</span>
 <span id="L575" class="LineNr"> 575 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L576" class="LineNr"> 576 </span>    55/push-EBP
-<span id="L577" class="LineNr"> 577 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L577" class="LineNr"> 577 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L578" class="LineNr"> 578 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L579" class="LineNr"> 579 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L580" class="LineNr"> 580 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L581" class="LineNr"> 581 </span>    68/push  _test-stream/imm32
+<span id="L581" class="LineNr"> 581 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L582" class="LineNr"> 582 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L583" class="LineNr"> 583 </span>    e8/call  clear-stream/disp32
+<span id="L583" class="LineNr"> 583 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L584" class="LineNr"> 584 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L585" class="LineNr"> 585 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L585" class="LineNr"> 585 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L586" class="LineNr"> 586 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L587" class="LineNr"> 587 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L588" class="LineNr"> 588 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L588" class="LineNr"> 588 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L589" class="LineNr"> 589 </span>    05/add-to-EAX  4/imm32
 <span id="L590" class="LineNr"> 590 </span>    50/push-EAX
 <span id="L591" class="LineNr"> 591 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L592" class="LineNr"> 592 </span>    e8/call  clear-stream/disp32
+<span id="L592" class="LineNr"> 592 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L593" class="LineNr"> 593 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L594" class="LineNr"> 594 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L594" class="LineNr"> 594 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L595" class="LineNr"> 595 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L596" class="LineNr"> 596 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L597" class="LineNr"> 597 </span>    68/push  _test-error-stream/imm32
 <span id="L598" class="LineNr"> 598 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L599" class="LineNr"> 599 </span>    e8/call  clear-stream/disp32
+<span id="L599" class="LineNr"> 599 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L600" class="LineNr"> 600 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L601" class="LineNr"> 601 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L601" class="LineNr"> 601 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L602" class="LineNr"> 602 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L603" class="LineNr"> 603 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L604" class="LineNr"> 604 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L605" class="LineNr"> 605 </span>    05/add-to-EAX  4/imm32
 <span id="L606" class="LineNr"> 606 </span>    50/push-EAX
 <span id="L607" class="LineNr"> 607 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L608" class="LineNr"> 608 </span>    e8/call  clear-stream/disp32
+<span id="L608" class="LineNr"> 608 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L609" class="LineNr"> 609 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L610" class="LineNr"> 610 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L610" class="LineNr"> 610 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L611" class="LineNr"> 611 </span>    <span class="subxComment"># initialize '_test-stream' to &quot;abc&quot;</span>
 <span id="L612" class="LineNr"> 612 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;abc&quot;)</span>
 <span id="L613" class="LineNr"> 613 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L614" class="LineNr"> 614 </span>    68/push  <span class="Constant">&quot;abc&quot;</span>/imm32
-<span id="L615" class="LineNr"> 615 </span>    68/push  _test-stream/imm32
+<span id="L615" class="LineNr"> 615 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L616" class="LineNr"> 616 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L617" class="LineNr"> 617 </span>    e8/call  write/disp32
+<span id="L617" class="LineNr"> 617 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L618" class="LineNr"> 618 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L619" class="LineNr"> 619 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L619" class="LineNr"> 619 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L620" class="LineNr"> 620 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L621" class="LineNr"> 621 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L622" class="LineNr"> 622 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L623" class="LineNr"> 623 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L622" class="LineNr"> 622 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L623" class="LineNr"> 623 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L624" class="LineNr"> 624 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L625" class="LineNr"> 625 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L626" class="LineNr"> 626 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L627" class="LineNr"> 627 </span>    51/push-ECX/ed
 <span id="L628" class="LineNr"> 628 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L629" class="LineNr"> 629 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L629" class="LineNr"> 629 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L630" class="LineNr"> 630 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L631" class="LineNr"> 631 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L631" class="LineNr"> 631 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L632" class="LineNr"> 632 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L633" class="LineNr"> 633 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L634" class="LineNr"> 634 </span>    51/push-ECX/ed
 <span id="L635" class="LineNr"> 635 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L636" class="LineNr"> 636 </span>    68/push  _test-buffered-file/imm32
+<span id="L636" class="LineNr"> 636 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L637" class="LineNr"> 637 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L638" class="LineNr"> 638 </span>    e8/call  scan-next-byte/disp32
 <span id="L639" class="LineNr"> 639 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L640" class="LineNr"> 640 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L641" class="LineNr"> 641 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L642" class="LineNr"> 642 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L642" class="LineNr"> 642 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L643" class="LineNr"> 643 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L644" class="LineNr"> 644 </span>    59/pop-to-ECX
 <span id="L645" class="LineNr"> 645 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -714,13 +710,13 @@ if ('onhashchange' in window) {
 <span id="L648" class="LineNr"> 648 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte: unexpected abort&quot;</span>/imm32
 <span id="L649" class="LineNr"> 649 </span>    68/push  0/imm32
 <span id="L650" class="LineNr"> 650 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L651" class="LineNr"> 651 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L651" class="LineNr"> 651 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L652" class="LineNr"> 652 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L653" class="LineNr"> 653 </span>    e8/call  check-ints-equal/disp32
+<span id="L653" class="LineNr"> 653 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L654" class="LineNr"> 654 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L655" class="LineNr"> 655 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L655" class="LineNr"> 655 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L656" class="LineNr"> 656 </span>    <span class="subxComment"># return if abort</span>
-<span id="L657" class="LineNr"> 657 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L657" class="LineNr"> 657 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L658" class="LineNr"> 658 </span>    75/jump-if-not-equal  $test-scan-next-byte:end/disp8
 <span id="L659" class="LineNr"> 659 </span>    <span class="subxComment"># check-ints-equal(EAX, 0x61/a, msg)</span>
 <span id="L660" class="LineNr"> 660 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -728,13 +724,13 @@ if ('onhashchange' in window) {
 <span id="L662" class="LineNr"> 662 </span>    68/push  0x61/imm32/a
 <span id="L663" class="LineNr"> 663 </span>    50/push-EAX
 <span id="L664" class="LineNr"> 664 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L665" class="LineNr"> 665 </span>    e8/call  check-ints-equal/disp32
+<span id="L665" class="LineNr"> 665 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L666" class="LineNr"> 666 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L667" class="LineNr"> 667 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L667" class="LineNr"> 667 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L668" class="LineNr"> 668 </span><span class="Constant">$test-scan-next-byte:end</span>:
 <span id="L669" class="LineNr"> 669 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L670" class="LineNr"> 670 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L671" class="LineNr"> 671 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L671" class="LineNr"> 671 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L672" class="LineNr"> 672 </span>    5d/pop-to-EBP
 <span id="L673" class="LineNr"> 673 </span>    c3/return
 <span id="L674" class="LineNr"> 674 </span>
@@ -742,72 +738,72 @@ if ('onhashchange' in window) {
 <span id="L676" class="LineNr"> 676 </span>    <span class="subxH1Comment"># - check that the first byte after whitespace is returned</span>
 <span id="L677" class="LineNr"> 677 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L678" class="LineNr"> 678 </span>    55/push-EBP
-<span id="L679" class="LineNr"> 679 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L679" class="LineNr"> 679 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L680" class="LineNr"> 680 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L681" class="LineNr"> 681 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L682" class="LineNr"> 682 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L683" class="LineNr"> 683 </span>    68/push  _test-stream/imm32
+<span id="L683" class="LineNr"> 683 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L684" class="LineNr"> 684 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L685" class="LineNr"> 685 </span>    e8/call  clear-stream/disp32
+<span id="L685" class="LineNr"> 685 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L686" class="LineNr"> 686 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L687" class="LineNr"> 687 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L687" class="LineNr"> 687 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L688" class="LineNr"> 688 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L689" class="LineNr"> 689 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L690" class="LineNr"> 690 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L690" class="LineNr"> 690 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L691" class="LineNr"> 691 </span>    05/add-to-EAX  4/imm32
 <span id="L692" class="LineNr"> 692 </span>    50/push-EAX
 <span id="L693" class="LineNr"> 693 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L694" class="LineNr"> 694 </span>    e8/call  clear-stream/disp32
+<span id="L694" class="LineNr"> 694 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L695" class="LineNr"> 695 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L696" class="LineNr"> 696 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L696" class="LineNr"> 696 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L697" class="LineNr"> 697 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L698" class="LineNr"> 698 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L699" class="LineNr"> 699 </span>    68/push  _test-error-stream/imm32
 <span id="L700" class="LineNr"> 700 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L701" class="LineNr"> 701 </span>    e8/call  clear-stream/disp32
+<span id="L701" class="LineNr"> 701 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L702" class="LineNr"> 702 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L703" class="LineNr"> 703 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L703" class="LineNr"> 703 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L704" class="LineNr"> 704 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L705" class="LineNr"> 705 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L706" class="LineNr"> 706 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L707" class="LineNr"> 707 </span>    05/add-to-EAX  4/imm32
 <span id="L708" class="LineNr"> 708 </span>    50/push-EAX
 <span id="L709" class="LineNr"> 709 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L710" class="LineNr"> 710 </span>    e8/call  clear-stream/disp32
+<span id="L710" class="LineNr"> 710 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L711" class="LineNr"> 711 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L712" class="LineNr"> 712 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L712" class="LineNr"> 712 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L713" class="LineNr"> 713 </span>    <span class="subxComment"># initialize '_test-stream' to input with leading whitespace</span>
 <span id="L714" class="LineNr"> 714 </span>    <span class="subxS1Comment"># . write(_test-stream, text)</span>
 <span id="L715" class="LineNr"> 715 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L716" class="LineNr"> 716 </span>    68/push  <span class="Constant">&quot;  abc&quot;</span>/imm32
-<span id="L717" class="LineNr"> 717 </span>    68/push  _test-stream/imm32
+<span id="L717" class="LineNr"> 717 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L718" class="LineNr"> 718 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L719" class="LineNr"> 719 </span>    e8/call  write/disp32
+<span id="L719" class="LineNr"> 719 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L720" class="LineNr"> 720 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L721" class="LineNr"> 721 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L721" class="LineNr"> 721 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L722" class="LineNr"> 722 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L723" class="LineNr"> 723 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L724" class="LineNr"> 724 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L725" class="LineNr"> 725 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L724" class="LineNr"> 724 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L725" class="LineNr"> 725 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L726" class="LineNr"> 726 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L727" class="LineNr"> 727 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L728" class="LineNr"> 728 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L729" class="LineNr"> 729 </span>    51/push-ECX/ed
 <span id="L730" class="LineNr"> 730 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L731" class="LineNr"> 731 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L731" class="LineNr"> 731 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L732" class="LineNr"> 732 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L733" class="LineNr"> 733 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L733" class="LineNr"> 733 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L734" class="LineNr"> 734 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L735" class="LineNr"> 735 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L736" class="LineNr"> 736 </span>    51/push-ECX/ed
 <span id="L737" class="LineNr"> 737 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L738" class="LineNr"> 738 </span>    68/push  _test-buffered-file/imm32
+<span id="L738" class="LineNr"> 738 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L739" class="LineNr"> 739 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L740" class="LineNr"> 740 </span>    e8/call  scan-next-byte/disp32
 <span id="L741" class="LineNr"> 741 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L742" class="LineNr"> 742 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L743" class="LineNr"> 743 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L744" class="LineNr"> 744 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L744" class="LineNr"> 744 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L745" class="LineNr"> 745 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L746" class="LineNr"> 746 </span>    59/pop-to-ECX
 <span id="L747" class="LineNr"> 747 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -816,13 +812,13 @@ if ('onhashchange' in window) {
 <span id="L750" class="LineNr"> 750 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-skips-whitespace: unexpected abort&quot;</span>/imm32
 <span id="L751" class="LineNr"> 751 </span>    68/push  0/imm32
 <span id="L752" class="LineNr"> 752 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L753" class="LineNr"> 753 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L753" class="LineNr"> 753 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L754" class="LineNr"> 754 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L755" class="LineNr"> 755 </span>    e8/call  check-ints-equal/disp32
+<span id="L755" class="LineNr"> 755 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L756" class="LineNr"> 756 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L757" class="LineNr"> 757 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L757" class="LineNr"> 757 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L758" class="LineNr"> 758 </span>    <span class="subxComment"># return if abort</span>
-<span id="L759" class="LineNr"> 759 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L759" class="LineNr"> 759 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L760" class="LineNr"> 760 </span>    75/jump-if-not-equal  $test-scan-next-byte-skips-whitespace:end/disp8
 <span id="L761" class="LineNr"> 761 </span>    <span class="subxComment"># check-ints-equal(EAX, 0x61/a, msg)</span>
 <span id="L762" class="LineNr"> 762 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -830,13 +826,13 @@ if ('onhashchange' in window) {
 <span id="L764" class="LineNr"> 764 </span>    68/push  0x61/imm32/a
 <span id="L765" class="LineNr"> 765 </span>    50/push-EAX
 <span id="L766" class="LineNr"> 766 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L767" class="LineNr"> 767 </span>    e8/call  check-ints-equal/disp32
+<span id="L767" class="LineNr"> 767 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L768" class="LineNr"> 768 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L769" class="LineNr"> 769 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L769" class="LineNr"> 769 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L770" class="LineNr"> 770 </span><span class="Constant">$test-scan-next-byte-skips-whitespace:end</span>:
 <span id="L771" class="LineNr"> 771 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L772" class="LineNr"> 772 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L773" class="LineNr"> 773 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L773" class="LineNr"> 773 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L774" class="LineNr"> 774 </span>    5d/pop-to-EBP
 <span id="L775" class="LineNr"> 775 </span>    c3/return
 <span id="L776" class="LineNr"> 776 </span>
@@ -844,88 +840,88 @@ if ('onhashchange' in window) {
 <span id="L778" class="LineNr"> 778 </span>    <span class="subxH1Comment"># - check that the first byte after a comment (and newline) is returned</span>
 <span id="L779" class="LineNr"> 779 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L780" class="LineNr"> 780 </span>    55/push-EBP
-<span id="L781" class="LineNr"> 781 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L781" class="LineNr"> 781 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L782" class="LineNr"> 782 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L783" class="LineNr"> 783 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L784" class="LineNr"> 784 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L785" class="LineNr"> 785 </span>    68/push  _test-stream/imm32
+<span id="L785" class="LineNr"> 785 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L786" class="LineNr"> 786 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L787" class="LineNr"> 787 </span>    e8/call  clear-stream/disp32
+<span id="L787" class="LineNr"> 787 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L788" class="LineNr"> 788 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L789" class="LineNr"> 789 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L789" class="LineNr"> 789 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L790" class="LineNr"> 790 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L791" class="LineNr"> 791 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L792" class="LineNr"> 792 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L792" class="LineNr"> 792 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L793" class="LineNr"> 793 </span>    05/add-to-EAX  4/imm32
 <span id="L794" class="LineNr"> 794 </span>    50/push-EAX
 <span id="L795" class="LineNr"> 795 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L796" class="LineNr"> 796 </span>    e8/call  clear-stream/disp32
+<span id="L796" class="LineNr"> 796 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L797" class="LineNr"> 797 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L798" class="LineNr"> 798 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L798" class="LineNr"> 798 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L799" class="LineNr"> 799 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L800" class="LineNr"> 800 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L801" class="LineNr"> 801 </span>    68/push  _test-error-stream/imm32
 <span id="L802" class="LineNr"> 802 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L803" class="LineNr"> 803 </span>    e8/call  clear-stream/disp32
+<span id="L803" class="LineNr"> 803 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L804" class="LineNr"> 804 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L805" class="LineNr"> 805 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L805" class="LineNr"> 805 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L806" class="LineNr"> 806 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L807" class="LineNr"> 807 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L808" class="LineNr"> 808 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L809" class="LineNr"> 809 </span>    05/add-to-EAX  4/imm32
 <span id="L810" class="LineNr"> 810 </span>    50/push-EAX
 <span id="L811" class="LineNr"> 811 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L812" class="LineNr"> 812 </span>    e8/call  clear-stream/disp32
+<span id="L812" class="LineNr"> 812 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L813" class="LineNr"> 813 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L814" class="LineNr"> 814 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L814" class="LineNr"> 814 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L815" class="LineNr"> 815 </span>    <span class="subxComment"># initialize '_test-stream' to input with leading comment</span>
 <span id="L816" class="LineNr"> 816 </span>    <span class="subxS1Comment"># . write(_test-stream, comment)</span>
 <span id="L817" class="LineNr"> 817 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L818" class="LineNr"> 818 </span>    68/push  <span class="Constant">&quot;#x&quot;</span>/imm32
-<span id="L819" class="LineNr"> 819 </span>    68/push  _test-stream/imm32
+<span id="L819" class="LineNr"> 819 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L820" class="LineNr"> 820 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L821" class="LineNr"> 821 </span>    e8/call  write/disp32
+<span id="L821" class="LineNr"> 821 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L822" class="LineNr"> 822 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L823" class="LineNr"> 823 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L823" class="LineNr"> 823 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L824" class="LineNr"> 824 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
 <span id="L825" class="LineNr"> 825 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L826" class="LineNr"> 826 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L827" class="LineNr"> 827 </span>    68/push  _test-stream/imm32
+<span id="L826" class="LineNr"> 826 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L827" class="LineNr"> 827 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L828" class="LineNr"> 828 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L829" class="LineNr"> 829 </span>    e8/call  write/disp32
+<span id="L829" class="LineNr"> 829 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L830" class="LineNr"> 830 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L831" class="LineNr"> 831 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L831" class="LineNr"> 831 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L832" class="LineNr"> 832 </span>    <span class="subxS1Comment"># . write(_test-stream, real text)</span>
 <span id="L833" class="LineNr"> 833 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L834" class="LineNr"> 834 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L835" class="LineNr"> 835 </span>    68/push  _test-stream/imm32
+<span id="L835" class="LineNr"> 835 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L836" class="LineNr"> 836 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L837" class="LineNr"> 837 </span>    e8/call  write/disp32
+<span id="L837" class="LineNr"> 837 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L838" class="LineNr"> 838 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L839" class="LineNr"> 839 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L839" class="LineNr"> 839 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L840" class="LineNr"> 840 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L841" class="LineNr"> 841 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L842" class="LineNr"> 842 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L843" class="LineNr"> 843 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L842" class="LineNr"> 842 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L843" class="LineNr"> 843 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L844" class="LineNr"> 844 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L845" class="LineNr"> 845 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L846" class="LineNr"> 846 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L847" class="LineNr"> 847 </span>    51/push-ECX/ed
 <span id="L848" class="LineNr"> 848 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L849" class="LineNr"> 849 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L849" class="LineNr"> 849 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L850" class="LineNr"> 850 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L851" class="LineNr"> 851 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L851" class="LineNr"> 851 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L852" class="LineNr"> 852 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L853" class="LineNr"> 853 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L854" class="LineNr"> 854 </span>    51/push-ECX/ed
 <span id="L855" class="LineNr"> 855 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L856" class="LineNr"> 856 </span>    68/push  _test-buffered-file/imm32
+<span id="L856" class="LineNr"> 856 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L857" class="LineNr"> 857 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L858" class="LineNr"> 858 </span>    e8/call  scan-next-byte/disp32
 <span id="L859" class="LineNr"> 859 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L860" class="LineNr"> 860 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L861" class="LineNr"> 861 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L862" class="LineNr"> 862 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L862" class="LineNr"> 862 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L863" class="LineNr"> 863 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L864" class="LineNr"> 864 </span>    59/pop-to-ECX
 <span id="L865" class="LineNr"> 865 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -934,13 +930,13 @@ if ('onhashchange' in window) {
 <span id="L868" class="LineNr"> 868 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-skips-comment: unexpected abort&quot;</span>/imm32
 <span id="L869" class="LineNr"> 869 </span>    68/push  0/imm32
 <span id="L870" class="LineNr"> 870 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L871" class="LineNr"> 871 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L871" class="LineNr"> 871 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L872" class="LineNr"> 872 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L873" class="LineNr"> 873 </span>    e8/call  check-ints-equal/disp32
+<span id="L873" class="LineNr"> 873 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L874" class="LineNr"> 874 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L875" class="LineNr"> 875 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L875" class="LineNr"> 875 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L876" class="LineNr"> 876 </span>    <span class="subxComment"># return if abort</span>
-<span id="L877" class="LineNr"> 877 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L877" class="LineNr"> 877 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L878" class="LineNr"> 878 </span>    75/jump-if-not-equal  $test-scan-next-byte-skips-comment:end/disp8
 <span id="L879" class="LineNr"> 879 </span>    <span class="subxComment"># check-ints-equal(EAX, 0x61/a, msg)</span>
 <span id="L880" class="LineNr"> 880 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -948,13 +944,13 @@ if ('onhashchange' in window) {
 <span id="L882" class="LineNr"> 882 </span>    68/push  0x61/imm32/a
 <span id="L883" class="LineNr"> 883 </span>    50/push-EAX
 <span id="L884" class="LineNr"> 884 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L885" class="LineNr"> 885 </span>    e8/call  check-ints-equal/disp32
+<span id="L885" class="LineNr"> 885 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L886" class="LineNr"> 886 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L887" class="LineNr"> 887 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L887" class="LineNr"> 887 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L888" class="LineNr"> 888 </span><span class="Constant">$test-scan-next-byte-skips-comment:end</span>:
 <span id="L889" class="LineNr"> 889 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L890" class="LineNr"> 890 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L891" class="LineNr"> 891 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L891" class="LineNr"> 891 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L892" class="LineNr"> 892 </span>    5d/pop-to-EBP
 <span id="L893" class="LineNr"> 893 </span>    c3/return
 <span id="L894" class="LineNr"> 894 </span>
@@ -962,88 +958,88 @@ if ('onhashchange' in window) {
 <span id="L896" class="LineNr"> 896 </span>    <span class="subxH1Comment"># - check that the first byte after a comment and any further whitespace is returned</span>
 <span id="L897" class="LineNr"> 897 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L898" class="LineNr"> 898 </span>    55/push-EBP
-<span id="L899" class="LineNr"> 899 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L899" class="LineNr"> 899 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L900" class="LineNr"> 900 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L901" class="LineNr"> 901 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L902" class="LineNr"> 902 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L903" class="LineNr"> 903 </span>    68/push  _test-stream/imm32
+<span id="L903" class="LineNr"> 903 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L904" class="LineNr"> 904 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L905" class="LineNr"> 905 </span>    e8/call  clear-stream/disp32
+<span id="L905" class="LineNr"> 905 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L906" class="LineNr"> 906 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L907" class="LineNr"> 907 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L907" class="LineNr"> 907 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L908" class="LineNr"> 908 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L909" class="LineNr"> 909 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L910" class="LineNr"> 910 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L910" class="LineNr"> 910 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L911" class="LineNr"> 911 </span>    05/add-to-EAX  4/imm32
 <span id="L912" class="LineNr"> 912 </span>    50/push-EAX
 <span id="L913" class="LineNr"> 913 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L914" class="LineNr"> 914 </span>    e8/call  clear-stream/disp32
+<span id="L914" class="LineNr"> 914 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L915" class="LineNr"> 915 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L916" class="LineNr"> 916 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L916" class="LineNr"> 916 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L917" class="LineNr"> 917 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L918" class="LineNr"> 918 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L919" class="LineNr"> 919 </span>    68/push  _test-error-stream/imm32
 <span id="L920" class="LineNr"> 920 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L921" class="LineNr"> 921 </span>    e8/call  clear-stream/disp32
+<span id="L921" class="LineNr"> 921 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L922" class="LineNr"> 922 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L923" class="LineNr"> 923 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L923" class="LineNr"> 923 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L924" class="LineNr"> 924 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L925" class="LineNr"> 925 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L926" class="LineNr"> 926 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L927" class="LineNr"> 927 </span>    05/add-to-EAX  4/imm32
 <span id="L928" class="LineNr"> 928 </span>    50/push-EAX
 <span id="L929" class="LineNr"> 929 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L930" class="LineNr"> 930 </span>    e8/call  clear-stream/disp32
+<span id="L930" class="LineNr"> 930 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L931" class="LineNr"> 931 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L932" class="LineNr"> 932 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L932" class="LineNr"> 932 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L933" class="LineNr"> 933 </span>    <span class="subxComment"># initialize '_test-stream' to input with leading comment and more whitespace after newline</span>
 <span id="L934" class="LineNr"> 934 </span>    <span class="subxS1Comment"># . write(_test-stream, comment)</span>
 <span id="L935" class="LineNr"> 935 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L936" class="LineNr"> 936 </span>    68/push  <span class="Constant">&quot;#x&quot;</span>/imm32
-<span id="L937" class="LineNr"> 937 </span>    68/push  _test-stream/imm32
+<span id="L937" class="LineNr"> 937 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L938" class="LineNr"> 938 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L939" class="LineNr"> 939 </span>    e8/call  write/disp32
+<span id="L939" class="LineNr"> 939 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L940" class="LineNr"> 940 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L941" class="LineNr"> 941 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L941" class="LineNr"> 941 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L942" class="LineNr"> 942 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
 <span id="L943" class="LineNr"> 943 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L944" class="LineNr"> 944 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L945" class="LineNr"> 945 </span>    68/push  _test-stream/imm32
+<span id="L944" class="LineNr"> 944 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L945" class="LineNr"> 945 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L946" class="LineNr"> 946 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L947" class="LineNr"> 947 </span>    e8/call  write/disp32
+<span id="L947" class="LineNr"> 947 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L948" class="LineNr"> 948 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L949" class="LineNr"> 949 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L949" class="LineNr"> 949 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L950" class="LineNr"> 950 </span>    <span class="subxS1Comment"># . write(_test-stream, real text)</span>
 <span id="L951" class="LineNr"> 951 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L952" class="LineNr"> 952 </span>    68/push  <span class="Constant">&quot; ab&quot;</span>/imm32
-<span id="L953" class="LineNr"> 953 </span>    68/push  _test-stream/imm32
+<span id="L953" class="LineNr"> 953 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L954" class="LineNr"> 954 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L955" class="LineNr"> 955 </span>    e8/call  write/disp32
+<span id="L955" class="LineNr"> 955 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L956" class="LineNr"> 956 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L957" class="LineNr"> 957 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L957" class="LineNr"> 957 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L958" class="LineNr"> 958 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L959" class="LineNr"> 959 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L960" class="LineNr"> 960 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L961" class="LineNr"> 961 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L960" class="LineNr"> 960 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L961" class="LineNr"> 961 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L962" class="LineNr"> 962 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L963" class="LineNr"> 963 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L964" class="LineNr"> 964 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L965" class="LineNr"> 965 </span>    51/push-ECX/ed
 <span id="L966" class="LineNr"> 966 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L967" class="LineNr"> 967 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L967" class="LineNr"> 967 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L968" class="LineNr"> 968 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L969" class="LineNr"> 969 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L969" class="LineNr"> 969 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L970" class="LineNr"> 970 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L971" class="LineNr"> 971 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L972" class="LineNr"> 972 </span>    51/push-ECX/ed
 <span id="L973" class="LineNr"> 973 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L974" class="LineNr"> 974 </span>    68/push  _test-buffered-file/imm32
+<span id="L974" class="LineNr"> 974 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L975" class="LineNr"> 975 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L976" class="LineNr"> 976 </span>    e8/call  scan-next-byte/disp32
 <span id="L977" class="LineNr"> 977 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L978" class="LineNr"> 978 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L979" class="LineNr"> 979 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L980" class="LineNr"> 980 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L980" class="LineNr"> 980 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L981" class="LineNr"> 981 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L982" class="LineNr"> 982 </span>    59/pop-to-ECX
 <span id="L983" class="LineNr"> 983 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -1052,13 +1048,13 @@ if ('onhashchange' in window) {
 <span id="L986" class="LineNr"> 986 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-skips-comment-and-whitespace: unexpected abort&quot;</span>/imm32
 <span id="L987" class="LineNr"> 987 </span>    68/push  0/imm32
 <span id="L988" class="LineNr"> 988 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L989" class="LineNr"> 989 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L989" class="LineNr"> 989 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L990" class="LineNr"> 990 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L991" class="LineNr"> 991 </span>    e8/call  check-ints-equal/disp32
+<span id="L991" class="LineNr"> 991 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L992" class="LineNr"> 992 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L993" class="LineNr"> 993 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L993" class="LineNr"> 993 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L994" class="LineNr"> 994 </span>    <span class="subxComment"># return if abort</span>
-<span id="L995" class="LineNr"> 995 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L995" class="LineNr"> 995 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L996" class="LineNr"> 996 </span>    75/jump-if-not-equal  $test-scan-next-byte-skips-comment-and-whitespace:end/disp8
 <span id="L997" class="LineNr"> 997 </span>    <span class="subxComment"># check-ints-equal(EAX, 0x61/a, msg)</span>
 <span id="L998" class="LineNr"> 998 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -1066,13 +1062,13 @@ if ('onhashchange' in window) {
 <span id="L1000" class="LineNr">1000 </span>    68/push  0x61/imm32/a
 <span id="L1001" class="LineNr">1001 </span>    50/push-EAX
 <span id="L1002" class="LineNr">1002 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1003" class="LineNr">1003 </span>    e8/call  check-ints-equal/disp32
+<span id="L1003" class="LineNr">1003 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1004" class="LineNr">1004 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1005" class="LineNr">1005 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1005" class="LineNr">1005 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1006" class="LineNr">1006 </span><span class="Constant">$test-scan-next-byte-skips-comment-and-whitespace:end</span>:
 <span id="L1007" class="LineNr">1007 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L1008" class="LineNr">1008 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L1009" class="LineNr">1009 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1009" class="LineNr">1009 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1010" class="LineNr">1010 </span>    5d/pop-to-EBP
 <span id="L1011" class="LineNr">1011 </span>    c3/return
 <span id="L1012" class="LineNr">1012 </span>
@@ -1080,88 +1076,88 @@ if ('onhashchange' in window) {
 <span id="L1014" class="LineNr">1014 </span>    <span class="subxH1Comment"># - check that the first byte after any whitespace and comments is returned</span>
 <span id="L1015" class="LineNr">1015 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L1016" class="LineNr">1016 </span>    55/push-EBP
-<span id="L1017" class="LineNr">1017 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1017" class="LineNr">1017 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L1018" class="LineNr">1018 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L1019" class="LineNr">1019 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L1020" class="LineNr">1020 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1021" class="LineNr">1021 </span>    68/push  _test-stream/imm32
+<span id="L1021" class="LineNr">1021 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1022" class="LineNr">1022 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1023" class="LineNr">1023 </span>    e8/call  clear-stream/disp32
+<span id="L1023" class="LineNr">1023 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1024" class="LineNr">1024 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1025" class="LineNr">1025 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1025" class="LineNr">1025 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1026" class="LineNr">1026 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L1027" class="LineNr">1027 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1028" class="LineNr">1028 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L1028" class="LineNr">1028 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1029" class="LineNr">1029 </span>    05/add-to-EAX  4/imm32
 <span id="L1030" class="LineNr">1030 </span>    50/push-EAX
 <span id="L1031" class="LineNr">1031 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1032" class="LineNr">1032 </span>    e8/call  clear-stream/disp32
+<span id="L1032" class="LineNr">1032 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1033" class="LineNr">1033 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1034" class="LineNr">1034 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1034" class="LineNr">1034 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1035" class="LineNr">1035 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L1036" class="LineNr">1036 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1037" class="LineNr">1037 </span>    68/push  _test-error-stream/imm32
 <span id="L1038" class="LineNr">1038 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1039" class="LineNr">1039 </span>    e8/call  clear-stream/disp32
+<span id="L1039" class="LineNr">1039 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1040" class="LineNr">1040 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1041" class="LineNr">1041 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1041" class="LineNr">1041 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1042" class="LineNr">1042 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L1043" class="LineNr">1043 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1044" class="LineNr">1044 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L1045" class="LineNr">1045 </span>    05/add-to-EAX  4/imm32
 <span id="L1046" class="LineNr">1046 </span>    50/push-EAX
 <span id="L1047" class="LineNr">1047 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1048" class="LineNr">1048 </span>    e8/call  clear-stream/disp32
+<span id="L1048" class="LineNr">1048 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1049" class="LineNr">1049 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1050" class="LineNr">1050 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1050" class="LineNr">1050 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1051" class="LineNr">1051 </span>    <span class="subxComment"># initialize '_test-stream' to input with leading whitespace and comment</span>
 <span id="L1052" class="LineNr">1052 </span>    <span class="subxS1Comment"># . write(_test-stream, comment)</span>
 <span id="L1053" class="LineNr">1053 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1054" class="LineNr">1054 </span>    68/push  <span class="Constant">&quot; #x&quot;</span>/imm32
-<span id="L1055" class="LineNr">1055 </span>    68/push  _test-stream/imm32
+<span id="L1055" class="LineNr">1055 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1056" class="LineNr">1056 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1057" class="LineNr">1057 </span>    e8/call  write/disp32
+<span id="L1057" class="LineNr">1057 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1058" class="LineNr">1058 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1059" class="LineNr">1059 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1059" class="LineNr">1059 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1060" class="LineNr">1060 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
 <span id="L1061" class="LineNr">1061 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1062" class="LineNr">1062 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L1063" class="LineNr">1063 </span>    68/push  _test-stream/imm32
+<span id="L1062" class="LineNr">1062 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L1063" class="LineNr">1063 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1064" class="LineNr">1064 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1065" class="LineNr">1065 </span>    e8/call  write/disp32
+<span id="L1065" class="LineNr">1065 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1066" class="LineNr">1066 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1067" class="LineNr">1067 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1067" class="LineNr">1067 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1068" class="LineNr">1068 </span>    <span class="subxS1Comment"># . write(_test-stream, real text)</span>
 <span id="L1069" class="LineNr">1069 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1070" class="LineNr">1070 </span>    68/push  <span class="Constant">&quot;ab&quot;</span>/imm32
-<span id="L1071" class="LineNr">1071 </span>    68/push  _test-stream/imm32
+<span id="L1071" class="LineNr">1071 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1072" class="LineNr">1072 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1073" class="LineNr">1073 </span>    e8/call  write/disp32
+<span id="L1073" class="LineNr">1073 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1074" class="LineNr">1074 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1075" class="LineNr">1075 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1075" class="LineNr">1075 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1076" class="LineNr">1076 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L1077" class="LineNr">1077 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L1078" class="LineNr">1078 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L1079" class="LineNr">1079 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L1078" class="LineNr">1078 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L1079" class="LineNr">1079 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L1080" class="LineNr">1080 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L1081" class="LineNr">1081 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1082" class="LineNr">1082 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L1083" class="LineNr">1083 </span>    51/push-ECX/ed
 <span id="L1084" class="LineNr">1084 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1085" class="LineNr">1085 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L1085" class="LineNr">1085 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L1086" class="LineNr">1086 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1087" class="LineNr">1087 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1087" class="LineNr">1087 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1088" class="LineNr">1088 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L1089" class="LineNr">1089 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1090" class="LineNr">1090 </span>    51/push-ECX/ed
 <span id="L1091" class="LineNr">1091 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L1092" class="LineNr">1092 </span>    68/push  _test-buffered-file/imm32
+<span id="L1092" class="LineNr">1092 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1093" class="LineNr">1093 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1094" class="LineNr">1094 </span>    e8/call  scan-next-byte/disp32
 <span id="L1095" class="LineNr">1095 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L1096" class="LineNr">1096 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L1097" class="LineNr">1097 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L1098" class="LineNr">1098 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1098" class="LineNr">1098 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1099" class="LineNr">1099 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L1100" class="LineNr">1100 </span>    59/pop-to-ECX
 <span id="L1101" class="LineNr">1101 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -1170,13 +1166,13 @@ if ('onhashchange' in window) {
 <span id="L1104" class="LineNr">1104 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-skips-whitespace-and-comment: unexpected abort&quot;</span>/imm32
 <span id="L1105" class="LineNr">1105 </span>    68/push  0/imm32
 <span id="L1106" class="LineNr">1106 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L1107" class="LineNr">1107 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L1107" class="LineNr">1107 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L1108" class="LineNr">1108 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1109" class="LineNr">1109 </span>    e8/call  check-ints-equal/disp32
+<span id="L1109" class="LineNr">1109 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1110" class="LineNr">1110 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1111" class="LineNr">1111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1111" class="LineNr">1111 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1112" class="LineNr">1112 </span>    <span class="subxComment"># return if abort</span>
-<span id="L1113" class="LineNr">1113 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L1113" class="LineNr">1113 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L1114" class="LineNr">1114 </span>    75/jump-if-not-equal  $test-scan-next-byte-skips-whitespace-and-comment:end/disp8
 <span id="L1115" class="LineNr">1115 </span>    <span class="subxComment"># check-ints-equal(EAX, 0x61/a, msg)</span>
 <span id="L1116" class="LineNr">1116 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -1184,13 +1180,13 @@ if ('onhashchange' in window) {
 <span id="L1118" class="LineNr">1118 </span>    68/push  0x61/imm32/a
 <span id="L1119" class="LineNr">1119 </span>    50/push-EAX
 <span id="L1120" class="LineNr">1120 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1121" class="LineNr">1121 </span>    e8/call  check-ints-equal/disp32
+<span id="L1121" class="LineNr">1121 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1122" class="LineNr">1122 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1123" class="LineNr">1123 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1123" class="LineNr">1123 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1124" class="LineNr">1124 </span><span class="Constant">$test-scan-next-byte-skips-whitespace-and-comment:end</span>:
 <span id="L1125" class="LineNr">1125 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L1126" class="LineNr">1126 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L1127" class="LineNr">1127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1127" class="LineNr">1127 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1128" class="LineNr">1128 </span>    5d/pop-to-EBP
 <span id="L1129" class="LineNr">1129 </span>    c3/return
 <span id="L1130" class="LineNr">1130 </span>
@@ -1198,72 +1194,72 @@ if ('onhashchange' in window) {
 <span id="L1132" class="LineNr">1132 </span>    <span class="subxH1Comment"># - check that the final byte in input is returned</span>
 <span id="L1133" class="LineNr">1133 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L1134" class="LineNr">1134 </span>    55/push-EBP
-<span id="L1135" class="LineNr">1135 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1135" class="LineNr">1135 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L1136" class="LineNr">1136 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L1137" class="LineNr">1137 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L1138" class="LineNr">1138 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1139" class="LineNr">1139 </span>    68/push  _test-stream/imm32
+<span id="L1139" class="LineNr">1139 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1140" class="LineNr">1140 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1141" class="LineNr">1141 </span>    e8/call  clear-stream/disp32
+<span id="L1141" class="LineNr">1141 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1142" class="LineNr">1142 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1143" class="LineNr">1143 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1143" class="LineNr">1143 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1144" class="LineNr">1144 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L1145" class="LineNr">1145 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1146" class="LineNr">1146 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L1146" class="LineNr">1146 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1147" class="LineNr">1147 </span>    05/add-to-EAX  4/imm32
 <span id="L1148" class="LineNr">1148 </span>    50/push-EAX
 <span id="L1149" class="LineNr">1149 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1150" class="LineNr">1150 </span>    e8/call  clear-stream/disp32
+<span id="L1150" class="LineNr">1150 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1151" class="LineNr">1151 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1152" class="LineNr">1152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1152" class="LineNr">1152 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1153" class="LineNr">1153 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L1154" class="LineNr">1154 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1155" class="LineNr">1155 </span>    68/push  _test-error-stream/imm32
 <span id="L1156" class="LineNr">1156 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1157" class="LineNr">1157 </span>    e8/call  clear-stream/disp32
+<span id="L1157" class="LineNr">1157 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1158" class="LineNr">1158 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1159" class="LineNr">1159 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1159" class="LineNr">1159 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1160" class="LineNr">1160 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L1161" class="LineNr">1161 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1162" class="LineNr">1162 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L1163" class="LineNr">1163 </span>    05/add-to-EAX  4/imm32
 <span id="L1164" class="LineNr">1164 </span>    50/push-EAX
 <span id="L1165" class="LineNr">1165 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1166" class="LineNr">1166 </span>    e8/call  clear-stream/disp32
+<span id="L1166" class="LineNr">1166 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1167" class="LineNr">1167 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1168" class="LineNr">1168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1168" class="LineNr">1168 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1169" class="LineNr">1169 </span>    <span class="subxComment"># initialize '_test-stream' to input with single character</span>
 <span id="L1170" class="LineNr">1170 </span>    <span class="subxS1Comment"># . write(_test-stream, character)</span>
 <span id="L1171" class="LineNr">1171 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1172" class="LineNr">1172 </span>    68/push  <span class="Constant">&quot;a&quot;</span>/imm32
-<span id="L1173" class="LineNr">1173 </span>    68/push  _test-stream/imm32
+<span id="L1173" class="LineNr">1173 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1174" class="LineNr">1174 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1175" class="LineNr">1175 </span>    e8/call  write/disp32
+<span id="L1175" class="LineNr">1175 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1176" class="LineNr">1176 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1177" class="LineNr">1177 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1177" class="LineNr">1177 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1178" class="LineNr">1178 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L1179" class="LineNr">1179 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L1180" class="LineNr">1180 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L1181" class="LineNr">1181 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L1180" class="LineNr">1180 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L1181" class="LineNr">1181 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L1182" class="LineNr">1182 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L1183" class="LineNr">1183 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1184" class="LineNr">1184 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L1185" class="LineNr">1185 </span>    51/push-ECX/ed
 <span id="L1186" class="LineNr">1186 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1187" class="LineNr">1187 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L1187" class="LineNr">1187 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L1188" class="LineNr">1188 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1189" class="LineNr">1189 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1189" class="LineNr">1189 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1190" class="LineNr">1190 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L1191" class="LineNr">1191 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1192" class="LineNr">1192 </span>    51/push-ECX/ed
 <span id="L1193" class="LineNr">1193 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L1194" class="LineNr">1194 </span>    68/push  _test-buffered-file/imm32
+<span id="L1194" class="LineNr">1194 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1195" class="LineNr">1195 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1196" class="LineNr">1196 </span>    e8/call  scan-next-byte/disp32
 <span id="L1197" class="LineNr">1197 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L1198" class="LineNr">1198 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L1199" class="LineNr">1199 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L1200" class="LineNr">1200 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1200" class="LineNr">1200 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1201" class="LineNr">1201 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L1202" class="LineNr">1202 </span>    59/pop-to-ECX
 <span id="L1203" class="LineNr">1203 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -1272,13 +1268,13 @@ if ('onhashchange' in window) {
 <span id="L1206" class="LineNr">1206 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-reads-final-byte: unexpected abort&quot;</span>/imm32
 <span id="L1207" class="LineNr">1207 </span>    68/push  0/imm32
 <span id="L1208" class="LineNr">1208 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L1209" class="LineNr">1209 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L1209" class="LineNr">1209 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L1210" class="LineNr">1210 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1211" class="LineNr">1211 </span>    e8/call  check-ints-equal/disp32
+<span id="L1211" class="LineNr">1211 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1212" class="LineNr">1212 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1213" class="LineNr">1213 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1213" class="LineNr">1213 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1214" class="LineNr">1214 </span>    <span class="subxComment"># return if abort</span>
-<span id="L1215" class="LineNr">1215 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L1215" class="LineNr">1215 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L1216" class="LineNr">1216 </span>    75/jump-if-not-equal  $test-scan-next-byte-reads-final-byte:end/disp8
 <span id="L1217" class="LineNr">1217 </span>    <span class="subxComment"># check-ints-equal(EAX, 0x61/a, msg)</span>
 <span id="L1218" class="LineNr">1218 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -1286,13 +1282,13 @@ if ('onhashchange' in window) {
 <span id="L1220" class="LineNr">1220 </span>    68/push  0x61/imm32/a
 <span id="L1221" class="LineNr">1221 </span>    50/push-EAX
 <span id="L1222" class="LineNr">1222 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1223" class="LineNr">1223 </span>    e8/call  check-ints-equal/disp32
+<span id="L1223" class="LineNr">1223 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1224" class="LineNr">1224 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1225" class="LineNr">1225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1225" class="LineNr">1225 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1226" class="LineNr">1226 </span><span class="Constant">$test-scan-next-byte-reads-final-byte:end</span>:
 <span id="L1227" class="LineNr">1227 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L1228" class="LineNr">1228 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L1229" class="LineNr">1229 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1229" class="LineNr">1229 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1230" class="LineNr">1230 </span>    5d/pop-to-EBP
 <span id="L1231" class="LineNr">1231 </span>    c3/return
 <span id="L1232" class="LineNr">1232 </span>
@@ -1300,64 +1296,64 @@ if ('onhashchange' in window) {
 <span id="L1234" class="LineNr">1234 </span>    <span class="subxH1Comment"># - check that the right sentinel value is returned when there's no data remaining to be read</span>
 <span id="L1235" class="LineNr">1235 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L1236" class="LineNr">1236 </span>    55/push-EBP
-<span id="L1237" class="LineNr">1237 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1237" class="LineNr">1237 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L1238" class="LineNr">1238 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L1239" class="LineNr">1239 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L1240" class="LineNr">1240 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1241" class="LineNr">1241 </span>    68/push  _test-stream/imm32
+<span id="L1241" class="LineNr">1241 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1242" class="LineNr">1242 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1243" class="LineNr">1243 </span>    e8/call  clear-stream/disp32
+<span id="L1243" class="LineNr">1243 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1244" class="LineNr">1244 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1245" class="LineNr">1245 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1245" class="LineNr">1245 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1246" class="LineNr">1246 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L1247" class="LineNr">1247 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1248" class="LineNr">1248 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L1248" class="LineNr">1248 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1249" class="LineNr">1249 </span>    05/add-to-EAX  4/imm32
 <span id="L1250" class="LineNr">1250 </span>    50/push-EAX
 <span id="L1251" class="LineNr">1251 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1252" class="LineNr">1252 </span>    e8/call  clear-stream/disp32
+<span id="L1252" class="LineNr">1252 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1253" class="LineNr">1253 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1254" class="LineNr">1254 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1254" class="LineNr">1254 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1255" class="LineNr">1255 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L1256" class="LineNr">1256 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1257" class="LineNr">1257 </span>    68/push  _test-error-stream/imm32
 <span id="L1258" class="LineNr">1258 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1259" class="LineNr">1259 </span>    e8/call  clear-stream/disp32
+<span id="L1259" class="LineNr">1259 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1260" class="LineNr">1260 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1261" class="LineNr">1261 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1261" class="LineNr">1261 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1262" class="LineNr">1262 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L1263" class="LineNr">1263 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1264" class="LineNr">1264 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L1265" class="LineNr">1265 </span>    05/add-to-EAX  4/imm32
 <span id="L1266" class="LineNr">1266 </span>    50/push-EAX
 <span id="L1267" class="LineNr">1267 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1268" class="LineNr">1268 </span>    e8/call  clear-stream/disp32
+<span id="L1268" class="LineNr">1268 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1269" class="LineNr">1269 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1270" class="LineNr">1270 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1270" class="LineNr">1270 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1271" class="LineNr">1271 </span>    <span class="subxComment"># leave '_test-stream' empty</span>
 <span id="L1272" class="LineNr">1272 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L1273" class="LineNr">1273 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L1274" class="LineNr">1274 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L1275" class="LineNr">1275 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L1274" class="LineNr">1274 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L1275" class="LineNr">1275 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L1276" class="LineNr">1276 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L1277" class="LineNr">1277 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1278" class="LineNr">1278 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L1279" class="LineNr">1279 </span>    51/push-ECX/ed
 <span id="L1280" class="LineNr">1280 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1281" class="LineNr">1281 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L1281" class="LineNr">1281 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L1282" class="LineNr">1282 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1283" class="LineNr">1283 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1283" class="LineNr">1283 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1284" class="LineNr">1284 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L1285" class="LineNr">1285 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1286" class="LineNr">1286 </span>    51/push-ECX/ed
 <span id="L1287" class="LineNr">1287 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L1288" class="LineNr">1288 </span>    68/push  _test-buffered-file/imm32
+<span id="L1288" class="LineNr">1288 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1289" class="LineNr">1289 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1290" class="LineNr">1290 </span>    e8/call  scan-next-byte/disp32
 <span id="L1291" class="LineNr">1291 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L1292" class="LineNr">1292 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L1293" class="LineNr">1293 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L1294" class="LineNr">1294 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1294" class="LineNr">1294 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1295" class="LineNr">1295 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L1296" class="LineNr">1296 </span>    59/pop-to-ECX
 <span id="L1297" class="LineNr">1297 </span>    <span class="subxComment"># check that scan-next-byte didn't abort</span>
@@ -1366,13 +1362,13 @@ if ('onhashchange' in window) {
 <span id="L1300" class="LineNr">1300 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-handles-eof: unexpected abort&quot;</span>/imm32
 <span id="L1301" class="LineNr">1301 </span>    68/push  0/imm32
 <span id="L1302" class="LineNr">1302 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L1303" class="LineNr">1303 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L1303" class="LineNr">1303 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L1304" class="LineNr">1304 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1305" class="LineNr">1305 </span>    e8/call  check-ints-equal/disp32
+<span id="L1305" class="LineNr">1305 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1306" class="LineNr">1306 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1307" class="LineNr">1307 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1307" class="LineNr">1307 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1308" class="LineNr">1308 </span>    <span class="subxComment"># return if abort</span>
-<span id="L1309" class="LineNr">1309 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
+<span id="L1309" class="LineNr">1309 </span>    81          7/subop/compare     1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8         0/imm32           <span class="subxComment"># compare *(ECX+4)</span>
 <span id="L1310" class="LineNr">1310 </span>    75/jump-if-not-equal  $test-scan-next-byte-handles-eof:end/disp8
 <span id="L1311" class="LineNr">1311 </span>    <span class="subxComment"># check-ints-equal(EAX, 0xffffffff/eof, msg)</span>
 <span id="L1312" class="LineNr">1312 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -1380,13 +1376,13 @@ if ('onhashchange' in window) {
 <span id="L1314" class="LineNr">1314 </span>    68/push  0xffffffff/imm32/eof
 <span id="L1315" class="LineNr">1315 </span>    50/push-EAX
 <span id="L1316" class="LineNr">1316 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1317" class="LineNr">1317 </span>    e8/call  check-ints-equal/disp32
+<span id="L1317" class="LineNr">1317 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1318" class="LineNr">1318 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1319" class="LineNr">1319 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1319" class="LineNr">1319 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1320" class="LineNr">1320 </span><span class="Constant">$test-scan-next-byte-handles-eof:end</span>:
 <span id="L1321" class="LineNr">1321 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L1322" class="LineNr">1322 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L1323" class="LineNr">1323 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1323" class="LineNr">1323 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1324" class="LineNr">1324 </span>    5d/pop-to-EBP
 <span id="L1325" class="LineNr">1325 </span>    c3/return
 <span id="L1326" class="LineNr">1326 </span>
@@ -1394,72 +1390,72 @@ if ('onhashchange' in window) {
 <span id="L1328" class="LineNr">1328 </span>    <span class="subxH1Comment"># - check that the a bad byte immediately aborts</span>
 <span id="L1329" class="LineNr">1329 </span>    <span class="subxComment"># This test uses exit-descriptors. Use EBP for setting up local variables.</span>
 <span id="L1330" class="LineNr">1330 </span>    55/push-EBP
-<span id="L1331" class="LineNr">1331 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1331" class="LineNr">1331 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L1332" class="LineNr">1332 </span>    <span class="subxComment"># clear all streams</span>
 <span id="L1333" class="LineNr">1333 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L1334" class="LineNr">1334 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1335" class="LineNr">1335 </span>    68/push  _test-stream/imm32
+<span id="L1335" class="LineNr">1335 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1336" class="LineNr">1336 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1337" class="LineNr">1337 </span>    e8/call  clear-stream/disp32
+<span id="L1337" class="LineNr">1337 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1338" class="LineNr">1338 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1339" class="LineNr">1339 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1339" class="LineNr">1339 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1340" class="LineNr">1340 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L1341" class="LineNr">1341 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1342" class="LineNr">1342 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L1342" class="LineNr">1342 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1343" class="LineNr">1343 </span>    05/add-to-EAX  4/imm32
 <span id="L1344" class="LineNr">1344 </span>    50/push-EAX
 <span id="L1345" class="LineNr">1345 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1346" class="LineNr">1346 </span>    e8/call  clear-stream/disp32
+<span id="L1346" class="LineNr">1346 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1347" class="LineNr">1347 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1348" class="LineNr">1348 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1348" class="LineNr">1348 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1349" class="LineNr">1349 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-stream)</span>
 <span id="L1350" class="LineNr">1350 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1351" class="LineNr">1351 </span>    68/push  _test-error-stream/imm32
 <span id="L1352" class="LineNr">1352 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1353" class="LineNr">1353 </span>    e8/call  clear-stream/disp32
+<span id="L1353" class="LineNr">1353 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1354" class="LineNr">1354 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1355" class="LineNr">1355 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1355" class="LineNr">1355 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1356" class="LineNr">1356 </span>    <span class="subxS1Comment"># . clear-stream(_test-error-buffered-file+4)</span>
 <span id="L1357" class="LineNr">1357 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1358" class="LineNr">1358 </span>    b8/copy-to-EAX  _test-error-buffered-file/imm32
 <span id="L1359" class="LineNr">1359 </span>    05/add-to-EAX  4/imm32
 <span id="L1360" class="LineNr">1360 </span>    50/push-EAX
 <span id="L1361" class="LineNr">1361 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1362" class="LineNr">1362 </span>    e8/call  clear-stream/disp32
+<span id="L1362" class="LineNr">1362 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1363" class="LineNr">1363 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1364" class="LineNr">1364 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1364" class="LineNr">1364 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1365" class="LineNr">1365 </span>    <span class="subxComment"># initialize '_test-stream' to &quot;x&quot;</span>
 <span id="L1366" class="LineNr">1366 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;x&quot;)</span>
 <span id="L1367" class="LineNr">1367 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1368" class="LineNr">1368 </span>    68/push  <span class="Constant">&quot;x&quot;</span>/imm32
-<span id="L1369" class="LineNr">1369 </span>    68/push  _test-stream/imm32
+<span id="L1369" class="LineNr">1369 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1370" class="LineNr">1370 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1371" class="LineNr">1371 </span>    e8/call  write/disp32
+<span id="L1371" class="LineNr">1371 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1372" class="LineNr">1372 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1373" class="LineNr">1373 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1373" class="LineNr">1373 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1374" class="LineNr">1374 </span>    <span class="subxComment"># initialize exit-descriptor 'ed' for the call to 'scan-next-byte' below</span>
 <span id="L1375" class="LineNr">1375 </span>    <span class="subxS1Comment"># . var ed/ECX : exit-descriptor</span>
-<span id="L1376" class="LineNr">1376 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
-<span id="L1377" class="LineNr">1377 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
+<span id="L1376" class="LineNr">1376 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L1377" class="LineNr">1377 </span>    89/copy                         3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to ECX</span>
 <span id="L1378" class="LineNr">1378 </span>    <span class="subxS1Comment"># . tailor-exit-descriptor(ed, 12)</span>
 <span id="L1379" class="LineNr">1379 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1380" class="LineNr">1380 </span>    68/push  0xc/imm32/nbytes-of-args-for-scan-next-byte
 <span id="L1381" class="LineNr">1381 </span>    51/push-ECX/ed
 <span id="L1382" class="LineNr">1382 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1383" class="LineNr">1383 </span>    e8/call  tailor-exit-descriptor/disp32
+<span id="L1383" class="LineNr">1383 </span>    e8/call  <a href='057stop.subx.html#L51'>tailor-exit-descriptor</a>/disp32
 <span id="L1384" class="LineNr">1384 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1385" class="LineNr">1385 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1385" class="LineNr">1385 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1386" class="LineNr">1386 </span>    <span class="subxComment"># EAX = scan-next-byte(_test-buffered-file, _test-error-buffered-file, ed)</span>
 <span id="L1387" class="LineNr">1387 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1388" class="LineNr">1388 </span>    51/push-ECX/ed
 <span id="L1389" class="LineNr">1389 </span>    68/push  _test-error-buffered-file/imm32
-<span id="L1390" class="LineNr">1390 </span>    68/push  _test-buffered-file/imm32
+<span id="L1390" class="LineNr">1390 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1391" class="LineNr">1391 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1392" class="LineNr">1392 </span>    e8/call  scan-next-byte/disp32
 <span id="L1393" class="LineNr">1393 </span>    <span class="subxComment"># registers except ESP may be clobbered at this point</span>
 <span id="L1394" class="LineNr">1394 </span>    <span class="subxComment"># pop args to scan-next-byte</span>
 <span id="L1395" class="LineNr">1395 </span>    <span class="subxS2Comment"># . . discard first 2 args</span>
-<span id="L1396" class="LineNr">1396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1396" class="LineNr">1396 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1397" class="LineNr">1397 </span>    <span class="subxS2Comment"># . . restore ed</span>
 <span id="L1398" class="LineNr">1398 </span>    59/pop-to-ECX
 <span id="L1399" class="LineNr">1399 </span>    <span class="subxComment"># check that scan-next-byte aborted</span>
@@ -1468,39 +1464,39 @@ if ('onhashchange' in window) {
 <span id="L1402" class="LineNr">1402 </span>    68/push  <span class="Constant">&quot;F - test-scan-next-byte-aborts-on-invalid-byte&quot;</span>/imm32
 <span id="L1403" class="LineNr">1403 </span>    68/push  2/imm32
 <span id="L1404" class="LineNr">1404 </span>    <span class="subxS2Comment"># . . push ed-&gt;value</span>
-<span id="L1405" class="LineNr">1405 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
+<span id="L1405" class="LineNr">1405 </span>    ff          6/subop/push        1/mod/*+disp8   1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(ECX+4)</span>
 <span id="L1406" class="LineNr">1406 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1407" class="LineNr">1407 </span>    e8/call  check-ints-equal/disp32
+<span id="L1407" class="LineNr">1407 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1408" class="LineNr">1408 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1409" class="LineNr">1409 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1409" class="LineNr">1409 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1410" class="LineNr">1410 </span><span class="Constant">$test-scan-next-byte-aborts-on-invalid-byte:end</span>:
 <span id="L1411" class="LineNr">1411 </span>    <span class="subxS1Comment"># . epilog</span>
 <span id="L1412" class="LineNr">1412 </span>    <span class="subxComment"># don't restore ESP from EBP; manually reclaim locals</span>
-<span id="L1413" class="LineNr">1413 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1413" class="LineNr">1413 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1414" class="LineNr">1414 </span>    5d/pop-to-EBP
 <span id="L1415" class="LineNr">1415 </span>    c3/return
 <span id="L1416" class="LineNr">1416 </span>
 <span id="L1417" class="LineNr">1417 </span><span class="subxFunction">is-hex-lowercase-byte?</span>:  <span class="subxComment"># c : byte -&gt; bool/EAX</span>
 <span id="L1418" class="LineNr">1418 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L1419" class="LineNr">1419 </span>    55/push-EBP
-<span id="L1420" class="LineNr">1420 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1420" class="LineNr">1420 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L1421" class="LineNr">1421 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L1422" class="LineNr">1422 </span>    51/push-ECX
 <span id="L1423" class="LineNr">1423 </span>    <span class="subxComment"># ECX = c</span>
-<span id="L1424" class="LineNr">1424 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
+<span id="L1424" class="LineNr">1424 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to ECX</span>
 <span id="L1425" class="LineNr">1425 </span>    <span class="subxComment"># return false if c &lt; '0'</span>
 <span id="L1426" class="LineNr">1426 </span>    b8/copy-to-EAX  0/imm32/false
-<span id="L1427" class="LineNr">1427 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x30/imm32        <span class="subxComment"># compare ECX</span>
+<span id="L1427" class="LineNr">1427 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x30/imm32        <span class="subxComment"># compare ECX</span>
 <span id="L1428" class="LineNr">1428 </span>    7c/jump-if-lesser  $is-hex-lowercase-byte?:end/disp8
 <span id="L1429" class="LineNr">1429 </span>    <span class="subxComment"># return false if c &gt; 'f'</span>
-<span id="L1430" class="LineNr">1430 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x66/imm32        <span class="subxComment"># compare ECX</span>
+<span id="L1430" class="LineNr">1430 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x66/imm32        <span class="subxComment"># compare ECX</span>
 <span id="L1431" class="LineNr">1431 </span>    7f/jump-if-greater  $is-hex-lowercase-byte?:end/disp8
 <span id="L1432" class="LineNr">1432 </span>    <span class="subxComment"># return true if c &lt;= '9'</span>
 <span id="L1433" class="LineNr">1433 </span>    b8/copy-to-EAX  1/imm32/true
-<span id="L1434" class="LineNr">1434 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x39/imm32        <span class="subxComment"># compare ECX</span>
+<span id="L1434" class="LineNr">1434 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x39/imm32        <span class="subxComment"># compare ECX</span>
 <span id="L1435" class="LineNr">1435 </span>    7e/jump-if-lesser-or-equal  $is-hex-lowercase-byte?:end/disp8
 <span id="L1436" class="LineNr">1436 </span>    <span class="subxComment"># return true if c &gt;= 'a'</span>
-<span id="L1437" class="LineNr">1437 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x61/imm32        <span class="subxComment"># compare ECX</span>
+<span id="L1437" class="LineNr">1437 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x61/imm32        <span class="subxComment"># compare ECX</span>
 <span id="L1438" class="LineNr">1438 </span>    7d/jump-if-greater-or-equal  $is-hex-lowercase-byte?:end/disp8
 <span id="L1439" class="LineNr">1439 </span>    <span class="subxComment"># otherwise return false</span>
 <span id="L1440" class="LineNr">1440 </span>    b8/copy-to-EAX  0/imm32/false
@@ -1508,7 +1504,7 @@ if ('onhashchange' in window) {
 <span id="L1442" class="LineNr">1442 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L1443" class="LineNr">1443 </span>    59/pop-to-ECX
 <span id="L1444" class="LineNr">1444 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1445" class="LineNr">1445 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1445" class="LineNr">1445 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L1446" class="LineNr">1446 </span>    5d/pop-to-EBP
 <span id="L1447" class="LineNr">1447 </span>    c3/return
 <span id="L1448" class="LineNr">1448 </span>
@@ -1519,16 +1515,16 @@ if ('onhashchange' in window) {
 <span id="L1453" class="LineNr">1453 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1454" class="LineNr">1454 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1455" class="LineNr">1455 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1456" class="LineNr">1456 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1456" class="LineNr">1456 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1457" class="LineNr">1457 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L1458" class="LineNr">1458 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1459" class="LineNr">1459 </span>    68/push  <span class="Constant">&quot;F - test-hex-below-0&quot;</span>/imm32
 <span id="L1460" class="LineNr">1460 </span>    68/push  0/imm32/false
 <span id="L1461" class="LineNr">1461 </span>    50/push-EAX
 <span id="L1462" class="LineNr">1462 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1463" class="LineNr">1463 </span>    e8/call  check-ints-equal/disp32
+<span id="L1463" class="LineNr">1463 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1464" class="LineNr">1464 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1465" class="LineNr">1465 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1465" class="LineNr">1465 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1466" class="LineNr">1466 </span>    c3/return
 <span id="L1467" class="LineNr">1467 </span>
 <span id="L1468" class="LineNr">1468 </span><span class="subxTest">test-hex-0-to-9</span>:
@@ -1538,32 +1534,32 @@ if ('onhashchange' in window) {
 <span id="L1472" class="LineNr">1472 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1473" class="LineNr">1473 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1474" class="LineNr">1474 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1475" class="LineNr">1475 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1475" class="LineNr">1475 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1476" class="LineNr">1476 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L1477" class="LineNr">1477 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1478" class="LineNr">1478 </span>    68/push  <span class="Constant">&quot;F - test-hex-at-0&quot;</span>/imm32
 <span id="L1479" class="LineNr">1479 </span>    68/push  1/imm32/true
 <span id="L1480" class="LineNr">1480 </span>    50/push-EAX
 <span id="L1481" class="LineNr">1481 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1482" class="LineNr">1482 </span>    e8/call  check-ints-equal/disp32
+<span id="L1482" class="LineNr">1482 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1483" class="LineNr">1483 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1484" class="LineNr">1484 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1484" class="LineNr">1484 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1485" class="LineNr">1485 </span>    <span class="subxComment"># is-hex-lowercase-byte?(0x39)</span>
 <span id="L1486" class="LineNr">1486 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1487" class="LineNr">1487 </span>    68/push  0x39/imm32
 <span id="L1488" class="LineNr">1488 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1489" class="LineNr">1489 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1490" class="LineNr">1490 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1491" class="LineNr">1491 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1491" class="LineNr">1491 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1492" class="LineNr">1492 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L1493" class="LineNr">1493 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1494" class="LineNr">1494 </span>    68/push  <span class="Constant">&quot;F - test-hex-at-9&quot;</span>/imm32
 <span id="L1495" class="LineNr">1495 </span>    68/push  1/imm32/true
 <span id="L1496" class="LineNr">1496 </span>    50/push-EAX
 <span id="L1497" class="LineNr">1497 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1498" class="LineNr">1498 </span>    e8/call  check-ints-equal/disp32
+<span id="L1498" class="LineNr">1498 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1499" class="LineNr">1499 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1500" class="LineNr">1500 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1500" class="LineNr">1500 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1501" class="LineNr">1501 </span>    c3/return
 <span id="L1502" class="LineNr">1502 </span>
 <span id="L1503" class="LineNr">1503 </span><span class="subxTest">test-hex-above-9-to-a</span>:
@@ -1573,16 +1569,16 @@ if ('onhashchange' in window) {
 <span id="L1507" class="LineNr">1507 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1508" class="LineNr">1508 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1509" class="LineNr">1509 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1510" class="LineNr">1510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1510" class="LineNr">1510 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1511" class="LineNr">1511 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L1512" class="LineNr">1512 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1513" class="LineNr">1513 </span>    68/push  <span class="Constant">&quot;F - test-hex-above-9-to-a&quot;</span>/imm32
 <span id="L1514" class="LineNr">1514 </span>    68/push  0/imm32/false
 <span id="L1515" class="LineNr">1515 </span>    50/push-EAX
 <span id="L1516" class="LineNr">1516 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1517" class="LineNr">1517 </span>    e8/call  check-ints-equal/disp32
+<span id="L1517" class="LineNr">1517 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1518" class="LineNr">1518 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1519" class="LineNr">1519 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1519" class="LineNr">1519 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1520" class="LineNr">1520 </span>    c3/return
 <span id="L1521" class="LineNr">1521 </span>
 <span id="L1522" class="LineNr">1522 </span><span class="subxTest">test-hex-a-to-f</span>:
@@ -1592,32 +1588,32 @@ if ('onhashchange' in window) {
 <span id="L1526" class="LineNr">1526 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1527" class="LineNr">1527 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1528" class="LineNr">1528 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1529" class="LineNr">1529 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1529" class="LineNr">1529 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1530" class="LineNr">1530 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L1531" class="LineNr">1531 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1532" class="LineNr">1532 </span>    68/push  <span class="Constant">&quot;F - test-hex-at-a&quot;</span>/imm32
 <span id="L1533" class="LineNr">1533 </span>    68/push  1/imm32/true
 <span id="L1534" class="LineNr">1534 </span>    50/push-EAX
 <span id="L1535" class="LineNr">1535 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1536" class="LineNr">1536 </span>    e8/call  check-ints-equal/disp32
+<span id="L1536" class="LineNr">1536 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1537" class="LineNr">1537 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1538" class="LineNr">1538 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1538" class="LineNr">1538 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1539" class="LineNr">1539 </span>    <span class="subxComment"># is-hex-lowercase-byte?(0x66)</span>
 <span id="L1540" class="LineNr">1540 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1541" class="LineNr">1541 </span>    68/push  0x66/imm32
 <span id="L1542" class="LineNr">1542 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1543" class="LineNr">1543 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1544" class="LineNr">1544 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1545" class="LineNr">1545 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1545" class="LineNr">1545 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1546" class="LineNr">1546 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L1547" class="LineNr">1547 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1548" class="LineNr">1548 </span>    68/push  <span class="Constant">&quot;F - test-hex-at-f&quot;</span>/imm32
 <span id="L1549" class="LineNr">1549 </span>    68/push  1/imm32/true
 <span id="L1550" class="LineNr">1550 </span>    50/push-EAX
 <span id="L1551" class="LineNr">1551 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1552" class="LineNr">1552 </span>    e8/call  check-ints-equal/disp32
+<span id="L1552" class="LineNr">1552 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1553" class="LineNr">1553 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1554" class="LineNr">1554 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1554" class="LineNr">1554 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1555" class="LineNr">1555 </span>    c3/return
 <span id="L1556" class="LineNr">1556 </span>
 <span id="L1557" class="LineNr">1557 </span><span class="subxTest">test-hex-above-f</span>:
@@ -1627,16 +1623,16 @@ if ('onhashchange' in window) {
 <span id="L1561" class="LineNr">1561 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1562" class="LineNr">1562 </span>    e8/call  is-hex-lowercase-byte?/disp32
 <span id="L1563" class="LineNr">1563 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1564" class="LineNr">1564 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1564" class="LineNr">1564 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1565" class="LineNr">1565 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L1566" class="LineNr">1566 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1567" class="LineNr">1567 </span>    68/push  <span class="Constant">&quot;F - test-hex-above-f&quot;</span>/imm32
 <span id="L1568" class="LineNr">1568 </span>    68/push  0/imm32/false
 <span id="L1569" class="LineNr">1569 </span>    50/push-EAX
 <span id="L1570" class="LineNr">1570 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1571" class="LineNr">1571 </span>    e8/call  check-ints-equal/disp32
+<span id="L1571" class="LineNr">1571 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1572" class="LineNr">1572 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1573" class="LineNr">1573 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1573" class="LineNr">1573 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1574" class="LineNr">1574 </span>    c3/return
 <span id="L1575" class="LineNr">1575 </span>
 <span id="L1576" class="LineNr">1576 </span><span class="subxFunction">parse-hex-digit</span>:  <span class="subxComment"># in/EAX : byte -&gt; out/EAX : num</span>
@@ -1661,28 +1657,28 @@ if ('onhashchange' in window) {
 <span id="L1595" class="LineNr">1595 </span>    <span class="subxComment">#   pop EAX</span>
 <span id="L1596" class="LineNr">1596 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L1597" class="LineNr">1597 </span>    55/push-EBP
-<span id="L1598" class="LineNr">1598 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L1598" class="LineNr">1598 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L1599" class="LineNr">1599 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L1600" class="LineNr">1600 </span>    50/push-EAX
 <span id="L1601" class="LineNr">1601 </span><span class="Constant">$skip-until-newline:loop</span>:
 <span id="L1602" class="LineNr">1602 </span>    <span class="subxS1Comment"># . EAX = read-byte(in)</span>
 <span id="L1603" class="LineNr">1603 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1604" class="LineNr">1604 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L1604" class="LineNr">1604 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L1605" class="LineNr">1605 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1606" class="LineNr">1606 </span>    e8/call  read-byte/disp32
+<span id="L1606" class="LineNr">1606 </span>    e8/call  <a href='059read-byte.subx.html#L45'>read-byte</a>/disp32
 <span id="L1607" class="LineNr">1607 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1608" class="LineNr">1608 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1608" class="LineNr">1608 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1609" class="LineNr">1609 </span>    <span class="subxS1Comment"># . if EAX == 0xffffffff break</span>
-<span id="L1610" class="LineNr">1610 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
+<span id="L1610" class="LineNr">1610 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xffffffff/imm32  <span class="subxComment"># compare EAX</span>
 <span id="L1611" class="LineNr">1611 </span>    74/jump-if-equal  $skip-until-newline:end/disp8
 <span id="L1612" class="LineNr">1612 </span>    <span class="subxS1Comment"># . if EAX != 0xa/newline loop</span>
-<span id="L1613" class="LineNr">1613 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
+<span id="L1613" class="LineNr">1613 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32         <span class="subxComment"># compare EAX</span>
 <span id="L1614" class="LineNr">1614 </span>    75/jump-if-not-equal  $skip-until-newline:loop/disp8
 <span id="L1615" class="LineNr">1615 </span><span class="Constant">$skip-until-newline:end</span>:
 <span id="L1616" class="LineNr">1616 </span>    <span class="subxS1Comment"># . restore registers</span>
 <span id="L1617" class="LineNr">1617 </span>    58/pop-to-EAX
 <span id="L1618" class="LineNr">1618 </span>    <span class="subxS1Comment"># . epilog</span>
-<span id="L1619" class="LineNr">1619 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L1619" class="LineNr">1619 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
 <span id="L1620" class="LineNr">1620 </span>    5d/pop-to-EBP
 <span id="L1621" class="LineNr">1621 </span>    c3/return
 <span id="L1622" class="LineNr">1622 </span>
@@ -1691,62 +1687,62 @@ if ('onhashchange' in window) {
 <span id="L1625" class="LineNr">1625 </span>    <span class="subxComment"># setup</span>
 <span id="L1626" class="LineNr">1626 </span>    <span class="subxS1Comment"># . clear-stream(_test-stream)</span>
 <span id="L1627" class="LineNr">1627 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1628" class="LineNr">1628 </span>    68/push  _test-stream/imm32
+<span id="L1628" class="LineNr">1628 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1629" class="LineNr">1629 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1630" class="LineNr">1630 </span>    e8/call  clear-stream/disp32
+<span id="L1630" class="LineNr">1630 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1631" class="LineNr">1631 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1632" class="LineNr">1632 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1632" class="LineNr">1632 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1633" class="LineNr">1633 </span>    <span class="subxS1Comment"># . clear-stream(_test-buffered-file+4)</span>
 <span id="L1634" class="LineNr">1634 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1635" class="LineNr">1635 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
+<span id="L1635" class="LineNr">1635 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1636" class="LineNr">1636 </span>    05/add-to-EAX  4/imm32
 <span id="L1637" class="LineNr">1637 </span>    50/push-EAX
 <span id="L1638" class="LineNr">1638 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1639" class="LineNr">1639 </span>    e8/call  clear-stream/disp32
+<span id="L1639" class="LineNr">1639 </span>    e8/call  <a href='056write.subx.html#L85'>clear-stream</a>/disp32
 <span id="L1640" class="LineNr">1640 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1641" class="LineNr">1641 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1641" class="LineNr">1641 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1642" class="LineNr">1642 </span>    <span class="subxComment"># initialize '_test-stream' to &quot;abc\nde&quot;</span>
 <span id="L1643" class="LineNr">1643 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;abc&quot;)</span>
 <span id="L1644" class="LineNr">1644 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1645" class="LineNr">1645 </span>    68/push  <span class="Constant">&quot;abc&quot;</span>/imm32
-<span id="L1646" class="LineNr">1646 </span>    68/push  _test-stream/imm32
+<span id="L1646" class="LineNr">1646 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1647" class="LineNr">1647 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1648" class="LineNr">1648 </span>    e8/call  write/disp32
+<span id="L1648" class="LineNr">1648 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1649" class="LineNr">1649 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1650" class="LineNr">1650 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1650" class="LineNr">1650 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1651" class="LineNr">1651 </span>    <span class="subxS1Comment"># . write(_test-stream, Newline)</span>
 <span id="L1652" class="LineNr">1652 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1653" class="LineNr">1653 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
-<span id="L1654" class="LineNr">1654 </span>    68/push  _test-stream/imm32
+<span id="L1653" class="LineNr">1653 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
+<span id="L1654" class="LineNr">1654 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1655" class="LineNr">1655 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1656" class="LineNr">1656 </span>    e8/call  write/disp32
+<span id="L1656" class="LineNr">1656 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1657" class="LineNr">1657 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1658" class="LineNr">1658 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1658" class="LineNr">1658 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1659" class="LineNr">1659 </span>    <span class="subxS1Comment"># . write(_test-stream, &quot;de&quot;)</span>
 <span id="L1660" class="LineNr">1660 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1661" class="LineNr">1661 </span>    68/push  <span class="Constant">&quot;de&quot;</span>/imm32
-<span id="L1662" class="LineNr">1662 </span>    68/push  _test-stream/imm32
+<span id="L1662" class="LineNr">1662 </span>    68/push  <a href='056write.subx.html#L193'>_test-stream</a>/imm32
 <span id="L1663" class="LineNr">1663 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1664" class="LineNr">1664 </span>    e8/call  write/disp32
+<span id="L1664" class="LineNr">1664 </span>    e8/call  <a href='056write.subx.html#L31'>write</a>/disp32
 <span id="L1665" class="LineNr">1665 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1666" class="LineNr">1666 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1666" class="LineNr">1666 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1667" class="LineNr">1667 </span>    <span class="subxComment"># skip-until-newline(_test-buffered-file)</span>
 <span id="L1668" class="LineNr">1668 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L1669" class="LineNr">1669 </span>    68/push  _test-buffered-file/imm32
+<span id="L1669" class="LineNr">1669 </span>    68/push  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
 <span id="L1670" class="LineNr">1670 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L1671" class="LineNr">1671 </span>    e8/call  skip-until-newline/disp32
 <span id="L1672" class="LineNr">1672 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1673" class="LineNr">1673 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L1673" class="LineNr">1673 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L1674" class="LineNr">1674 </span>    <span class="subxComment"># check-ints-equal(_test-buffered-file-&gt;read, 4, msg)</span>
 <span id="L1675" class="LineNr">1675 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L1676" class="LineNr">1676 </span>    68/push  <span class="Constant">&quot;F - test-skip-until-newline&quot;</span>/imm32
 <span id="L1677" class="LineNr">1677 </span>    68/push  4/imm32
-<span id="L1678" class="LineNr">1678 </span>    b8/copy-to-EAX  _test-buffered-file/imm32
-<span id="L1679" class="LineNr">1679 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EAX+8)</span>
+<span id="L1678" class="LineNr">1678 </span>    b8/copy-to-EAX  <a href='059read-byte.subx.html#L290'>_test-buffered-file</a>/imm32
+<span id="L1679" class="LineNr">1679 </span>    ff          6/subop/push        1/mod/*+disp8   0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EAX+8)</span>
 <span id="L1680" class="LineNr">1680 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L1681" class="LineNr">1681 </span>    e8/call  check-ints-equal/disp32
+<span id="L1681" class="LineNr">1681 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L1682" class="LineNr">1682 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L1683" class="LineNr">1683 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L1683" class="LineNr">1683 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
 <span id="L1684" class="LineNr">1684 </span>    <span class="subxS1Comment"># . end</span>
 <span id="L1685" class="LineNr">1685 </span>    c3/return
 <span id="L1686" class="LineNr">1686 </span>
diff --git a/html/subx/examples/ex1.subx.html b/html/subx/examples/ex1.subx.html
index b72d5054..a1707447 100644
--- a/html/subx/examples/ex1.subx.html
+++ b/html/subx/examples/ex1.subx.html
@@ -7,20 +7,15 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
 -->
 </style>
 
diff --git a/html/subx/examples/ex10.subx.html b/html/subx/examples/ex10.subx.html
index ae437909..cdca2942 100644
--- a/html/subx/examples/ex10.subx.html
+++ b/html/subx/examples/ex10.subx.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -81,37 +76,37 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr">19 </span><span class="subxComment">#         argv[1]: *(ESP+8)</span>
 <span id="L20" class="LineNr">20 </span><span class="subxComment">#         ...</span>
 <span id="L21" class="LineNr">21 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L22" class="LineNr">22 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L22" class="LineNr">22 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L23" class="LineNr">23 </span>    <span class="subxComment"># argv-equal(argv[1], argv[2])</span>
 <span id="L24" class="LineNr">24 </span>    <span class="subxS2Comment"># . . 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L25" class="LineNr">25 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L26" class="LineNr">26 </span>    <span class="subxS2Comment"># . . 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L27" class="LineNr">27 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L28" class="LineNr">28 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L29" class="LineNr">29 </span>    e8/call argv-equal/disp32
 <span id="L30" class="LineNr">30 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L31" class="LineNr">31 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
-<span id="L32" class="LineNr">32 </span>    b8/copy-to-EAX  1/imm32
+<span id="L31" class="LineNr">31 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L32" class="LineNr">32 </span>    b8/copy-to-EAX  1/imm32/exit
 <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="subxComment"># compare two null-terminated ascii strings</span>
 <span id="L36" class="LineNr">36 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
 <span id="L37" class="LineNr">37 </span><span class="subxFunction">argv-equal</span>:  <span class="subxComment"># (s1, s2) : null-terminated ascii strings -&gt; EAX : boolean</span>
 <span id="L38" class="LineNr">38 </span>    <span class="subxComment"># initialize s1 (ECX) and s2 (EDX)</span>
-<span id="L39" class="LineNr">39 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          1/r32/ECX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to ECX</span>
-<span id="L40" class="LineNr">40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+8) to EDX</span>
+<span id="L39" class="LineNr">39 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          1/r32/ECX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+4) to ECX</span>
+<span id="L40" class="LineNr">40 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+8) to EDX</span>
 <span id="L41" class="LineNr">41 </span>    <span class="subxComment"># while (true)</span>
 <span id="L42" class="LineNr">42 </span><span class="Constant">$argv-equal:loop</span>:
 <span id="L43" class="LineNr">43 </span>    <span class="subxComment"># c1/EAX, c2/EBX = *s1, *s2</span>
 <span id="L44" class="LineNr">44 </span>    b8/copy-to-EAX  0/imm32
-<span id="L45" class="LineNr">45 </span>    8a/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ECX to lower byte of EAX</span>
+<span id="L45" class="LineNr">45 </span>    8a/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ECX to lower byte of EAX</span>
 <span id="L46" class="LineNr">46 </span>    bb/copy-to-EBX  0/imm32
-<span id="L47" class="LineNr">47 </span>    8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of EBX</span>
+<span id="L47" class="LineNr">47 </span>    8a/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of EBX</span>
 <span id="L48" class="LineNr">48 </span>    <span class="subxComment"># if (c1 == 0) break</span>
 <span id="L49" class="LineNr">49 </span>    3d/compare-EAX  0/imm32
 <span id="L50" class="LineNr">50 </span>    74/jump-if-equal  $argv-equal:break/disp8
 <span id="L51" class="LineNr">51 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L52" class="LineNr">52 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L52" class="LineNr">52 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <span id="L53" class="LineNr">53 </span>    75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L54" class="LineNr">54 </span>    <span class="subxComment"># ++s1, ++s2</span>
 <span id="L55" class="LineNr">55 </span>    41/inc-ECX
@@ -120,7 +115,7 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr">58 </span>    eb/jump  $argv-equal:loop/disp8
 <span id="L59" class="LineNr">59 </span><span class="Constant">$argv-equal:break</span>:
 <span id="L60" class="LineNr">60 </span>    <span class="subxComment"># if (c2 == 0) return true</span>
-<span id="L61" class="LineNr">61 </span>    81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EBX</span>
+<span id="L61" class="LineNr">61 </span>    81          7/subop/compare     3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EBX</span>
 <span id="L62" class="LineNr">62 </span>    75/jump-if-not-equal  $argv-equal:false/disp8
 <span id="L63" class="LineNr">63 </span><span class="Constant">$argv-equal:success</span>:
 <span id="L64" class="LineNr">64 </span>    b8/copy-to-EAX  1/imm32
diff --git a/html/subx/examples/ex11.subx.html b/html/subx/examples/ex11.subx.html
index 699234c2..3173e33d 100644
--- a/html/subx/examples/ex11.subx.html
+++ b/html/subx/examples/ex11.subx.html
@@ -7,27 +7,22 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.Constant { color: #008787; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.SpecialChar { color: #d70000; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
 .subxTest { color: #5f8700; }
-.Constant { color:#00a0a0; }
-.SpecialChar { color: #d70000; }
-.subxH1Comment { color:#00ffff; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
+.subxS2Comment { color: #8a8a8a; }
+.subxH1Comment { color: #005faf; text-decoration: underline; }
 -->
 </style>
 
@@ -87,16 +82,16 @@ if ('onhashchange' in window) {
 <span id="L22" class="LineNr"> 22 </span><span class="subxComment"># main:</span>
 <span id="L23" class="LineNr"> 23 </span>    e8/call  run-tests/disp32  <span class="subxComment"># 'run-tests' is a function created automatically by SubX. It calls all functions that start with 'test-'.</span>
 <span id="L24" class="LineNr"> 24 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L25" class="LineNr"> 25 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
-<span id="L26" class="LineNr"> 26 </span>    b8/copy-to-EAX  1/imm32
+<span id="L25" class="LineNr"> 25 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L26" class="LineNr"> 26 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L27" class="LineNr"> 27 </span>    cd/syscall  0x80/imm8
 <span id="L28" class="LineNr"> 28 </span>
 <span id="L29" class="LineNr"> 29 </span><span class="subxComment"># compare a null-terminated ascii string with a more idiomatic length-prefixed byte array</span>
 <span id="L30" class="LineNr"> 30 </span><span class="subxComment"># reason for the name: the only place we should have null-terminated ascii strings is from commandline args</span>
-<span id="L31" class="LineNr"> 31 </span><span class="subxFunction">kernel-string-equal</span>:  <span class="subxComment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
+<span id="L31" class="LineNr"> 31 </span><span class="subxFunction"><a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a></span>:  <span class="subxComment"># s : null-terminated ascii string, benchmark : length-prefixed ascii string -&gt; EAX : boolean</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="subxS1Comment"># . prolog</span>
 <span id="L33" class="LineNr"> 33 </span>    55/push-EBP
-<span id="L34" class="LineNr"> 34 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L34" class="LineNr"> 34 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L36" class="LineNr"> 36 </span>    51/push-ECX
 <span id="L37" class="LineNr"> 37 </span>    52/push-EDX
@@ -118,29 +113,29 @@ if ('onhashchange' in window) {
 <span id="L53" class="LineNr"> 53 </span>    <span class="subxComment">#       return false</span>
 <span id="L54" class="LineNr"> 54 </span>    <span class="subxComment">#   return *s1 == 0</span>
 <span id="L55" class="LineNr"> 55 </span>    <span class="subxComment"># initialize s into EDI</span>
-<span id="L56" class="LineNr"> 56 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          7/r32/EDI   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
+<span id="L56" class="LineNr"> 56 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          7/r32/EDI   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDI</span>
 <span id="L57" class="LineNr"> 57 </span>    <span class="subxComment"># initialize benchmark length n into EDX</span>
-<span id="L58" class="LineNr"> 58 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
-<span id="L59" class="LineNr"> 59 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L58" class="LineNr"> 58 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EDX</span>
+<span id="L59" class="LineNr"> 59 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
 <span id="L60" class="LineNr"> 60 </span>    <span class="subxComment"># initialize benchmark data into ESI</span>
-<span id="L61" class="LineNr"> 61 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>          6/r32/ESI   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
-<span id="L62" class="LineNr"> 62 </span>    81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
+<span id="L61" class="LineNr"> 61 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          6/r32/ESI   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to ESI</span>
+<span id="L62" class="LineNr"> 62 </span>    81          0/subop/add         3/mod/direct    6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESI</span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># initialize loop counter i into ECX</span>
 <span id="L64" class="LineNr"> 64 </span>    b9/copy-to-ECX  0/imm32/exit
 <span id="L65" class="LineNr"> 65 </span>    <span class="subxComment"># while (i/ECX &lt; n/EDX)</span>
 <span id="L66" class="LineNr"> 66 </span><span class="Constant">$kernel-string-equal:loop</span>:
-<span id="L67" class="LineNr"> 67 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
+<span id="L67" class="LineNr"> 67 </span>    39/compare                      3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare ECX with EDX</span>
 <span id="L68" class="LineNr"> 68 </span>    74/jump-if-equal  $kernel-string-equal:break/disp8
 <span id="L69" class="LineNr"> 69 </span>    <span class="subxComment"># c1/EAX, c2/EBX = *s, *benchmark</span>
 <span id="L70" class="LineNr"> 70 </span>    b8/copy-to-EAX  0/imm32
-<span id="L71" class="LineNr"> 71 </span>    8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L71" class="LineNr"> 71 </span>    8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
 <span id="L72" class="LineNr"> 72 </span>    bb/copy-to-EBX  0/imm32
-<span id="L73" class="LineNr"> 73 </span>    8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *ESI to lower byte of EBX</span>
+<span id="L73" class="LineNr"> 73 </span>    8a/copy                         0/mod/indirect  6/rm32/ESI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *ESI to lower byte of EBX</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxComment"># if (c1 == 0) return false</span>
 <span id="L75" class="LineNr"> 75 </span>    3d/compare-EAX  0/imm32
 <span id="L76" class="LineNr"> 76 </span>    74/jump-if-equal  $kernel-string-equal:false/disp8
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxComment"># if (c1 != c2) return false</span>
-<span id="L78" class="LineNr"> 78 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
+<span id="L78" class="LineNr"> 78 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># compare EAX with EBX</span>
 <span id="L79" class="LineNr"> 79 </span>    75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L80" class="LineNr"> 80 </span>    <span class="subxComment"># ++s1, ++s2, ++i</span>
 <span id="L81" class="LineNr"> 81 </span>    41/inc-ECX
@@ -151,8 +146,8 @@ if ('onhashchange' in window) {
 <span id="L86" class="LineNr"> 86 </span><span class="Constant">$kernel-string-equal:break</span>:
 <span id="L87" class="LineNr"> 87 </span>    <span class="subxComment"># if (*s/EDI == 0) return true</span>
 <span id="L88" class="LineNr"> 88 </span>    b8/copy-to-EAX  0/imm32
-<span id="L89" class="LineNr"> 89 </span>    8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
-<span id="L90" class="LineNr"> 90 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
+<span id="L89" class="LineNr"> 89 </span>    8a/copy                         0/mod/indirect  7/rm32/EDI   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDI to lower byte of EAX</span>
+<span id="L90" class="LineNr"> 90 </span>    81          7/subop/compare     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare EAX</span>
 <span id="L91" class="LineNr"> 91 </span>    75/jump-if-not-equal  $kernel-string-equal:false/disp8
 <span id="L92" class="LineNr"> 92 </span>    b8/copy-to-EAX  1/imm32
 <span id="L93" class="LineNr"> 93 </span><span class="Constant">$kernel-string-equal:true</span>:
@@ -169,167 +164,167 @@ if ('onhashchange' in window) {
 <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="subxComment"># end</span>
-<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L107" class="LineNr">107 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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="subxH1Comment"># - tests</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="subxTest">test-compare-null-kernel-string-with-empty-array</span>:
+<span id="L113" class="LineNr">113 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L113'>test-compare-null-kernel-string-with-empty-array</a></span>:
 <span id="L114" class="LineNr">114 </span>    <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;&quot;)</span>
 <span id="L115" class="LineNr">115 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L116" class="LineNr">116 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L117" class="LineNr">117 </span>    68/push  <span class="SpecialChar">Null-kernel-string</span>/imm32
+<span id="L117" class="LineNr">117 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>/imm32
 <span id="L118" class="LineNr">118 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L119" class="LineNr">119 </span>    e8/call  kernel-string-equal/disp32
+<span id="L119" class="LineNr">119 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L120" class="LineNr">120 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L121" class="LineNr">121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L121" class="LineNr">121 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L122" class="LineNr">122 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L123" class="LineNr">123 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L124" class="LineNr">124 </span>    68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-empty-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L128" class="LineNr">128 </span>    e8/call  check-ints-equal/disp32
+<span id="L128" class="LineNr">128 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L129" class="LineNr">129 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L130" class="LineNr">130 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-null-kernel-string-with-non-empty-array</span>:
+<span id="L133" class="LineNr">133 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L133'>test-compare-null-kernel-string-with-non-empty-array</a></span>:
 <span id="L134" class="LineNr">134 </span>    <span class="subxComment"># EAX = kernel-string-equal(Null-kernel-string, &quot;Abc&quot;)</span>
 <span id="L135" class="LineNr">135 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L136" class="LineNr">136 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L137" class="LineNr">137 </span>    68/push  <span class="SpecialChar">Null-kernel-string</span>/imm32
+<span id="L137" class="LineNr">137 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>/imm32
 <span id="L138" class="LineNr">138 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L139" class="LineNr">139 </span>    e8/call  kernel-string-equal/disp32
+<span id="L139" class="LineNr">139 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L140" class="LineNr">140 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L141" class="LineNr">141 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L142" class="LineNr">142 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L143" class="LineNr">143 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L144" class="LineNr">144 </span>    68/push  <span class="Constant">&quot;F - test-compare-null-kernel-string-with-non-empty-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L148" class="LineNr">148 </span>    e8/call  check-ints-equal/disp32
+<span id="L148" class="LineNr">148 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L149" class="LineNr">149 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L150" class="LineNr">150 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-equal-array</span>:
+<span id="L153" class="LineNr">153 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L153'>test-compare-kernel-string-with-equal-array</a></span>:
 <span id="L154" class="LineNr">154 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abc&quot;)</span>
 <span id="L155" class="LineNr">155 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L156" class="LineNr">156 </span>    68/push  <span class="Constant">&quot;Abc&quot;</span>/imm32
-<span id="L157" class="LineNr">157 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L157" class="LineNr">157 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L158" class="LineNr">158 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L159" class="LineNr">159 </span>    e8/call  kernel-string-equal/disp32
+<span id="L159" class="LineNr">159 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L160" class="LineNr">160 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L161" class="LineNr">161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L161" class="LineNr">161 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L162" class="LineNr">162 </span>    <span class="subxComment"># check-ints-equal(EAX, 1, msg)</span>
 <span id="L163" class="LineNr">163 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L164" class="LineNr">164 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L168" class="LineNr">168 </span>    e8/call  check-ints-equal/disp32
+<span id="L168" class="LineNr">168 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L169" class="LineNr">169 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L170" class="LineNr">170 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L170" class="LineNr">170 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-inequal-array</span>:
+<span id="L173" class="LineNr">173 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L173'>test-compare-kernel-string-with-inequal-array</a></span>:
 <span id="L174" class="LineNr">174 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Adc&quot;)</span>
 <span id="L175" class="LineNr">175 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L176" class="LineNr">176 </span>    68/push  <span class="Constant">&quot;Adc&quot;</span>/imm32
-<span id="L177" class="LineNr">177 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L177" class="LineNr">177 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L178" class="LineNr">178 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L179" class="LineNr">179 </span>    e8/call  kernel-string-equal/disp32
+<span id="L179" class="LineNr">179 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L180" class="LineNr">180 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L181" class="LineNr">181 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L182" class="LineNr">182 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L183" class="LineNr">183 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L184" class="LineNr">184 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L188" class="LineNr">188 </span>    e8/call  check-ints-equal/disp32
+<span id="L188" class="LineNr">188 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L189" class="LineNr">189 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L190" class="LineNr">190 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-empty-array</span>:
+<span id="L193" class="LineNr">193 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L193'>test-compare-kernel-string-with-empty-array</a></span>:
 <span id="L194" class="LineNr">194 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;&quot;)</span>
 <span id="L195" class="LineNr">195 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L196" class="LineNr">196 </span>    68/push  <span class="Constant">&quot;&quot;</span>/imm32
-<span id="L197" class="LineNr">197 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L197" class="LineNr">197 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L198" class="LineNr">198 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L199" class="LineNr">199 </span>    e8/call  kernel-string-equal/disp32
+<span id="L199" class="LineNr">199 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L200" class="LineNr">200 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L201" class="LineNr">201 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L201" class="LineNr">201 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L202" class="LineNr">202 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L203" class="LineNr">203 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L204" class="LineNr">204 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-equal-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L208" class="LineNr">208 </span>    e8/call  check-ints-equal/disp32
+<span id="L208" class="LineNr">208 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L209" class="LineNr">209 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L210" class="LineNr">210 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L210" class="LineNr">210 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-shorter-array</span>:
+<span id="L213" class="LineNr">213 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L213'>test-compare-kernel-string-with-shorter-array</a></span>:
 <span id="L214" class="LineNr">214 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Ab&quot;)</span>
 <span id="L215" class="LineNr">215 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L216" class="LineNr">216 </span>    68/push  <span class="Constant">&quot;Ab&quot;</span>/imm32
-<span id="L217" class="LineNr">217 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L217" class="LineNr">217 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L218" class="LineNr">218 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L219" class="LineNr">219 </span>    e8/call  kernel-string-equal/disp32
+<span id="L219" class="LineNr">219 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L220" class="LineNr">220 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L221" class="LineNr">221 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L221" class="LineNr">221 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L222" class="LineNr">222 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L223" class="LineNr">223 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L224" class="LineNr">224 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-shorter-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L228" class="LineNr">228 </span>    e8/call  check-ints-equal/disp32
+<span id="L228" class="LineNr">228 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L229" class="LineNr">229 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L230" class="LineNr">230 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L230" class="LineNr">230 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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><span class="subxTest">test-compare-kernel-string-with-longer-array</span>:
+<span id="L233" class="LineNr">233 </span><span class="subxTest"><a href='052kernel_string_equal.subx.html#L233'>test-compare-kernel-string-with-longer-array</a></span>:
 <span id="L234" class="LineNr">234 </span>    <span class="subxComment"># EAX = kernel-string-equal(Abc-kernel-string, &quot;Abcd&quot;)</span>
 <span id="L235" class="LineNr">235 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L236" class="LineNr">236 </span>    68/push  <span class="Constant">&quot;Abcd&quot;</span>/imm32
-<span id="L237" class="LineNr">237 </span>    68/push  <span class="SpecialChar">Abc-kernel-string</span>/imm32
+<span id="L237" class="LineNr">237 </span>    68/push  <span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>/imm32
 <span id="L238" class="LineNr">238 </span>    <span class="subxS2Comment"># . . call</span>
-<span id="L239" class="LineNr">239 </span>    e8/call  kernel-string-equal/disp32
+<span id="L239" class="LineNr">239 </span>    e8/call  <a href='052kernel_string_equal.subx.html#L31'>kernel-string-equal</a>/disp32
 <span id="L240" class="LineNr">240 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L241" class="LineNr">241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L241" class="LineNr">241 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L242" class="LineNr">242 </span>    <span class="subxComment"># check-ints-equal(EAX, 0, msg)</span>
 <span id="L243" class="LineNr">243 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L244" class="LineNr">244 </span>    68/push  <span class="Constant">&quot;F - test-compare-kernel-string-with-longer-array&quot;</span>/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="subxS2Comment"># . . call</span>
-<span id="L248" class="LineNr">248 </span>    e8/call  check-ints-equal/disp32
+<span id="L248" class="LineNr">248 </span>    e8/call  <a href='051test.subx.html#L24'>check-ints-equal</a>/disp32
 <span id="L249" class="LineNr">249 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L250" class="LineNr">250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xc/imm32         <span class="subxComment"># add to ESP</span>
+<span id="L250" class="LineNr">250 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xc/imm32         <span class="subxComment"># 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="subxH1Comment"># - helpers</span>
 <span id="L254" class="LineNr">254 </span>
 <span id="L255" class="LineNr">255 </span><span class="subxComment"># print msg to stderr if a != b, otherwise print &quot;.&quot;</span>
-<span id="L256" class="LineNr">256 </span><span class="subxFunction">check-ints-equal</span>:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
+<span id="L256" class="LineNr">256 </span><span class="subxFunction"><a href='051test.subx.html#L24'>check-ints-equal</a></span>:  <span class="subxComment"># (a : int, b : int, msg : (address array byte)) -&gt; boolean</span>
 <span id="L257" class="LineNr">257 </span>    <span class="subxS1Comment"># . 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L259" class="LineNr">259 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L260" class="LineNr">260 </span>    <span class="subxS1Comment"># . 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="subxComment"># 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="CommentedCode"> . </span>          0/r32/EAX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># 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="CommentedCode"> . </span>          3/r32/EBX   0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
+<span id="L264" class="LineNr">264 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EAX</span>
+<span id="L265" class="LineNr">265 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX   0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+12) to EBX</span>
 <span id="L266" class="LineNr">266 </span>    <span class="subxComment"># if EAX == b/EBX print('.') and return</span>
-<span id="L267" class="LineNr">267 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># compare EAX and EBX</span>
+<span id="L267" class="LineNr">267 </span>    39/compare                      3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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="subxS1Comment"># . write-stderr('.')</span>
 <span id="L270" class="LineNr">270 </span>    <span class="subxS2Comment"># . . push args</span>
@@ -337,40 +332,40 @@ if ('onhashchange' in window) {
 <span id="L272" class="LineNr">272 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L273" class="LineNr">273 </span>    e8/call  write-stderr/disp32
 <span id="L274" class="LineNr">274 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L275" class="LineNr">275 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L275" class="LineNr">275 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L276" class="LineNr">276 </span>    <span class="subxS1Comment"># . 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="subxComment"># otherwise print(msg)</span>
 <span id="L279" class="LineNr">279 </span><span class="Constant">$check-ints-equal:else</span>:
 <span id="L280" class="LineNr">280 </span>    <span class="subxComment"># 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="CommentedCode"> . </span>          1/r32/ECX   0x10/disp8      <span class="CommentedCode"> . </span>               <span class="subxComment"># copy *(EBP+16) to ECX</span>
+<span id="L281" class="LineNr">281 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   0x10/disp8      <span class="Normal"> . </span>               <span class="subxComment"># copy *(EBP+16) to ECX</span>
 <span id="L282" class="LineNr">282 </span>    <span class="subxComment"># print(ECX)</span>
 <span id="L283" class="LineNr">283 </span>    <span class="subxS2Comment"># . . push args</span>
 <span id="L284" class="LineNr">284 </span>    51/push-ECX
 <span id="L285" class="LineNr">285 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L286" class="LineNr">286 </span>    e8/call  write-stderr/disp32
 <span id="L287" class="LineNr">287 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L288" class="LineNr">288 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L288" class="LineNr">288 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L289" class="LineNr">289 </span>    <span class="subxComment"># print newline</span>
 <span id="L290" class="LineNr">290 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L291" class="LineNr">291 </span>    68/push  <span class="SpecialChar">Newline</span>/imm32
+<span id="L291" class="LineNr">291 </span>    68/push  <span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>/imm32
 <span id="L292" class="LineNr">292 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L293" class="LineNr">293 </span>    e8/call  write-stderr/disp32
 <span id="L294" class="LineNr">294 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L295" class="LineNr">295 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L295" class="LineNr">295 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L296" class="LineNr">296 </span><span class="Constant">$check-ints-equal:end</span>:
 <span id="L297" class="LineNr">297 </span>    <span class="subxS1Comment"># . 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="subxComment"># end</span>
-<span id="L301" class="LineNr">301 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L301" class="LineNr">301 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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><span class="subxFunction">write-stderr</span>:  <span class="subxComment"># s : (address array byte) -&gt; &lt;void&gt;</span>
 <span id="L306" class="LineNr">306 </span>    <span class="subxS1Comment"># . 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L308" class="LineNr">308 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L309" class="LineNr">309 </span>    <span class="subxS1Comment"># . save registers</span>
 <span id="L310" class="LineNr">310 </span>    50/push-EAX
 <span id="L311" class="LineNr">311 </span>    51/push-ECX
@@ -380,11 +375,11 @@ if ('onhashchange' in window) {
 <span id="L315" class="LineNr">315 </span>    <span class="subxS2Comment"># . . fd = 2 (stderr)</span>
 <span id="L316" class="LineNr">316 </span>    bb/copy-to-EBX  2/imm32
 <span id="L317" class="LineNr">317 </span>    <span class="subxS2Comment"># . . 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="CommentedCode"> . </span>          1/r32/ECX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
+<span id="L318" class="LineNr">318 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># 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="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ECX</span>
 <span id="L320" class="LineNr">320 </span>    <span class="subxS2Comment"># . . 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="CommentedCode"> . </span>          2/r32/EDX   8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDX</span>
-<span id="L322" class="LineNr">322 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
+<span id="L321" class="LineNr">321 </span>    8b/copy                         1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(EBP+8) to EDX</span>
+<span id="L322" class="LineNr">322 </span>    8b/copy                         0/mod/indirect  2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EDX to EDX</span>
 <span id="L323" class="LineNr">323 </span>    <span class="subxS2Comment"># . . syscall</span>
 <span id="L324" class="LineNr">324 </span>    b8/copy-to-EAX  4/imm32/write
 <span id="L325" class="LineNr">325 </span>    cd/syscall  0x80/imm8
@@ -394,22 +389,22 @@ if ('onhashchange' in window) {
 <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="subxS1Comment"># . end</span>
-<span id="L332" class="LineNr">332 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          5/r32/EBP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EBP to ESP</span>
+<span id="L332" class="LineNr">332 </span>    89/copy                         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          5/r32/EBP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># 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>
-<span id="L338" class="LineNr">338 </span><span class="SpecialChar">Newline</span>:
+<span id="L338" class="LineNr">338 </span><span class="SpecialChar"><a href='051test.subx.html#L81'>Newline</a></span>:
 <span id="L339" class="LineNr">339 </span>    <span class="subxComment"># size</span>
 <span id="L340" class="LineNr">340 </span>    01 00 00 00
 <span id="L341" class="LineNr">341 </span>    <span class="subxComment"># 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="subxComment"># for kernel-string-equal tests</span>
-<span id="L345" class="LineNr">345 </span><span class="SpecialChar">Null-kernel-string</span>:
+<span id="L345" class="LineNr">345 </span><span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L255'>Null-kernel-string</a></span>:
 <span id="L346" class="LineNr">346 </span>    00/null
-<span id="L347" class="LineNr">347 </span><span class="SpecialChar">Abc-kernel-string</span>:
+<span id="L347" class="LineNr">347 </span><span class="SpecialChar"><a href='052kernel_string_equal.subx.html#L257'>Abc-kernel-string</a></span>:
 <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="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/subx/examples/ex12.subx.html b/html/subx/examples/ex12.subx.html
index 9ee9caa9..3fe6f836 100644
--- a/html/subx/examples/ex12.subx.html
+++ b/html/subx/examples/ex12.subx.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
-.CommentedCode { color: #6c6c6c; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -78,10 +73,10 @@ if ('onhashchange' in window) {
 <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="subxComment"># write to *EAX to check that we have access to the newly-allocated segment</span>
-<span id="L20" class="LineNr">20 </span>    c7/copy                         0/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0x34/imm32        <span class="subxComment"># copy to *EAX</span>
+<span id="L20" class="LineNr">20 </span>    c7          0/subop/copy        0/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0x34/imm32        <span class="subxComment"># copy to *EAX</span>
 <span id="L21" class="LineNr">21 </span>
 <span id="L22" class="LineNr">22 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L23" class="LineNr">23 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L23" class="LineNr">23 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</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>
diff --git a/html/subx/examples/ex2.subx.html b/html/subx/examples/ex2.subx.html
index 04e1e9c4..f2ac27f9 100644
--- a/html/subx/examples/ex2.subx.html
+++ b/html/subx/examples/ex2.subx.html
@@ -7,20 +7,15 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
 -->
 </style>
 
@@ -72,7 +67,7 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr">14 </span><span class="subxComment"># increment EBX</span>
 <span id="L15" class="LineNr">15 </span>43/inc-EBX
 <span id="L16" class="LineNr">16 </span><span class="subxComment"># syscall(exit, EBX)</span>
-<span id="L17" class="LineNr">17 </span>b8/copy-to-EAX  1/imm32
+<span id="L17" class="LineNr">17 </span>b8/copy-to-EAX  1/imm32/exit
 <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="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/subx/examples/ex3.subx.html b/html/subx/examples/ex3.subx.html
index d814af53..e6ec437b 100644
--- a/html/subx/examples/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
-.Constant { color:#00a0a0; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -80,10 +75,10 @@ if ('onhashchange' in window) {
 <span id="L19" class="LineNr">19 </span>
 <span id="L20" class="LineNr">20 </span><span class="Constant">$loop</span>:
 <span id="L21" class="LineNr">21 </span>    <span class="subxComment"># while (counter &lt;= 10)</span>
-<span id="L22" class="LineNr">22 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0xa/imm32         <span class="subxComment"># compare ECX</span>
+<span id="L22" class="LineNr">22 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0xa/imm32         <span class="subxComment"># compare ECX</span>
 <span id="L23" class="LineNr">23 </span>    7f/jump-if-greater  $exit/disp8
 <span id="L24" class="LineNr">24 </span>    <span class="subxComment"># result += counter</span>
-<span id="L25" class="LineNr">25 </span>    01/add                          3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># add ECX to EBX</span>
+<span id="L25" class="LineNr">25 </span>    01/add                          3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># add ECX to EBX</span>
 <span id="L26" class="LineNr">26 </span>    <span class="subxComment"># ++counter</span>
 <span id="L27" class="LineNr">27 </span>    41/inc-ECX
 <span id="L28" class="LineNr">28 </span>    <span class="subxComment"># loop</span>
@@ -91,7 +86,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>
 <span id="L31" class="LineNr">31 </span><span class="Constant">$exit</span>:
 <span id="L32" class="LineNr">32 </span>    <span class="subxComment"># syscall(exit, EBX)</span>
-<span id="L33" class="LineNr">33 </span>    b8/copy-to-EAX  1/imm32
+<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><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index 27b339bb..cb139f48 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -7,21 +7,16 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
 -->
 </style>
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index 5364e97f..aa75d79c 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -7,22 +7,17 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -71,13 +66,13 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr">11 </span>
 <span id="L12" class="LineNr">12 </span><span class="subxComment"># main:</span>
 <span id="L13" class="LineNr">13 </span>    <span class="subxComment"># 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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># subtract from ESP</span>
+<span id="L14" class="LineNr">14 </span>    81          5/subop/subtract    3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># subtract from ESP</span>
 <span id="L15" class="LineNr">15 </span>
 <span id="L16" class="LineNr">16 </span>    <span class="subxComment"># syscall(read, stdin, x, 1)</span>
 <span id="L17" class="LineNr">17 </span>    <span class="subxS1Comment"># . fd = 0 (stdin)</span>
 <span id="L18" class="LineNr">18 </span>    bb/copy-to-EBX  0/imm32
 <span id="L19" class="LineNr">19 </span>    <span class="subxS1Comment"># . data = 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="CommentedCode"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</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="Normal"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
 <span id="L21" class="LineNr">21 </span>    <span class="subxS1Comment"># . size = 1 character</span>
 <span id="L22" class="LineNr">22 </span>    ba/copy-to-EDX  1/imm32
 <span id="L23" class="LineNr">23 </span>    <span class="subxS1Comment"># . syscall</span>
@@ -88,7 +83,7 @@ if ('onhashchange' in window) {
 <span id="L28" class="LineNr">28 </span>    <span class="subxS1Comment"># . fd = 1 (stdout)</span>
 <span id="L29" class="LineNr">29 </span>    bb/copy-to-EBX  1/imm32
 <span id="L30" class="LineNr">30 </span>    <span class="subxS1Comment"># . data = 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="CommentedCode"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</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="Normal"> . </span>                <span class="subxComment"># copy ESP+4 to ECX</span>
 <span id="L32" class="LineNr">32 </span>    <span class="subxS1Comment"># . size = 1 character</span>
 <span id="L33" class="LineNr">33 </span>    ba/copy-to-EDX  1/imm32
 <span id="L34" class="LineNr">34 </span>    <span class="subxS1Comment"># . syscall</span>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index 08c6639f..297a5ca3 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
-.CommentedCode { color: #6c6c6c; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -77,7 +72,7 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr">16 </span>    <span class="subxS1Comment"># . initialize X (location to write result to)</span>
 <span id="L17" class="LineNr">17 </span>    b9/copy-to-ECX  <span class="SpecialChar">X</span>/imm32
 <span id="L18" class="LineNr">18 </span>    <span class="subxS1Comment"># . initialize Size</span>
-<span id="L19" class="LineNr">19 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          2/r32/EDX   <span class="SpecialChar">Size</span>/disp32    <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *Size to EDX</span>
+<span id="L19" class="LineNr">19 </span>    8b/copy                         0/mod/indirect  5/rm32/.disp32           <span class="Normal"> . </span>           <span class="Normal"> . </span>          2/r32/EDX   <span class="SpecialChar">Size</span>/disp32    <span class="Normal"> . </span>                <span class="subxComment"># copy *Size to EDX</span>
 <span id="L20" class="LineNr">20 </span>    <span class="subxS1Comment"># . 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
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
index 889e02e7..0cce7bec 100644
--- a/html/subx/examples/ex7.subx.html
+++ b/html/subx/examples/ex7.subx.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .SpecialChar { color: #d70000; }
-.CommentedCode { color: #6c6c6c; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -91,12 +86,12 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span>    cd/syscall  0x80/imm8
 <span id="L31" class="LineNr"> 31 </span>    <span class="subxComment"># save stream</span>
 <span id="L32" class="LineNr"> 32 </span>    bb/copy-to-EBX  <span class="SpecialChar">Stream</span>/imm32
-<span id="L33" class="LineNr"> 33 </span>    89/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *EBX</span>
+<span id="L33" class="LineNr"> 33 </span>    89/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *EBX</span>
 <span id="L34" class="LineNr"> 34 </span>
 <span id="L35" class="LineNr"> 35 </span>    <span class="subxComment"># syscall(write, Stream, &quot;a&quot;, 1)</span>
 <span id="L36" class="LineNr"> 36 </span>    <span class="subxS1Comment"># . load stream</span>
 <span id="L37" class="LineNr"> 37 </span>    bb/copy-to-EBX  <span class="SpecialChar">Stream</span>/imm32
-<span id="L38" class="LineNr"> 38 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L38" class="LineNr"> 38 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
 <span id="L39" class="LineNr"> 39 </span>    <span class="subxS1Comment"># .</span>
 <span id="L40" class="LineNr"> 40 </span>    b9/copy-to-ECX  <span class="SpecialChar">A</span>/imm32
 <span id="L41" class="LineNr"> 41 </span>    ba/copy-to-EDX  1/imm32/size
@@ -106,7 +101,7 @@ if ('onhashchange' in window) {
 <span id="L45" class="LineNr"> 45 </span>    <span class="subxComment"># syscall(close, Stream)</span>
 <span id="L46" class="LineNr"> 46 </span>    <span class="subxS1Comment"># . load stream</span>
 <span id="L47" class="LineNr"> 47 </span>    bb/copy-to-EBX  <span class="SpecialChar">Stream</span>/imm32
-<span id="L48" class="LineNr"> 48 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L48" class="LineNr"> 48 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
 <span id="L49" class="LineNr"> 49 </span>    <span class="subxS1Comment"># .</span>
 <span id="L50" class="LineNr"> 50 </span>    b8/copy-to-EAX  6/imm32/close
 <span id="L51" class="LineNr"> 51 </span>    cd/syscall  0x80/imm8
@@ -119,12 +114,12 @@ if ('onhashchange' in window) {
 <span id="L58" class="LineNr"> 58 </span>    cd/syscall  0x80/imm8
 <span id="L59" class="LineNr"> 59 </span>    <span class="subxS1Comment"># . save Stream</span>
 <span id="L60" class="LineNr"> 60 </span>    bb/copy-to-EBX  <span class="SpecialChar">Stream</span>/imm32
-<span id="L61" class="LineNr"> 61 </span>    89/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to *EBX</span>
+<span id="L61" class="LineNr"> 61 </span>    89/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to *EBX</span>
 <span id="L62" class="LineNr"> 62 </span>
 <span id="L63" class="LineNr"> 63 </span>    <span class="subxComment"># syscall(read, Stream, B, 1)</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="subxS1Comment"># . load stream</span>
 <span id="L65" class="LineNr"> 65 </span>    bb/copy-to-EBX  <span class="SpecialChar">Stream</span>/imm32
-<span id="L66" class="LineNr"> 66 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L66" class="LineNr"> 66 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="subxS1Comment"># .</span>
 <span id="L68" class="LineNr"> 68 </span>    b9/copy-to-ECX  <span class="SpecialChar">B</span>/imm32
 <span id="L69" class="LineNr"> 69 </span>    ba/copy-to-EDX  1/imm32/size
@@ -134,7 +129,7 @@ if ('onhashchange' in window) {
 <span id="L73" class="LineNr"> 73 </span>    <span class="subxComment"># syscall(close, Stream)</span>
 <span id="L74" class="LineNr"> 74 </span>    <span class="subxS1Comment"># . load stream</span>
 <span id="L75" class="LineNr"> 75 </span>    bb/copy-to-EBX  <span class="SpecialChar">Stream</span>/imm32
-<span id="L76" class="LineNr"> 76 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L76" class="LineNr"> 76 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="subxComment">#</span>
 <span id="L78" class="LineNr"> 78 </span>    b8/copy-to-EAX  6/imm32/close
 <span id="L79" class="LineNr"> 79 </span>    cd/syscall  0x80/imm8
@@ -147,7 +142,7 @@ if ('onhashchange' in window) {
 <span id="L86" class="LineNr"> 86 </span>    <span class="subxComment"># syscall(exit, b)</span>
 <span id="L87" class="LineNr"> 87 </span>    <span class="subxS1Comment"># . load b</span>
 <span id="L88" class="LineNr"> 88 </span>    bb/copy-to-EBX  <span class="SpecialChar">B</span>/imm32
-<span id="L89" class="LineNr"> 89 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          3/r32/EBX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
+<span id="L89" class="LineNr"> 89 </span>    8b/copy                         0/mod/indirect  3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          3/r32/EBX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EBX to EBX</span>
 <span id="L90" class="LineNr"> 90 </span>    <span class="subxComment">#</span>
 <span id="L91" class="LineNr"> 91 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L92" class="LineNr"> 92 </span>    cd/syscall  0x80/imm8
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
index 5d89cca6..af438a07 100644
--- a/html/subx/examples/ex8.subx.html
+++ b/html/subx/examples/ex8.subx.html
@@ -7,24 +7,19 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
-.Constant { color:#00a0a0; }
+.Constant { color: #008787; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -82,33 +77,33 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span><span class="subxS1Comment"># . 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 id="L22" class="LineNr">22 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L23" class="LineNr">23 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L23" class="LineNr">23 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L24" class="LineNr">24 </span>    <span class="subxComment"># EAX = ascii-length(argv[1])</span>
 <span id="L25" class="LineNr">25 </span>    <span class="subxS2Comment"># . . push args</span>
-<span id="L26" class="LineNr">26 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L26" class="LineNr">26 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L27" class="LineNr">27 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L28" class="LineNr">28 </span>    e8/call  ascii-length/disp32
 <span id="L29" class="LineNr">29 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L30" class="LineNr">30 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L30" class="LineNr">30 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              4/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L31" class="LineNr">31 </span>
 <span id="L32" class="LineNr">32 </span>    <span class="subxComment"># exit(EAX)</span>
-<span id="L33" class="LineNr">33 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L33" class="LineNr">33 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L34" class="LineNr">34 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L35" class="LineNr">35 </span>    cd/syscall  0x80/imm8
 <span id="L36" class="LineNr">36 </span>
 <span id="L37" class="LineNr">37 </span><span class="subxFunction">ascii-length</span>:  <span class="subxComment"># s : (address array byte) -&gt; n/EAX</span>
 <span id="L38" class="LineNr">38 </span>    <span class="subxComment"># EDX = s</span>
-<span id="L39" class="LineNr">39 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="CommentedCode"> . </span>          2/r32/EDX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EDX</span>
+<span id="L39" class="LineNr">39 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Normal"> . </span>          2/r32/EDX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+4) to EDX</span>
 <span id="L40" class="LineNr">40 </span>    <span class="subxComment"># var result/EAX = 0</span>
 <span id="L41" class="LineNr">41 </span>    b8/copy-to-EAX  0/imm32
 <span id="L42" class="LineNr">42 </span><span class="Constant">$ascii-length-loop</span>:
 <span id="L43" class="LineNr">43 </span>    <span class="subxComment"># var c/ECX = *s</span>
-<span id="L44" class="LineNr">44 </span>    8a/copy                         0/mod/*         2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of ECX</span>
+<span id="L44" class="LineNr">44 </span>    8a/copy                         0/mod/*         2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy byte at *EDX to lower byte of ECX</span>
 <span id="L45" class="LineNr">45 </span>    <span class="subxComment"># if c == '\0' break</span>
-<span id="L46" class="LineNr">46 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              0/imm32           <span class="subxComment"># compare ECX</span>
+<span id="L46" class="LineNr">46 </span>    81          7/subop/compare     3/mod/direct    1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              0/imm32           <span class="subxComment"># compare ECX</span>
 <span id="L47" class="LineNr">47 </span>    74/jump-if-equal  $ascii-length-ret/disp8
 <span id="L48" class="LineNr">48 </span>    <span class="subxComment"># ++s</span>
-<span id="L49" class="LineNr">49 </span>    81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              1/imm32           <span class="subxComment"># add to EDX</span>
+<span id="L49" class="LineNr">49 </span>    81          0/subop/add         3/mod/direct    2/rm32/EDX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              1/imm32           <span class="subxComment"># add to EDX</span>
 <span id="L50" class="LineNr">50 </span>    <span class="subxComment"># ++result</span>
 <span id="L51" class="LineNr">51 </span>    40/inc-EAX
 <span id="L52" class="LineNr">52 </span>    <span class="subxComment"># loop</span>
diff --git a/html/subx/examples/ex9.subx.html b/html/subx/examples/ex9.subx.html
index 4d9f2949..fa8732f7 100644
--- a/html/subx/examples/ex9.subx.html
+++ b/html/subx/examples/ex9.subx.html
@@ -7,23 +7,18 @@
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
-<meta name="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.subxComment { color:#16bfff; }
-.subxS2Comment { color:#4466ff; }
-.LineNr { color:#444444; }
-.subxS1Comment { color:#2d8cff; }
-.CommentedCode { color: #6c6c6c; }
+.subxComment { color: #005faf; }
+.subxS2Comment { color: #8a8a8a; }
+.LineNr { }
+.subxS1Comment { color: #0000af; }
 .subxFunction { color: #af5f00; text-decoration: underline; }
+.Normal { color: #000000; background-color: #c6c6c6; padding-bottom: 1px; }
 -->
 </style>
 
@@ -84,30 +79,30 @@ if ('onhashchange' in window) {
 <span id="L23" class="LineNr">23 </span><span class="subxS1Comment"># . 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="L24" class="LineNr">24 </span>
 <span id="L25" class="LineNr">25 </span>    <span class="subxS1Comment"># . prolog</span>
-<span id="L26" class="LineNr">26 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          4/r32/ESP  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
+<span id="L26" class="LineNr">26 </span>    89/copy                         3/mod/direct    5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          4/r32/ESP  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy ESP to EBP</span>
 <span id="L27" class="LineNr">27 </span>    <span class="subxComment"># ascii-difference(argv[1], argv[2])</span>
 <span id="L28" class="LineNr">28 </span>    <span class="subxS2Comment"># . . push argv[2]</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="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          0xc/disp8      <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
+<span id="L29" class="LineNr">29 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          0xc/disp8      <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+12)</span>
 <span id="L30" class="LineNr">30 </span>    <span class="subxS2Comment"># . . push argv[1]</span>
-<span id="L31" class="LineNr">31 </span>    ff          6/subop/push        1/mod/*+disp8   4/rm32/sib    5/base/EBP  4/index/none <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>          8/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
+<span id="L31" class="LineNr">31 </span>    ff          6/subop/push        1/mod/*+disp8   5/rm32/EBP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>          8/disp8        <span class="Normal"> . </span>                <span class="subxComment"># push *(EBP+8)</span>
 <span id="L32" class="LineNr">32 </span>    <span class="subxS2Comment"># . . call</span>
 <span id="L33" class="LineNr">33 </span>    e8/call  ascii-difference/disp32
 <span id="L34" class="LineNr">34 </span>    <span class="subxS2Comment"># . . discard args</span>
-<span id="L35" class="LineNr">35 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
+<span id="L35" class="LineNr">35 </span>    81          0/subop/add         3/mod/direct    4/rm32/ESP   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>         <span class="Normal"> . </span>         <span class="Normal"> . </span>              8/imm32           <span class="subxComment"># add to ESP</span>
 <span id="L36" class="LineNr">36 </span>    <span class="subxComment"># syscall(exit, EAX)</span>
-<span id="L37" class="LineNr">37 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
+<span id="L37" class="LineNr">37 </span>    89/copy                         3/mod/direct    3/rm32/EBX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy EAX to EBX</span>
 <span id="L38" class="LineNr">38 </span>    b8/copy-to-EAX  1/imm32/exit
 <span id="L39" class="LineNr">39 </span>    cd/syscall  0x80/imm8
 <span id="L40" class="LineNr">40 </span>
 <span id="L41" class="LineNr">41 </span><span class="subxFunction">ascii-difference</span>:  <span class="subxComment"># (s1, s2) : null-terminated ascii strings</span>
 <span id="L42" class="LineNr">42 </span>    <span class="subxComment"># a = first letter of s1 (ECX)</span>
-<span id="L43" class="LineNr">43 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
-<span id="L44" class="LineNr">44 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          0/r32/EAX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *EAX to EAX</span>
+<span id="L43" class="LineNr">43 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              0/r32/EAX   4/disp8        <span class="Normal"> . </span>                <span class="subxComment"># copy *(ESP+4) to EAX</span>
+<span id="L44" class="LineNr">44 </span>    8b/copy                         0/mod/indirect  0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          0/r32/EAX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *EAX to EAX</span>
 <span id="L45" class="LineNr">45 </span>    <span class="subxComment"># b = first letter of s2 (EDX)</span>
 <span id="L46" class="LineNr">46 </span>    8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              1/r32/ECX   8/disp8                           <span class="subxComment"># copy *(ESP+8) to ECX</span>
-<span id="L47" class="LineNr">47 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># copy *ECX to ECX</span>
+<span id="L47" class="LineNr">47 </span>    8b/copy                         0/mod/indirect  1/rm32/ECX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># copy *ECX to ECX</span>
 <span id="L48" class="LineNr">48 </span>    <span class="subxComment"># a-b</span>
-<span id="L49" class="LineNr">49 </span>    29/subtract                     3/mod/direct    0/rm32/EAX   <span class="CommentedCode"> . </span>         <span class="CommentedCode"> . </span>           <span class="CommentedCode"> . </span>          1/r32/ECX  <span class="CommentedCode"> . </span>             <span class="CommentedCode"> . </span>                <span class="subxComment"># subtract ECX from EAX</span>
+<span id="L49" class="LineNr">49 </span>    29/subtract                     3/mod/direct    0/rm32/EAX   <span class="Normal"> . </span>         <span class="Normal"> . </span>           <span class="Normal"> . </span>          1/r32/ECX  <span class="Normal"> . </span>             <span class="Normal"> . </span>                <span class="subxComment"># subtract ECX from EAX</span>
 <span id="L50" class="LineNr">50 </span>    c3/return
 <span id="L51" class="LineNr">51 </span>
 <span id="L52" class="LineNr">52 </span><span class="subxS2Comment"># . . vim&#0058;nowrap:textwidth=0</span>
diff --git a/html/tangle.mu.html b/html/tangle.mu.html
index e02280a9..53e9f824 100644
--- a/html/tangle.mu.html
+++ b/html/tangle.mu.html
@@ -7,24 +7,19 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
-.muControl { color:#c0a020; }
+.muControl { color: #804000; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Delimiter { color:#800080; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Delimiter { color: #c000c0; }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/html/x.mu.html b/html/x.mu.html
index d2bb04ae..560739ec 100644
--- a/html/x.mu.html
+++ b/html/x.mu.html
@@ -7,22 +7,17 @@
 <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="colorscheme" content="minimal">
+<meta name="colorscheme" content="minimal-light">
 <style type="text/css">
 <!--
-pre { white-space: pre-wrap; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-body { font-size:12pt; font-family: monospace; color: #aaaaaa; background-color: #080808; }
-.subxS2Comment a { color:inherit; }
-.subxS1Comment a { color:inherit; }
-.subxComment a { color:inherit; }
-.subxH2Comment a { color:inherit; }
-.subxH1Comment a { color:inherit; }
+pre { white-space: pre-wrap; font-family: monospace; color: #000000; background-color: #c6c6c6; }
+body { font-size:12pt; font-family: monospace; color: #000000; background-color: #c6c6c6; }
 * { font-size:12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.LineNr { color:#444444; }
-.Constant { color:#00a0a0; }
-.Special { color:#c00000; }
-.Comment { color: #8080ff; }
+.LineNr { }
+.Constant { color: #008787; }
+.Special { color: #ff6060; }
+.Comment { color: #005faf; }
 -->
 </style>
 
diff --git a/update_html b/update_html
index 85475325..95f96428 100755
--- a/update_html
+++ b/update_html
@@ -25,28 +25,6 @@ convert_html() {
 
   sed -i 's/^\* { \(.*\) }/* { font-size:12pt; \1 }/g' $1.html
   sed -i 's/^body { \(.*\) }/body { font-size:12pt; \1 }/g' $1.html
-  # turn most code grey
-  sed -i 's/#eeeeee/#aaaaaa/g' $1.html
-  # line numbers are darker than normal
-  sed -i 's/^\.LineNr .*/.LineNr { color:#444444; }/' $1.html  # line numbers
-  # tweak contrast for remaining colors
-  sed -i 's/^\.Constant .*/.Constant { color:#00a0a0; }/' $1.html
-  sed -i 's/^\.muControl .*/.muControl { color:#c0a020; }/' $1.html
-  # comment colors manually adjusted for better contrast; browser has >256 colors
-  sed -i 's/^\.Delimiter .*/.Delimiter { color:#800080; }/' $1.html  # not meant to be read; can be lower-contrast
-  sed -i 's/^\.PreProc .*/.PreProc { color:#800080; }/' $1.html  # not meant to be read; can be lower-contrast
-  sed -i 's/^\.Identifier .*/.Identifier { color:#c0a020; }/' $1.html  # same as muControl
-  sed -i 's/^\.Special .*/.Special { color:#c00000; }/' $1.html  # same as traceAbsent..
-  sed -i 's/^\.subxH1Comment.*/.subxH1Comment { color:#00ffff; }/' $1.html
-  sed -i 's/^\.subxComment.*/.subxComment { color:#16bfff; }/' $1.html
-  sed -i 's/^\.subxS1Comment.*/.subxS1Comment { color:#2d8cff; }/' $1.html
-  sed -i 's/^\.subxS2Comment.*/.subxS2Comment { color:#4466ff; }/' $1.html  # slightly too dark
-  # comment links in regular colors, just underlined
-  sed -i '/^body {/ a  .subxH1Comment a { color:inherit; }' $1.html
-  sed -i '/^body {/ a  .subxH2Comment a { color:inherit; }' $1.html
-  sed -i '/^body {/ a  .subxComment a { color:inherit; }' $1.html
-  sed -i '/^body {/ a  .subxS1Comment a { color:inherit; }' $1.html
-  sed -i '/^body {/ a  .subxS2Comment a { color:inherit; }' $1.html
 
   # switch unicode characters around in the rendered html
   #   the ones we have in the source files render double-wide in html
@@ -91,7 +69,9 @@ do
   process $f
 done
 
-echo > /tmp/tags
+( cd subx
+  ctags -x *.subx  > /tmp/tags
+)
 for f in subx/*.subx subx/examples/*.subx subx/apps/*.subx
 do
   process $f