about summary refs log tree commit diff stats
path: root/html
diff options
context:
space:
mode:
Diffstat (limited to 'html')
-rw-r--r--html/000organization.cc.html8
-rw-r--r--html/001help.cc.html21
-rw-r--r--html/002test.cc.html15
-rw-r--r--html/003trace.cc.html8
-rw-r--r--html/003trace.test.cc.html8
-rw-r--r--html/010vm.cc.html12
-rw-r--r--html/011load.cc.html14
-rw-r--r--html/012transform.cc.html8
-rw-r--r--html/013update_operation.cc.html16
-rw-r--r--html/014literal_string.cc.html12
-rw-r--r--html/015literal_noninteger.cc.html12
-rw-r--r--html/016dilated_reagent.cc.html19
-rw-r--r--html/017parse_tree.cc.html14
-rw-r--r--html/018constant.cc.html12
-rw-r--r--html/019type_abbreviations.cc.html16
-rw-r--r--html/020run.cc.html14
-rw-r--r--html/021check_instruction.cc.html14
-rw-r--r--html/022arithmetic.cc.html12
-rw-r--r--html/023boolean.cc.html12
-rw-r--r--html/024jump.cc.html16
-rw-r--r--html/025compare.cc.html12
-rw-r--r--html/026call.cc.html16
-rw-r--r--html/027call_ingredient.cc.html12
-rw-r--r--html/028call_return.cc.html12
-rw-r--r--html/029tools.cc.html16
-rw-r--r--html/030container.cc.html14
-rw-r--r--html/031merge.cc.html16
-rw-r--r--html/032array.cc.html16
-rw-r--r--html/033exclusive_container.cc.html16
-rw-r--r--html/034address.cc.html14
-rw-r--r--html/035lookup.cc.html176
-rw-r--r--html/036abandon.cc.html14
-rw-r--r--html/038new_text.cc.html16
-rw-r--r--html/040brace.cc.html12
-rw-r--r--html/041jump_target.cc.html14
-rw-r--r--html/042name.cc.html16
-rw-r--r--html/043space.cc.html19
-rw-r--r--html/044space_surround.cc.html12
-rw-r--r--html/045closure_name.cc.html12
-rw-r--r--html/046check_type_by_name.cc.html14
-rw-r--r--html/050scenario.cc.html18
-rw-r--r--html/051scenario_test.mu.html8
-rw-r--r--html/052tangle.cc.html14
-rw-r--r--html/053recipe_header.cc.html14
-rw-r--r--html/054static_dispatch.cc.html14
-rw-r--r--html/055shape_shifting_container.cc.html16
-rw-r--r--html/056shape_shifting_recipe.cc.html21
-rw-r--r--html/057immutable.cc.html14
-rw-r--r--html/058to_text.cc.html8
-rw-r--r--html/059to_text.mu.html8
-rw-r--r--html/060rewrite_literal_string.cc.html10
-rw-r--r--html/061text.mu.html12
-rw-r--r--html/062convert_ingredients_to_text.cc.html12
-rw-r--r--html/063array.mu.html12
-rw-r--r--html/064list.mu.html14
-rw-r--r--html/065duplex_list.mu.html14
-rw-r--r--html/066stream.mu.html12
-rw-r--r--html/067random.cc.html8
-rw-r--r--html/068random.mu.html12
-rw-r--r--html/069hash.cc.html18
-rw-r--r--html/070table.mu.html14
-rw-r--r--html/072recipe.cc.html16
-rw-r--r--html/073scheduler.cc.html16
-rw-r--r--html/074wait.cc.html16
-rw-r--r--html/075channel.mu.html18
-rw-r--r--html/076continuation.cc.html14
-rw-r--r--html/080display.cc.html12
-rw-r--r--html/081print.mu.html16
-rw-r--r--html/082scenario_screen.cc.html14
-rw-r--r--html/083scenario_screen_test.mu.html8
-rw-r--r--html/084console.mu.html12
-rw-r--r--html/085scenario_console.cc.html10
-rw-r--r--html/086scenario_console_test.mu.html8
-rw-r--r--html/087file.cc.html8
-rw-r--r--html/088file.mu.html12
-rw-r--r--html/089scenario_filesystem.cc.html12
-rw-r--r--html/090scenario_filesystem_test.mu.html8
-rw-r--r--html/091socket.cc.html10
-rw-r--r--html/092socket.mu.html12
-rw-r--r--html/099hardware_checks.cc.html12
-rw-r--r--html/100trace_browser.cc.html8
-rw-r--r--html/101run_sandboxed.cc.html16
-rw-r--r--html/998check_type_pointers.cc.html6
-rw-r--r--html/999spaces.cc.html8
-rw-r--r--html/channel.mu.html10
-rw-r--r--html/chessboard.mu.html18
-rw-r--r--html/console.mu.html10
-rw-r--r--html/continuation1.mu.html6
-rw-r--r--html/continuation2.mu.html8
-rw-r--r--html/continuation3.mu.html6
-rw-r--r--html/continuation4.mu.html8
-rw-r--r--html/continuation5.mu.html8
-rw-r--r--html/counters.mu.html6
-rw-r--r--html/display.mu.html6
-rw-r--r--html/edit/001-editor.mu.html14
-rw-r--r--html/edit/002-typing.mu.html14
-rw-r--r--html/edit/003-shortcuts.mu.html14
-rw-r--r--html/edit/004-programming-environment.mu.html14
-rw-r--r--html/edit/005-sandbox.mu.html14
-rw-r--r--html/edit/006-sandbox-copy.mu.html14
-rw-r--r--html/edit/007-sandbox-delete.mu.html14
-rw-r--r--html/edit/008-sandbox-edit.mu.html14
-rw-r--r--html/edit/009-sandbox-test.mu.html14
-rw-r--r--html/edit/010-sandbox-trace.mu.html12
-rw-r--r--html/edit/011-errors.mu.html14
-rw-r--r--html/edit/012-editor-undo.mu.html14
-rw-r--r--html/example1.mu.html6
-rw-r--r--html/exception1.mu.html8
-rw-r--r--html/exception2.mu.html12
-rw-r--r--html/factorial.mu.html12
-rw-r--r--html/filesystem.mu.html10
-rw-r--r--html/fork.mu.html8
-rw-r--r--html/http-client.mu.html10
-rw-r--r--html/http-server.mu.html10
-rw-r--r--html/immutable-error.mu.html6
-rw-r--r--html/lambda-to-mu.mu.html16
-rw-r--r--html/mutable.mu.html6
-rw-r--r--html/nqueens.mu.html12
-rw-r--r--html/real-files.mu.html6
-rw-r--r--html/same-fringe.mu.html12
-rw-r--r--html/screen.mu.html6
-rw-r--r--html/static-dispatch.mu.html6
-rw-r--r--html/subx/000organization.cc.html10
-rw-r--r--html/subx/001help.cc.html21
-rw-r--r--html/subx/002test.cc.html15
-rw-r--r--html/subx/003trace.cc.html20
-rw-r--r--html/subx/003trace.test.cc.html8
-rw-r--r--html/subx/011run.cc.html12
-rw-r--r--html/subx/012elf.cc.html221
-rw-r--r--html/subx/013direct_addressing.cc.html664
-rw-r--r--html/subx/014indirect_addressing.cc.html827
-rw-r--r--html/subx/015immediate_addressing.cc.html939
-rw-r--r--html/subx/016index_addressing.cc.html2
-rw-r--r--html/subx/019functions.cc.html12
-rw-r--r--html/subx/028translate.cc.html2
-rw-r--r--html/subx/030---operands.cc.html6
-rw-r--r--html/subx/031check_operands.cc.html679
-rw-r--r--html/subx/032check_operand_bounds.cc.html2
-rw-r--r--html/subx/034compute_segment_address.cc.html6
-rw-r--r--html/subx/apps/factorial.subx.html60
-rw-r--r--html/subx/examples/ex1.1.subx.html2
-rw-r--r--html/subx/examples/ex1.2.subx.html2
-rw-r--r--html/subx/examples/ex2.subx.html2
-rw-r--r--html/subx/examples/ex3.subx.html2
-rw-r--r--html/subx/examples/ex4.subx.html4
-rw-r--r--html/subx/examples/ex5.subx.html2
-rw-r--r--html/subx/examples/ex6.subx.html4
-rw-r--r--html/subx/examples/ex7.subx.html4
-rw-r--r--html/subx/examples/ex8.subx.html2
-rw-r--r--html/tangle.mu.html8
-rw-r--r--html/x.mu.html6
151 files changed, 2624 insertions, 2575 deletions
diff --git a/html/000organization.cc.html b/html/000organization.cc.html
index 5216ea42..b065a644 100644
--- a/html/000organization.cc.html
+++ b/html/000organization.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 000organization.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
diff --git a/html/001help.cc.html b/html/001help.cc.html
index 9cccd867..cf25168c 100644
--- a/html/001help.cc.html
+++ b/html/001help.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 001help.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.SalientComment { color: #00ffff; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -222,16 +221,16 @@ if ('onhashchange' in window) {
 <span id="L160" class="LineNr">160 </span><span class="Normal">void</span> <a href='001help.cc.html#L160'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> siginfo_t* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <span class="Normal">void</span>* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L161" class="LineNr">161 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L162" class="LineNr">162 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L163" class="LineNr">163 </span><span class="PreProc">      #ifndef __APPLE__</span>
+<span id="L163" class="LineNr">163 </span>      <span class="Comment">#ifndef __APPLE__</span>
 <span id="L164" class="LineNr">164 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure or exception</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L165" class="LineNr">165 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L166" class="LineNr">166 </span><span class="PreProc">      #endif</span>
+<span id="L166" class="LineNr">166 </span>      <span class="Comment">#endif</span>
 <span id="L167" class="LineNr">167 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L168" class="LineNr">168 </span>    <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L169" class="LineNr">169 </span><span class="PreProc">      #ifdef __APPLE__</span>
+<span id="L169" class="LineNr">169 </span>      <span class="Comment">#ifdef __APPLE__</span>
 <span id="L170" class="LineNr">170 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L171" class="LineNr">171 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L172" class="LineNr">172 </span><span class="PreProc">      #endif</span>
+<span id="L172" class="LineNr">172 </span>      <span class="Comment">#endif</span>
 <span id="L173" class="LineNr">173 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L174" class="LineNr">174 </span>    <span class="Normal">default</span>:
 <span id="L175" class="LineNr">175 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/002test.cc.html b/html/002test.cc.html
index bfc90b4a..cbb0124a 100644
--- a/html/002test.cc.html
+++ b/html/002test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 002test.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -74,7 +73,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment">// move a global ahead into types that we can't generate an extern declaration for</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Normal">const</span> <a href='002test.cc.html#L12'>test_fn</a> Tests[] = <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build*' scripts</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="Comment">#include &quot;test_list&quot;  // auto-generated; see 'build*' scripts</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">};</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
@@ -147,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L86" class="LineNr"> 86 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L87" class="LineNr"> 87 </span><span class="Comment">// Names for each element of the 'Tests' global, respectively.</span>
 <span id="L88" class="LineNr"> 88 </span><span class="Normal">const</span> string Test_names[] = <span class="Delimiter">{</span>
-<span id="L89" class="LineNr"> 89 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_name_list&quot;</span>  <span class="Comment">// auto-generated; see 'build*' scripts</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Comment">#include &quot;test_name_list&quot;  // auto-generated; see 'build*' scripts</span>
 <span id="L90" class="LineNr"> 90 </span><span class="Delimiter">};</span>
 <span id="L91" class="LineNr"> 91 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
 <span id="L92" class="LineNr"> 92 </span>string maybe_single_test_to_run = argv[argc-<span class="Constant">1</span>]<span class="Delimiter">;</span>
diff --git a/html/003trace.cc.html b/html/003trace.cc.html
index 5fd1ef5d..3c8eef8e 100644
--- a/html/003trace.cc.html
+++ b/html/003trace.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 003trace.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/003trace.test.cc.html b/html/003trace.test.cc.html
index 6cbfdac1..16c8fc30 100644
--- a/html/003trace.test.cc.html
+++ b/html/003trace.test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 003trace.test.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/010vm.cc.html b/html/010vm.cc.html
index 4ae3bc72..ea8ea5a1 100644
--- a/html/010vm.cc.html
+++ b/html/010vm.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 010vm.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .CommentedCode { color: #6c6c6c; }
-.cSpecial { color: #008000; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/011load.cc.html b/html/011load.cc.html
index d14085d8..ea3cb614 100644
--- a/html/011load.cc.html
+++ b/html/011load.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 011load.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/012transform.cc.html b/html/012transform.cc.html
index c47bf7d4..bf5def13 100644
--- a/html/012transform.cc.html
+++ b/html/012transform.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 012transform.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
diff --git a/html/013update_operation.cc.html b/html/013update_operation.cc.html
index 747ca918..458c52be 100644
--- a/html/013update_operation.cc.html
+++ b/html/013update_operation.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 013update_operation.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
+.CommentedCode { color: #6c6c6c; }
 .traceContains { color: #008000; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/014literal_string.cc.html b/html/014literal_string.cc.html
index 3dcbeef5..a4bedd50 100644
--- a/html/014literal_string.cc.html
+++ b/html/014literal_string.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 014literal_string.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/015literal_noninteger.cc.html b/html/015literal_noninteger.cc.html
index 55554557..d38372a1 100644
--- a/html/015literal_noninteger.cc.html
+++ b/html/015literal_noninteger.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 015literal_noninteger.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/016dilated_reagent.cc.html b/html/016dilated_reagent.cc.html
index dcd7bb87..3ab4e25e 100644
--- a/html/016dilated_reagent.cc.html
+++ b/html/016dilated_reagent.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 016dilated_reagent.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.traceContains { color: #008000; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
@@ -75,7 +74,7 @@ if ('onhashchange' in window) {
 <span id="L11" class="LineNr"> 11 </span>
 <span id="L12" class="LineNr"> 12 </span><span class="Delimiter">:(scenario load_trailing_space_after_curly_bracket)</span>
 <span id="L13" class="LineNr"> 13 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
-<span id="L14" class="LineNr"> 14 </span><span class="PreProc">  </span><span class="Comment"># line below has a space at the end</span>
+<span id="L14" class="LineNr"> 14 </span>  <span class="Comment"># line below has a space at the end</span>
 <span id="L15" class="LineNr"> 15 </span>  <span class="Delimiter">{</span><span class="Error"> </span>
 <span id="L16" class="LineNr"> 16 </span>]
 <span id="L17" class="LineNr"> 17 </span><span class="Comment"># successfully parsed</span>
diff --git a/html/017parse_tree.cc.html b/html/017parse_tree.cc.html
index 506a30b7..9c1a1763 100644
--- a/html/017parse_tree.cc.html
+++ b/html/017parse_tree.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 017parse_tree.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/018constant.cc.html b/html/018constant.cc.html
index 33c35cb3..580cf297 100644
--- a/html/018constant.cc.html
+++ b/html/018constant.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 018constant.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/019type_abbreviations.cc.html b/html/019type_abbreviations.cc.html
index 43be122b..c2df1ab2 100644
--- a/html/019type_abbreviations.cc.html
+++ b/html/019type_abbreviations.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 019type_abbreviations.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Special { color: #c00000; }
+.Identifier { color: #c0a020; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
-.cSpecial { color: #008000; }
+.Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .SalientComment { color: #00ffff; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Constant { color: #00a0a0; }
+.cSpecial { color: #008000; }
 .traceContains { color: #008000; }
 -->
 </style>
diff --git a/html/020run.cc.html b/html/020run.cc.html
index 3e2dd8e7..5545f527 100644
--- a/html/020run.cc.html
+++ b/html/020run.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 020run.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/021check_instruction.cc.html b/html/021check_instruction.cc.html
index b9b5109c..74c47cc7 100644
--- a/html/021check_instruction.cc.html
+++ b/html/021check_instruction.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 021check_instruction.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
+.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; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/022arithmetic.cc.html b/html/022arithmetic.cc.html
index d5895683..6f3751ba 100644
--- a/html/022arithmetic.cc.html
+++ b/html/022arithmetic.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 022arithmetic.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/023boolean.cc.html b/html/023boolean.cc.html
index 56a4896d..8acc8772 100644
--- a/html/023boolean.cc.html
+++ b/html/023boolean.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 023boolean.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/024jump.cc.html b/html/024jump.cc.html
index 9f87a0fa..a1ea6ae8 100644
--- a/html/024jump.cc.html
+++ b/html/024jump.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 024jump.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceAbsent { color: #c00000; }
+.Identifier { color: #c0a020; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.Identifier { color: #c0a020; }
+.Special { color: #c00000; }
+.cSpecial { color: #008000; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/025compare.cc.html b/html/025compare.cc.html
index 0bcdfc43..b4940bb8 100644
--- a/html/025compare.cc.html
+++ b/html/025compare.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 025compare.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/026call.cc.html b/html/026call.cc.html
index b4e9eb8b..eb8d34c2 100644
--- a/html/026call.cc.html
+++ b/html/026call.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 026call.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.Identifier { color: #c0a020; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .SalientComment { color: #00ffff; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.Identifier { color: #c0a020; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/027call_ingredient.cc.html b/html/027call_ingredient.cc.html
index 525c90d2..511d3b86 100644
--- a/html/027call_ingredient.cc.html
+++ b/html/027call_ingredient.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 027call_ingredient.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/028call_return.cc.html b/html/028call_return.cc.html
index 7c4d5593..820a1977 100644
--- a/html/028call_return.cc.html
+++ b/html/028call_return.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 028call_return.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/029tools.cc.html b/html/029tools.cc.html
index 674fc50c..9feaebea 100644
--- a/html/029tools.cc.html
+++ b/html/029tools.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 029tools.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.cSpecial { color: #008000; }
 .CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/030container.cc.html b/html/030container.cc.html
index 1bd22074..775f6bc0 100644
--- a/html/030container.cc.html
+++ b/html/030container.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 030container.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.SalientComment { color: #00ffff; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/031merge.cc.html b/html/031merge.cc.html
index 4fc45ec7..0e600de0 100644
--- a/html/031merge.cc.html
+++ b/html/031merge.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 031merge.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.muData { color: #ffff00; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
+.muData { color: #ffff00; }
+.Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/032array.cc.html b/html/032array.cc.html
index b80fa24b..65369b1a 100644
--- a/html/032array.cc.html
+++ b/html/032array.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 032array.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/033exclusive_container.cc.html b/html/033exclusive_container.cc.html
index a62938fa..7dc49376 100644
--- a/html/033exclusive_container.cc.html
+++ b/html/033exclusive_container.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 033exclusive_container.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/034address.cc.html b/html/034address.cc.html
index a1beb9aa..54a3172d 100644
--- a/html/034address.cc.html
+++ b/html/034address.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 034address.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.CommentedCode { color: #6c6c6c; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/035lookup.cc.html b/html/035lookup.cc.html
index f69999d1..5cbe1d26 100644
--- a/html/035lookup.cc.html
+++ b/html/035lookup.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 035lookup.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
+.traceAbsent { color: #c00000; }
+.SalientComment { color: #00ffff; }
 .CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr">  4 </span><span class="Comment">//: 'new'.</span>
 <span id="L5" class="LineNr">  5 </span>
 <span id="L6" class="LineNr">  6 </span><span class="Delimiter">:(scenario copy_indirect)</span>
-<span id="L7" class="LineNr">  7 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L7" class="LineNr">  7 </span><span class="muRecipe">def</span> main [
 <span id="L8" class="LineNr">  8 </span>  <span class="Comment"># skip alloc id for 10:&amp;:num</span>
 <span id="L9" class="LineNr">  9 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L10" class="LineNr"> 10 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -81,12 +81,12 @@ if ('onhashchange' in window) {
 <span id="L16" class="LineNr"> 16 </span><span class="traceContains">+mem: storing 94 in location 30</span>
 <span id="L17" class="LineNr"> 17 </span>
 <span id="L18" class="LineNr"> 18 </span><span class="Delimiter">:(before &quot;End Preprocess read_memory(x)&quot;)</span>
-<span id="L19" class="LineNr"> 19 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L19" class="LineNr"> 19 </span>canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L20" class="LineNr"> 20 </span>
 <span id="L21" class="LineNr"> 21 </span><span class="Comment">//: similarly, write to addresses pointing at other locations using the</span>
 <span id="L22" class="LineNr"> 22 </span><span class="Comment">//: 'lookup' property</span>
 <span id="L23" class="LineNr"> 23 </span><span class="Delimiter">:(scenario store_indirect)</span>
-<span id="L24" class="LineNr"> 24 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L24" class="LineNr"> 24 </span><span class="muRecipe">def</span> main [
 <span id="L25" class="LineNr"> 25 </span>  <span class="Comment"># skip alloc id for 10:&amp;:num</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Constant">10</span>:&amp;:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">94</span>
@@ -94,30 +94,30 @@ if ('onhashchange' in window) {
 <span id="L29" class="LineNr"> 29 </span><span class="traceContains">+mem: storing 94 in location 11</span>
 <span id="L30" class="LineNr"> 30 </span>
 <span id="L31" class="LineNr"> 31 </span><span class="Delimiter">:(before &quot;End Preprocess write_memory(x, data)&quot;)</span>
-<span id="L32" class="LineNr"> 32 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L32" class="LineNr"> 32 </span>canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L33" class="LineNr"> 33 </span>
 <span id="L34" class="LineNr"> 34 </span><span class="Comment">//: writes to address 0 always loudly fail</span>
 <span id="L35" class="LineNr"> 35 </span><span class="Delimiter">:(scenario store_to_0_fails)</span>
 <span id="L36" class="LineNr"> 36 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L37" class="LineNr"> 37 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L37" class="LineNr"> 37 </span><span class="muRecipe">def</span> main [
 <span id="L38" class="LineNr"> 38 </span>  <span class="Constant">10</span>:&amp;:num<span class="Special"> &lt;- </span>copy<span class="Constant"> null</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Constant">10</span>:&amp;:num/lookup<span class="Special"> &lt;- </span>copy <span class="Constant">94</span>
 <span id="L40" class="LineNr"> 40 </span>]
 <span id="L41" class="LineNr"> 41 </span><span class="traceAbsent">-mem: storing 94 in location 0</span>
-<span id="L42" class="LineNr"> 42 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: tried to lookup 0 in '10:&amp;:num/lookup &lt;- copy 94'</span>
+<span id="L42" class="LineNr"> 42 </span><span class="traceContains">+error: main: tried to lookup 0 in '10:&amp;:num/lookup &lt;- copy 94'</span>
 <span id="L43" class="LineNr"> 43 </span>
 <span id="L44" class="LineNr"> 44 </span><span class="Comment">//: attempts to /lookup address 0 always loudly fail</span>
 <span id="L45" class="LineNr"> 45 </span><span class="Delimiter">:(scenario lookup_0_fails)</span>
 <span id="L46" class="LineNr"> 46 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L47" class="LineNr"> 47 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L47" class="LineNr"> 47 </span><span class="muRecipe">def</span> main [
 <span id="L48" class="LineNr"> 48 </span>  <span class="Constant">10</span>:&amp;:num<span class="Special"> &lt;- </span>copy<span class="Constant"> null</span>
 <span id="L49" class="LineNr"> 49 </span>  <span class="Constant">20</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:&amp;:num/lookup
 <span id="L50" class="LineNr"> 50 </span>]
-<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: tried to lookup 0 in '20:num &lt;- copy 10:&amp;:num/lookup'</span>
+<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+error: main: tried to lookup 0 in '20:num &lt;- copy 10:&amp;:num/lookup'</span>
 <span id="L52" class="LineNr"> 52 </span>
 <span id="L53" class="LineNr"> 53 </span><span class="Delimiter">:(scenario lookup_0_dumps_callstack)</span>
 <span id="L54" class="LineNr"> 54 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L55" class="LineNr"> 55 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L55" class="LineNr"> 55 </span><span class="muRecipe">def</span> main [
 <span id="L56" class="LineNr"> 56 </span>  foo<span class="Constant"> null</span>
 <span id="L57" class="LineNr"> 57 </span>]
 <span id="L58" class="LineNr"> 58 </span><span class="muRecipe">def</span> foo [
@@ -125,55 +125,55 @@ if ('onhashchange' in window) {
 <span id="L60" class="LineNr"> 60 </span>  <span class="Constant">20</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:&amp;:num/lookup
 <span id="L61" class="LineNr"> 61 </span>]
 <span id="L62" class="LineNr"> 62 </span><span class="traceContains">+error: foo: tried to lookup 0 in '20:num &lt;- copy 10:&amp;:num/lookup'</span>
-<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+error:   called from <a href='000organization.cc.html#L113'>main</a>: foo null</span>
+<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+error:   called from main: foo null</span>
 <span id="L64" class="LineNr"> 64 </span>
 <span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(code)</span>
-<span id="L66" class="LineNr"> 66 </span><span class="Normal">void</span> <a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L66" class="LineNr"> 66 </span><span class="Normal">void</span> canonize<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L67" class="LineNr"> 67 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>is_literal<span class="Delimiter">(</span>x<span class="Delimiter">))</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L68" class="LineNr"> 68 </span>  <span class="Comment">// Begin canonize(x) Lookups</span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">))</span>
-<span id="L70" class="LineNr"> 70 </span>    <a href='035lookup.cc.html#L73'>lookup_memory</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L70" class="LineNr"> 70 </span>    lookup_memory<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L71" class="LineNr"> 71 </span><span class="Delimiter">}</span>
 <span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> <a href='035lookup.cc.html#L73'>lookup_memory</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L73" class="LineNr"> 73 </span><span class="Normal">void</span> lookup_memory<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L74" class="LineNr"> 74 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!x<span class="Delimiter">.</span>type || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || x<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value != Address_type_ordinal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L75" class="LineNr"> 75 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' but it isn't an address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L75" class="LineNr"> 75 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; maybe<span class="Delimiter">(</span>current_recipe_name<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup '&quot;</span> &lt;&lt; x<span class="Delimiter">.</span>original_string &lt;&lt; <span class="Constant">&quot;' but it isn't an address</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
 <span id="L76" class="LineNr"> 76 </span>    dump_callstack<span class="Delimiter">();</span>
 <span id="L77" class="LineNr"> 77 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L78" class="LineNr"> 78 </span>  <span class="Delimiter">}</span>
 <span id="L79" class="LineNr"> 79 </span>  <span class="Comment">// compute value</span>
 <span id="L80" class="LineNr"> 80 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>x<span class="Delimiter">.</span>value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L81" class="LineNr"> 81 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; maybe<span class="Delimiter">(</span>current_recipe_name<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L82" class="LineNr"> 82 </span>    dump_callstack<span class="Delimiter">();</span>
 <span id="L83" class="LineNr"> 83 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L84" class="LineNr"> 84 </span>  <span class="Delimiter">}</span>
-<span id="L85" class="LineNr"> 85 </span>  <a href='035lookup.cc.html#L88'>lookup_memory_core</a><span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">check_for_null</span><span class="Comment">*/</span><span class="Constant">true</span><span class="Delimiter">);</span>
+<span id="L85" class="LineNr"> 85 </span>  lookup_memory_core<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Comment">/*</span><span class="Comment">check_for_null</span><span class="Comment">*/</span><span class="Constant">true</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="Normal">void</span> <a href='035lookup.cc.html#L88'>lookup_memory_core</a><span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">bool</span> check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">double</span> <a href='043space.cc.html#L101'>address</a> = x<span class="Delimiter">.</span>value + <span class="Comment">/*</span><span class="Comment">skip alloc id in <a href='043space.cc.html#L101'>address</a></span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">double</span> new_value = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> <a href='043space.cc.html#L101'>address</a><span class="Delimiter">);</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L190'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; <a href='043space.cc.html#L101'>address</a> &lt;&lt; <span class="Constant">&quot; contains &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>new_value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span><span class="Normal">void</span> lookup_memory_core<span class="Delimiter">(</span>reagent&amp; x<span class="Delimiter">,</span> <span class="Normal">bool</span> check_for_null<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L89" class="LineNr"> 89 </span>  <span class="Normal">double</span> address = x<span class="Delimiter">.</span>value + <span class="Comment">/*</span><span class="Comment">skip alloc id in address</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L90" class="LineNr"> 90 </span>  <span class="Normal">double</span> new_value = <a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> address<span class="Delimiter">);</span>
+<span id="L91" class="LineNr"> 91 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">&quot;mem&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;location &quot;</span> &lt;&lt; address &lt;&lt; <span class="Constant">&quot; contains &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>new_value<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L92" class="LineNr"> 92 </span>  <span class="Comment">// check for null</span>
 <span id="L93" class="LineNr"> 93 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>check_for_null &amp;&amp; new_value == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L94" class="LineNr"> 94 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Current_routine<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L95" class="LineNr"> 95 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; maybe<span class="Delimiter">(</span>current_recipe_name<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;tried to lookup 0 in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L96" class="LineNr"> 96 </span>      dump_callstack<span class="Delimiter">();</span>
 <span id="L97" class="LineNr"> 97 </span>    <span class="Delimiter">}</span>
 <span id="L98" class="LineNr"> 98 </span>    <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L99" class="LineNr"> 99 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L99" class="LineNr"> 99 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;tried to lookup 0</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L100" class="LineNr">100 </span>    <span class="Delimiter">}</span>
 <span id="L101" class="LineNr">101 </span>  <span class="Delimiter">}</span>
 <span id="L102" class="LineNr">102 </span>  <span class="Comment">// validate alloc-id</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Normal">double</span> alloc_id_in_address = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">double</span> alloc_id_in_payload = <a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_value<span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">double</span> alloc_id_in_address = <a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> x<span class="Delimiter">.</span>value<span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">double</span> alloc_id_in_payload = <a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> new_value<span class="Delimiter">);</span>
 <span id="L105" class="LineNr">105 </span><span class="CommentedCode">//?   cerr &lt;&lt; x.value &lt;&lt; &quot;: &quot; &lt;&lt; alloc_id_in_address &lt;&lt; &quot; vs &quot; &lt;&lt; new_value &lt;&lt; &quot;: &quot; &lt;&lt; alloc_id_in_payload &lt;&lt; '\n';</span>
 <span id="L106" class="LineNr">106 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>alloc_id_in_address != alloc_id_in_payload<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;address is already abandoned in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L107" class="LineNr">107 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; maybe<span class="Delimiter">(</span>current_recipe_name<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;address is already abandoned in '&quot;</span> &lt;&lt; to_original_string<span class="Delimiter">(</span>current_instruction<span class="Delimiter">())</span> &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L108" class="LineNr">108 </span>      dump_callstack<span class="Delimiter">();</span>
 <span id="L109" class="LineNr">109 </span>  <span class="Delimiter">}</span>
 <span id="L110" class="LineNr">110 </span>  <span class="Comment">// all well; complete the lookup</span>
-<span id="L111" class="LineNr">111 </span>  x<span class="Delimiter">.</span><a href='010vm.cc.html#L67'>set_value</a><span class="Delimiter">(</span>new_value+<span class="Comment">/*</span><span class="Comment">skip alloc id in payload</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  x<span class="Delimiter">.</span>set_value<span class="Delimiter">(</span>new_value+<span class="Comment">/*</span><span class="Comment">skip alloc id in payload</span><span class="Comment">*/</span><span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L112" class="LineNr">112 </span>  drop_from_type<span class="Delimiter">(</span>x<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
 <span id="L113" class="LineNr">113 </span>  drop_one_lookup<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
@@ -216,7 +216,7 @@ if ('onhashchange' in window) {
 <span id="L151" class="LineNr">151 </span><span class="Normal">bool</span> canonize_type<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L152" class="LineNr">152 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span>has_property<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;lookup&quot;</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>!r<span class="Delimiter">.</span>type || r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>atom || !r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left || !r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>atom || r<span class="Delimiter">.</span>type<span class="Delimiter">-&gt;</span>left<span class="Delimiter">-&gt;</span>value != Address_type_ordinal<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;cannot perform lookup on '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' because it has non-address type &quot;</span> &lt;&lt; <a href='028call_return.cc.html#L163'>to_string</a><span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L154" class="LineNr">154 </span>      <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;cannot perform lookup on '&quot;</span> &lt;&lt; r<span class="Delimiter">.</span>name &lt;&lt; <span class="Constant">&quot;' because it has non-address type &quot;</span> &lt;&lt; to_string<span class="Delimiter">(</span>r<span class="Delimiter">.</span>type<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L155" class="LineNr">155 </span>      <span class="Identifier">return</span><span class="Constant"> false</span><span class="Delimiter">;</span>
 <span id="L156" class="LineNr">156 </span>    <span class="Delimiter">}</span>
 <span id="L157" class="LineNr">157 </span>    drop_from_type<span class="Delimiter">(</span>r<span class="Delimiter">,</span> <span class="Constant">&quot;address&quot;</span><span class="Delimiter">);</span>
@@ -226,7 +226,7 @@ if ('onhashchange' in window) {
 <span id="L161" class="LineNr">161 </span><span class="Delimiter">}</span>
 <span id="L162" class="LineNr">162 </span>
 <span id="L163" class="LineNr">163 </span><span class="Normal">void</span> drop_one_lookup<span class="Delimiter">(</span>reagent&amp; r<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L164" class="LineNr">164 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt;::iterator p = r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span><a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L164" class="LineNr">164 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;pair&lt;string<span class="Delimiter">,</span> string_tree*&gt; &gt;::iterator p = r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L165" class="LineNr">165 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span>first == <span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L166" class="LineNr">166 </span>      r<span class="Delimiter">.</span>properties<span class="Delimiter">.</span>erase<span class="Delimiter">(</span>p<span class="Delimiter">);</span>
 <span id="L167" class="LineNr">167 </span>      <span class="Identifier">return</span><span class="Delimiter">;</span>
@@ -240,7 +240,7 @@ if ('onhashchange' in window) {
 <span id="L175" class="LineNr">175 </span><span class="Comment">//: 'products' variables in run_current_routine().</span>
 <span id="L176" class="LineNr">176 </span>
 <span id="L177" class="LineNr">177 </span><span class="Delimiter">:(scenario get_indirect)</span>
-<span id="L178" class="LineNr">178 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L178" class="LineNr">178 </span><span class="muRecipe">def</span> main [
 <span id="L179" class="LineNr">179 </span>  <span class="Comment"># skip alloc id for 10:&amp;:point</span>
 <span id="L180" class="LineNr">180 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L181" class="LineNr">181 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -251,7 +251,7 @@ if ('onhashchange' in window) {
 <span id="L186" class="LineNr">186 </span><span class="traceContains">+mem: storing 94 in location 30</span>
 <span id="L187" class="LineNr">187 </span>
 <span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario get_indirect2)</span>
-<span id="L189" class="LineNr">189 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L189" class="LineNr">189 </span><span class="muRecipe">def</span> main [
 <span id="L190" class="LineNr">190 </span>  <span class="Comment"># skip alloc id for 10:&amp;:point</span>
 <span id="L191" class="LineNr">191 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L192" class="LineNr">192 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -264,7 +264,7 @@ if ('onhashchange' in window) {
 <span id="L199" class="LineNr">199 </span><span class="traceContains">+mem: storing 94 in location 41</span>
 <span id="L200" class="LineNr">200 </span>
 <span id="L201" class="LineNr">201 </span><span class="Delimiter">:(scenario include_nonlookup_properties)</span>
-<span id="L202" class="LineNr">202 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L202" class="LineNr">202 </span><span class="muRecipe">def</span> main [
 <span id="L203" class="LineNr">203 </span>  <span class="Comment"># skip alloc id for 10:&amp;:point</span>
 <span id="L204" class="LineNr">204 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L205" class="LineNr">205 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -279,16 +279,16 @@ if ('onhashchange' in window) {
 <span id="L214" class="LineNr">214 </span><span class="Delimiter">:(after &quot;Update GET product in Check&quot;)</span>
 <span id="L215" class="LineNr">215 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L216" class="LineNr">216 </span><span class="Delimiter">:(after &quot;Update GET base in Run&quot;)</span>
-<span id="L217" class="LineNr">217 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>base<span class="Delimiter">);</span>
+<span id="L217" class="LineNr">217 </span>canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L218" class="LineNr">218 </span>
 <span id="L219" class="LineNr">219 </span><span class="Delimiter">:(scenario put_indirect)</span>
-<span id="L220" class="LineNr">220 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L220" class="LineNr">220 </span><span class="muRecipe">def</span> main [
 <span id="L221" class="LineNr">221 </span>  <span class="Comment"># skip alloc id for 10:&amp;:point</span>
 <span id="L222" class="LineNr">222 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L223" class="LineNr">223 </span>  <span class="Comment"># skip alloc id for payload</span>
 <span id="L224" class="LineNr">224 </span>  <span class="Constant">21</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">94</span>
 <span id="L225" class="LineNr">225 </span>  <span class="Constant">22</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">95</span>
-<span id="L226" class="LineNr">226 </span>  <span class="Constant">10</span>:&amp;:point/lookup<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">10</span>:&amp;:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span><span class="Delimiter">,</span> <span class="Constant">96</span>
+<span id="L226" class="LineNr">226 </span>  <span class="Constant">10</span>:&amp;:point/lookup<span class="Special"> &lt;- </span><a href='001help.cc.html#L243'>put</a> <span class="Constant">10</span>:&amp;:point/lookup<span class="Delimiter">,</span> <span class="Constant">0:offset</span><span class="Delimiter">,</span> <span class="Constant">96</span>
 <span id="L227" class="LineNr">227 </span>]
 <span id="L228" class="LineNr">228 </span><span class="traceContains">+mem: storing 96 in location 21</span>
 <span id="L229" class="LineNr">229 </span>
@@ -297,19 +297,19 @@ if ('onhashchange' in window) {
 <span id="L232" class="LineNr">232 </span><span class="Delimiter">:(after &quot;Update PUT offset in Check&quot;)</span>
 <span id="L233" class="LineNr">233 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>offset<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L234" class="LineNr">234 </span><span class="Delimiter">:(after &quot;Update PUT base in Run&quot;)</span>
-<span id="L235" class="LineNr">235 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>base<span class="Delimiter">);</span>
+<span id="L235" class="LineNr">235 </span>canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L236" class="LineNr">236 </span>
 <span id="L237" class="LineNr">237 </span><span class="Delimiter">:(scenario put_product_error_with_lookup)</span>
 <span id="L238" class="LineNr">238 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L239" class="LineNr">239 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L239" class="LineNr">239 </span><span class="muRecipe">def</span> main [
 <span id="L240" class="LineNr">240 </span>  <span class="Comment"># skip alloc id for 10:&amp;:point</span>
 <span id="L241" class="LineNr">241 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L242" class="LineNr">242 </span>  <span class="Comment"># skip alloc id for payload</span>
 <span id="L243" class="LineNr">243 </span>  <span class="Constant">21</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">94</span>
 <span id="L244" class="LineNr">244 </span>  <span class="Constant">22</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">95</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Constant">10</span>:&amp;:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L221'>put</a> <span class="Constant">10</span>:&amp;:point/lookup<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">96</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Constant">10</span>:&amp;:point<span class="Special"> &lt;- </span><a href='001help.cc.html#L243'>put</a> <span class="Constant">10</span>:&amp;:point/lookup<span class="Delimiter">,</span> <span class="Constant">x:offset</span><span class="Delimiter">,</span> <span class="Constant">96</span>
 <span id="L246" class="LineNr">246 </span>]
-<span id="L247" class="LineNr">247 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product of 'put' must be first ingredient '10:&amp;:point/lookup', but got '10:&amp;:point'</span>
+<span id="L247" class="LineNr">247 </span><span class="traceContains">+error: main: product of 'put' must be first ingredient '10:&amp;:point/lookup', but got '10:&amp;:point'</span>
 <span id="L248" class="LineNr">248 </span>
 <span id="L249" class="LineNr">249 </span><span class="Delimiter">:(before &quot;End PUT Product Checks&quot;)</span>
 <span id="L250" class="LineNr">250 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> p = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -317,22 +317,22 @@ if ('onhashchange' in window) {
 <span id="L252" class="LineNr">252 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> i = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L253" class="LineNr">253 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
 <span id="L254" class="LineNr">254 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>p<span class="Delimiter">,</span> i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L255" class="LineNr">255 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L255" class="LineNr">255 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L256" class="LineNr">256 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
 <span id="L258" class="LineNr">258 </span>
 <span id="L259" class="LineNr">259 </span><span class="Delimiter">:(scenario new_error)</span>
 <span id="L260" class="LineNr">260 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L261" class="LineNr">261 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L261" class="LineNr">261 </span><span class="muRecipe">def</span> main [
 <span id="L262" class="LineNr">262 </span>  <span class="Constant">1</span>:num/<span class="Special">raw &lt;- </span><span class="Normal">new</span> <span class="Constant">num:type</span>
 <span id="L263" class="LineNr">263 </span>]
-<span id="L264" class="LineNr">264 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product of 'new' has incorrect type: '1:num/raw &lt;- new num:type'</span>
+<span id="L264" class="LineNr">264 </span><span class="traceContains">+error: main: product of 'new' has incorrect type: '1:num/raw &lt;- new num:type'</span>
 <span id="L265" class="LineNr">265 </span>
 <span id="L266" class="LineNr">266 </span><span class="Delimiter">:(after &quot;Update NEW product in Check&quot;)</span>
 <span id="L267" class="LineNr">267 </span>canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
 <span id="L268" class="LineNr">268 </span>
 <span id="L269" class="LineNr">269 </span><span class="Delimiter">:(scenario copy_array_indirect)</span>
-<span id="L270" class="LineNr">270 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L270" class="LineNr">270 </span><span class="muRecipe">def</span> main [
 <span id="L271" class="LineNr">271 </span>  <span class="Comment"># skip alloc id for 10:&amp;:@:num</span>
 <span id="L272" class="LineNr">272 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L273" class="LineNr">273 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -348,7 +348,7 @@ if ('onhashchange' in window) {
 <span id="L283" class="LineNr">283 </span><span class="traceContains">+mem: storing 96 in location 33</span>
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(scenario create_array_indirect)</span>
-<span id="L286" class="LineNr">286 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L286" class="LineNr">286 </span><span class="muRecipe">def</span> main [
 <span id="L287" class="LineNr">287 </span>  <span class="Comment"># skip alloc id for 10:&amp;:@:num:3</span>
 <span id="L288" class="LineNr">288 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3000</span>
 <span id="L289" class="LineNr">289 </span>  <span class="Constant">10</span>:&amp;:array:num:<span class="Constant">3</span>/lookup<span class="Special"> &lt;- </span>create-array
@@ -358,10 +358,10 @@ if ('onhashchange' in window) {
 <span id="L293" class="LineNr">293 </span><span class="Delimiter">:(after &quot;Update CREATE_ARRAY product in Check&quot;)</span>
 <span id="L294" class="LineNr">294 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L295" class="LineNr">295 </span><span class="Delimiter">:(after &quot;Update CREATE_ARRAY product in Run&quot;)</span>
-<span id="L296" class="LineNr">296 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>product<span class="Delimiter">);</span>
+<span id="L296" class="LineNr">296 </span>canonize<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
 <span id="L297" class="LineNr">297 </span>
 <span id="L298" class="LineNr">298 </span><span class="Delimiter">:(scenario index_indirect)</span>
-<span id="L299" class="LineNr">299 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L299" class="LineNr">299 </span><span class="muRecipe">def</span> main [
 <span id="L300" class="LineNr">300 </span>  <span class="Comment"># skip alloc id for 10:&amp;:@:num</span>
 <span id="L301" class="LineNr">301 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L302" class="LineNr">302 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -381,12 +381,12 @@ if ('onhashchange' in window) {
 <span id="L316" class="LineNr">316 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>product<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L317" class="LineNr">317 </span>
 <span id="L318" class="LineNr">318 </span><span class="Delimiter">:(before &quot;Update INDEX base in Run&quot;)</span>
-<span id="L319" class="LineNr">319 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>base<span class="Delimiter">);</span>
+<span id="L319" class="LineNr">319 </span>canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L320" class="LineNr">320 </span><span class="Delimiter">:(before &quot;Update INDEX index in Run&quot;)</span>
-<span id="L321" class="LineNr">321 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>index<span class="Delimiter">);</span>
+<span id="L321" class="LineNr">321 </span>canonize<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L322" class="LineNr">322 </span>
 <span id="L323" class="LineNr">323 </span><span class="Delimiter">:(scenario put_index_indirect)</span>
-<span id="L324" class="LineNr">324 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L324" class="LineNr">324 </span><span class="muRecipe">def</span> main [
 <span id="L325" class="LineNr">325 </span>  <span class="Comment"># skip alloc id for 10:&amp;:@:num</span>
 <span id="L326" class="LineNr">326 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L327" class="LineNr">327 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -399,7 +399,7 @@ if ('onhashchange' in window) {
 <span id="L334" class="LineNr">334 </span><span class="traceContains">+mem: storing 97 in location 23</span>
 <span id="L335" class="LineNr">335 </span>
 <span id="L336" class="LineNr">336 </span><span class="Delimiter">:(scenario put_index_indirect_2)</span>
-<span id="L337" class="LineNr">337 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L337" class="LineNr">337 </span><span class="muRecipe">def</span> main [
 <span id="L338" class="LineNr">338 </span>  <span class="Constant">10</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">3</span>  <span class="Comment"># array length</span>
 <span id="L339" class="LineNr">339 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">94</span>
 <span id="L340" class="LineNr">340 </span>  <span class="Constant">12</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">95</span>
@@ -414,7 +414,7 @@ if ('onhashchange' in window) {
 <span id="L349" class="LineNr">349 </span>
 <span id="L350" class="LineNr">350 </span><span class="Delimiter">:(scenario put_index_product_error_with_lookup)</span>
 <span id="L351" class="LineNr">351 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L352" class="LineNr">352 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L352" class="LineNr">352 </span><span class="muRecipe">def</span> main [
 <span id="L353" class="LineNr">353 </span>  <span class="Comment"># skip alloc id for 10:&amp;:@:num</span>
 <span id="L354" class="LineNr">354 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L355" class="LineNr">355 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -424,7 +424,7 @@ if ('onhashchange' in window) {
 <span id="L359" class="LineNr">359 </span>  <span class="Constant">24</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">96</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Constant">10</span>:&amp;:@:num<span class="Special"> &lt;- </span>put-index <span class="Constant">10</span>:&amp;:@:num/lookup<span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">,</span> <span class="Constant">34</span>
 <span id="L361" class="LineNr">361 </span>]
-<span id="L362" class="LineNr">362 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: product of 'put-index' must be first ingredient '10:&amp;:@:num/lookup', but got '10:&amp;:@:num'</span>
+<span id="L362" class="LineNr">362 </span><span class="traceContains">+error: main: product of 'put-index' must be first ingredient '10:&amp;:@:num/lookup', but got '10:&amp;:@:num'</span>
 <span id="L363" class="LineNr">363 </span>
 <span id="L364" class="LineNr">364 </span><span class="Delimiter">:(before &quot;End PUT_INDEX Product Checks&quot;)</span>
 <span id="L365" class="LineNr">365 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> p = inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
@@ -432,12 +432,12 @@ if ('onhashchange' in window) {
 <span id="L367" class="LineNr">367 </span>reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> i = inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
 <span id="L368" class="LineNr">368 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>i<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>  <span class="Comment">// error raised elsewhere</span>
 <span id="L369" class="LineNr">369 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!types_strictly_match<span class="Delimiter">(</span>p<span class="Delimiter">,</span> i<span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span>name<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put-index' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L370" class="LineNr">370 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; maybe<span class="Delimiter">(</span>get<span class="Delimiter">(</span>Recipe<span class="Delimiter">,</span> r<span class="Delimiter">).</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;product of 'put-index' must be first ingredient '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;', but got '&quot;</span> &lt;&lt; inst<span class="Delimiter">.</span>products<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L371" class="LineNr">371 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L372" class="LineNr">372 </span><span class="Delimiter">}</span>
 <span id="L373" class="LineNr">373 </span>
 <span id="L374" class="LineNr">374 </span><span class="Delimiter">:(scenario dilated_reagent_in_static_array)</span>
-<span id="L375" class="LineNr">375 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L375" class="LineNr">375 </span><span class="muRecipe">def</span> main [
 <span id="L376" class="LineNr">376 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>&amp; num<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>create-array
 <span id="L377" class="LineNr">377 </span>  <span class="Constant">10</span>:&amp;:num<span class="Special"> &lt;- </span><span class="Normal">new</span> <span class="Constant">num:type</span>
 <span id="L378" class="LineNr">378 </span>  <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>&amp; num<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)}</span><span class="Special"> &lt;- </span>put-index <span class="Delimiter">{</span><span class="Constant">1</span>: <span class="Delimiter">(</span>array <span class="Delimiter">(</span>&amp; num<span class="Delimiter">)</span> <span class="Constant">3</span><span class="Delimiter">)},</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">10</span>:&amp;:num
@@ -455,12 +455,12 @@ if ('onhashchange' in window) {
 <span id="L390" class="LineNr">390 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>value<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L391" class="LineNr">391 </span>
 <span id="L392" class="LineNr">392 </span><span class="Delimiter">:(before &quot;Update PUT_INDEX base in Run&quot;)</span>
-<span id="L393" class="LineNr">393 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>base<span class="Delimiter">);</span>
+<span id="L393" class="LineNr">393 </span>canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L394" class="LineNr">394 </span><span class="Delimiter">:(before &quot;Update PUT_INDEX index in Run&quot;)</span>
-<span id="L395" class="LineNr">395 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>index<span class="Delimiter">);</span>
+<span id="L395" class="LineNr">395 </span>canonize<span class="Delimiter">(</span>index<span class="Delimiter">);</span>
 <span id="L396" class="LineNr">396 </span>
 <span id="L397" class="LineNr">397 </span><span class="Delimiter">:(scenario length_indirect)</span>
-<span id="L398" class="LineNr">398 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L398" class="LineNr">398 </span><span class="muRecipe">def</span> main [
 <span id="L399" class="LineNr">399 </span>  <span class="Comment"># skip alloc id for 10:&amp;:@:num</span>
 <span id="L400" class="LineNr">400 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L401" class="LineNr">401 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -475,10 +475,10 @@ if ('onhashchange' in window) {
 <span id="L410" class="LineNr">410 </span><span class="Delimiter">:(before &quot;Update LENGTH array in Check&quot;)</span>
 <span id="L411" class="LineNr">411 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>array<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L412" class="LineNr">412 </span><span class="Delimiter">:(before &quot;Update LENGTH array in Run&quot;)</span>
-<span id="L413" class="LineNr">413 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>array<span class="Delimiter">);</span>
+<span id="L413" class="LineNr">413 </span>canonize<span class="Delimiter">(</span>array<span class="Delimiter">);</span>
 <span id="L414" class="LineNr">414 </span>
 <span id="L415" class="LineNr">415 </span><span class="Delimiter">:(scenario maybe_convert_indirect)</span>
-<span id="L416" class="LineNr">416 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L416" class="LineNr">416 </span><span class="muRecipe">def</span> main [
 <span id="L417" class="LineNr">417 </span>  <span class="Comment"># skip alloc id for 10:&amp;:number-or-point</span>
 <span id="L418" class="LineNr">418 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L419" class="LineNr">419 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -489,7 +489,7 @@ if ('onhashchange' in window) {
 <span id="L424" class="LineNr">424 </span><span class="traceContains">+mem: storing 94 in location 30</span>
 <span id="L425" class="LineNr">425 </span>
 <span id="L426" class="LineNr">426 </span><span class="Delimiter">:(scenario maybe_convert_indirect_2)</span>
-<span id="L427" class="LineNr">427 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L427" class="LineNr">427 </span><span class="muRecipe">def</span> main [
 <span id="L428" class="LineNr">428 </span>  <span class="Comment"># skip alloc id for 10:&amp;:number-or-point</span>
 <span id="L429" class="LineNr">429 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L430" class="LineNr">430 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -502,7 +502,7 @@ if ('onhashchange' in window) {
 <span id="L437" class="LineNr">437 </span><span class="traceContains">+mem: storing 94 in location 41</span>
 <span id="L438" class="LineNr">438 </span>
 <span id="L439" class="LineNr">439 </span><span class="Delimiter">:(scenario maybe_convert_indirect_3)</span>
-<span id="L440" class="LineNr">440 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L440" class="LineNr">440 </span><span class="muRecipe">def</span> main [
 <span id="L441" class="LineNr">441 </span>  <span class="Comment"># skip alloc id for 10:&amp;:number-or-point</span>
 <span id="L442" class="LineNr">442 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L443" class="LineNr">443 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -522,14 +522,14 @@ if ('onhashchange' in window) {
 <span id="L457" class="LineNr">457 </span><span class="Normal">if</span> <span class="Delimiter">(</span>!canonize_type<span class="Delimiter">(</span>status<span class="Delimiter">))</span> <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L458" class="LineNr">458 </span>
 <span id="L459" class="LineNr">459 </span><span class="Delimiter">:(before &quot;Update MAYBE_CONVERT base in Run&quot;)</span>
-<span id="L460" class="LineNr">460 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>base<span class="Delimiter">);</span>
+<span id="L460" class="LineNr">460 </span>canonize<span class="Delimiter">(</span>base<span class="Delimiter">);</span>
 <span id="L461" class="LineNr">461 </span><span class="Delimiter">:(before &quot;Update MAYBE_CONVERT product in Run&quot;)</span>
-<span id="L462" class="LineNr">462 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>product<span class="Delimiter">);</span>
+<span id="L462" class="LineNr">462 </span>canonize<span class="Delimiter">(</span>product<span class="Delimiter">);</span>
 <span id="L463" class="LineNr">463 </span><span class="Delimiter">:(before &quot;Update MAYBE_CONVERT status in Run&quot;)</span>
-<span id="L464" class="LineNr">464 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>status<span class="Delimiter">);</span>
+<span id="L464" class="LineNr">464 </span>canonize<span class="Delimiter">(</span>status<span class="Delimiter">);</span>
 <span id="L465" class="LineNr">465 </span>
 <span id="L466" class="LineNr">466 </span><span class="Delimiter">:(scenario merge_exclusive_container_indirect)</span>
-<span id="L467" class="LineNr">467 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L467" class="LineNr">467 </span><span class="muRecipe">def</span> main [
 <span id="L468" class="LineNr">468 </span>  <span class="Comment"># skip alloc id for 10:&amp;:number-or-point</span>
 <span id="L469" class="LineNr">469 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L470" class="LineNr">470 </span>  <span class="Constant">10</span>:&amp;:number-<span class="Normal">or</span>-point/lookup<span class="Special"> &lt;- </span>merge <span class="Constant">0</span>/number<span class="Delimiter">,</span> <span class="Constant">34</span>
@@ -539,12 +539,12 @@ if ('onhashchange' in window) {
 <span id="L474" class="LineNr">474 </span><span class="traceContains">+mem: storing 34 in location 22</span>
 <span id="L475" class="LineNr">475 </span>
 <span id="L476" class="LineNr">476 </span><span class="Delimiter">:(before &quot;Update size_mismatch Check for MERGE(x)</span>
-<span id="L477" class="LineNr">477 </span><a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>x<span class="Delimiter">);</span>
+<span id="L477" class="LineNr">477 </span>canonize<span class="Delimiter">(</span>x<span class="Delimiter">);</span>
 <span id="L478" class="LineNr">478 </span>
 <span id="L479" class="LineNr">479 </span><span class="Comment">//: abbreviation for '/lookup': a prefix '*'</span>
 <span id="L480" class="LineNr">480 </span>
 <span id="L481" class="LineNr">481 </span><span class="Delimiter">:(scenario lookup_abbreviation)</span>
-<span id="L482" class="LineNr">482 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
+<span id="L482" class="LineNr">482 </span><span class="muRecipe">def</span> main [
 <span id="L483" class="LineNr">483 </span>  <span class="Comment"># skip alloc id for 10:&amp;:num</span>
 <span id="L484" class="LineNr">484 </span>  <span class="Constant">11</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">20</span>
 <span id="L485" class="LineNr">485 </span>  <span class="Comment"># skip alloc id for payload</span>
@@ -556,12 +556,12 @@ if ('onhashchange' in window) {
 <span id="L491" class="LineNr">491 </span>
 <span id="L492" class="LineNr">492 </span><span class="Delimiter">:(before &quot;End Parsing reagent&quot;)</span>
 <span id="L493" class="LineNr">493 </span><span class="Delimiter">{</span>
-<span id="L494" class="LineNr">494 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L77'>starts_with</a><span class="Delimiter">(</span>name<span class="Delimiter">,</span> <span class="Constant">&quot;*&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L495" class="LineNr">495 </span>    name<span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L494" class="LineNr">494 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;*&quot;</span><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L495" class="LineNr">495 </span>    <a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">.</span>erase<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">1</span><span class="Delimiter">);</span>
 <span id="L496" class="LineNr">496 </span>    properties<span class="Delimiter">.</span>push_back<span class="Delimiter">(</span>pair&lt;string<span class="Delimiter">,</span> string_tree*&gt;<span class="Delimiter">(</span><span class="Constant">&quot;lookup&quot;</span><span class="Delimiter">,</span> <span class="Constant">NULL</span><span class="Delimiter">));</span>
 <span id="L497" class="LineNr">497 </span>  <span class="Delimiter">}</span>
-<span id="L498" class="LineNr">498 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>name<span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
-<span id="L499" class="LineNr">499 </span>    <a href='003trace.cc.html#L197'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal name '&quot;</span> &lt;&lt; original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L226'>end</a><span class="Delimiter">();</span>
+<span id="L498" class="LineNr">498 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">.</span>empty<span class="Delimiter">())</span>
+<span id="L499" class="LineNr">499 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;illegal <a href='010---vm.cc.html#L228'>name</a> '&quot;</span> &lt;&lt; original_string &lt;&lt; <span class="Constant">&quot;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L500" class="LineNr">500 </span><span class="Delimiter">}</span>
 <span id="L501" class="LineNr">501 </span>
 <span id="L502" class="LineNr">502 </span><span class="SalientComment">//:: helpers for debugging</span>
@@ -569,12 +569,12 @@ if ('onhashchange' in window) {
 <span id="L504" class="LineNr">504 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L505" class="LineNr">505 </span>_DUMP<span class="Delimiter">,</span>
 <span id="L506" class="LineNr">506 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L507" class="LineNr">507 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;$dump&quot;</span><span class="Delimiter">,</span> _DUMP<span class="Delimiter">);</span>
+<span id="L507" class="LineNr">507 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;$dump&quot;</span><span class="Delimiter">,</span> _DUMP<span class="Delimiter">);</span>
 <span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L509" class="LineNr">509 </span><span class="Normal">case</span> _DUMP: <span class="Delimiter">{</span>
-<span id="L510" class="LineNr">510 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> after_canonize = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L511" class="LineNr">511 </span>  <a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>after_canonize<span class="Delimiter">);</span>
-<span id="L512" class="LineNr">512 </span>  cerr &lt;&lt; <a href='013update_operation.cc.html#L25'>maybe</a><span class="Delimiter">(</span><a href='026call.cc.html#L87'>current_recipe_name</a><span class="Delimiter">())</span> &lt;&lt; <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>name &lt;&lt; <span class="Constant">' '</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L510" class="LineNr">510 </span>  reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> after_canonize = current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L511" class="LineNr">511 </span>  canonize<span class="Delimiter">(</span>after_canonize<span class="Delimiter">);</span>
+<span id="L512" class="LineNr">512 </span>  cerr &lt;&lt; maybe<span class="Delimiter">(</span>current_recipe_name<span class="Delimiter">())</span> &lt;&lt; current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='010---vm.cc.html#L228'>name</a> &lt;&lt; <span class="Constant">' '</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span>after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; =&gt; &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> after_canonize<span class="Delimiter">.</span>value<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L513" class="LineNr">513 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L514" class="LineNr">514 </span><span class="Delimiter">}</span>
 <span id="L515" class="LineNr">515 </span>
@@ -585,16 +585,16 @@ if ('onhashchange' in window) {
 <span id="L520" class="LineNr">520 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Declarations&quot;)</span>
 <span id="L521" class="LineNr">521 </span>_BAR<span class="Delimiter">,</span>
 <span id="L522" class="LineNr">522 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Numbers&quot;)</span>
-<span id="L523" class="LineNr">523 </span><a href='001help.cc.html#L221'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;$bar&quot;</span><span class="Delimiter">,</span> _BAR<span class="Delimiter">);</span>
+<span id="L523" class="LineNr">523 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span>Recipe_ordinal<span class="Delimiter">,</span> <span class="Constant">&quot;$bar&quot;</span><span class="Delimiter">,</span> _BAR<span class="Delimiter">);</span>
 <span id="L524" class="LineNr">524 </span><span class="Delimiter">:(before &quot;End Primitive Recipe Implementations&quot;)</span>
 <span id="L525" class="LineNr">525 </span><span class="Normal">case</span> _BAR: <span class="Delimiter">{</span>
-<span id="L526" class="LineNr">526 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
-<span id="L527" class="LineNr">527 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Bar != -<span class="Constant">1</span><span class="Delimiter">)</span> cerr &lt;&lt; Bar &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L229'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> Bar<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L526" class="LineNr">526 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>empty<span class="Delimiter">())</span> <span class="Delimiter">{</span>
+<span id="L527" class="LineNr">527 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>Bar != -<span class="Constant">1</span><span class="Delimiter">)</span> cerr &lt;&lt; Bar &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; no_scientific<span class="Delimiter">(</span><a href='001help.cc.html#L250'>get_or_insert</a><span class="Delimiter">(</span>Memory<span class="Delimiter">,</span> Bar<span class="Delimiter">))</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L528" class="LineNr">528 </span>    <span class="Normal">else</span> cerr &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
 <span id="L529" class="LineNr">529 </span>  <span class="Delimiter">}</span>
 <span id="L530" class="LineNr">530 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L531" class="LineNr">531 </span>    reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = <a href='026call.cc.html#L89'>current_instruction</a><span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L532" class="LineNr">532 </span>    <a href='035lookup.cc.html#L66'>canonize</a><span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
+<span id="L531" class="LineNr">531 </span>    reagent<span class="Comment">/*</span><span class="Comment">copy</span><span class="Comment">*/</span> tmp = current_instruction<span class="Delimiter">().</span>ingredients<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L532" class="LineNr">532 </span>    canonize<span class="Delimiter">(</span>tmp<span class="Delimiter">);</span>
 <span id="L533" class="LineNr">533 </span>    Bar = tmp<span class="Delimiter">.</span>value<span class="Delimiter">;</span>
 <span id="L534" class="LineNr">534 </span>  <span class="Delimiter">}</span>
 <span id="L535" class="LineNr">535 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/036abandon.cc.html b/html/036abandon.cc.html
index d3f7014c..8a83f759 100644
--- a/html/036abandon.cc.html
+++ b/html/036abandon.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 036abandon.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.CommentedCode { color: #6c6c6c; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/038new_text.cc.html b/html/038new_text.cc.html
index 0e1575f1..d3657fc1 100644
--- a/html/038new_text.cc.html
+++ b/html/038new_text.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 038new_text.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .CommentedCode { color: #6c6c6c; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/040brace.cc.html b/html/040brace.cc.html
index 4d4d588b..de32c045 100644
--- a/html/040brace.cc.html
+++ b/html/040brace.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 040brace.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/041jump_target.cc.html b/html/041jump_target.cc.html
index 9d447f78..5b59380d 100644
--- a/html/041jump_target.cc.html
+++ b/html/041jump_target.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 041jump_target.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceAbsent { color: #c00000; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/042name.cc.html b/html/042name.cc.html
index 406b9b99..7225cdb2 100644
--- a/html/042name.cc.html
+++ b/html/042name.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 042name.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
+.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/043space.cc.html b/html/043space.cc.html
index e9dc15a9..2a235940 100644
--- a/html/043space.cc.html
+++ b/html/043space.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 043space.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -17,18 +17,17 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
-.Delimiter { color: #800080; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
-.muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
+.muRecipe { color: #ff8700; }
+.Delimiter { color: #800080; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
@@ -90,7 +89,7 @@ if ('onhashchange' in window) {
 <span id="L25" class="LineNr"> 25 </span>  <span class="Constant">1001</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">5</span>  <span class="Comment"># length</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Comment"># actual start of this recipe</span>
 <span id="L27" class="LineNr"> 27 </span>  <span class="Normal">default</span>-space:space<span class="Special"> &lt;- </span>copy <span class="Constant">10</span>:&amp;:@:location
-<span id="L28" class="LineNr"> 28 </span><span class="PreProc">  # if default-space is </span><span class="Constant">1000</span><span class="PreProc">, then:</span>
+<span id="L28" class="LineNr"> 28 </span>  <span class="Comment"># if default-space is 1000, then:</span>
 <span id="L29" class="LineNr"> 29 </span>  <span class="Comment">#   1000: alloc id</span>
 <span id="L30" class="LineNr"> 30 </span>  <span class="Comment">#   1001: array size</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Comment">#   1002: location 0 (space for the chaining slot; described later; often unused)</span>
diff --git a/html/044space_surround.cc.html b/html/044space_surround.cc.html
index 2cf1f551..16d5d48c 100644
--- a/html/044space_surround.cc.html
+++ b/html/044space_surround.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 044space_surround.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/045closure_name.cc.html b/html/045closure_name.cc.html
index 01acd40d..c72a8621 100644
--- a/html/045closure_name.cc.html
+++ b/html/045closure_name.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 045closure_name.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/046check_type_by_name.cc.html b/html/046check_type_by_name.cc.html
index 731cb086..725c14ef 100644
--- a/html/046check_type_by_name.cc.html
+++ b/html/046check_type_by_name.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 046check_type_by_name.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/050scenario.cc.html b/html/050scenario.cc.html
index 2d003d89..f456a19d 100644
--- a/html/050scenario.cc.html
+++ b/html/050scenario.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 050scenario.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,21 +15,21 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
-.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
-.muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/051scenario_test.mu.html b/html/051scenario_test.mu.html
index 1407aea1..744b4554 100644
--- a/html/051scenario_test.mu.html
+++ b/html/051scenario_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 051scenario_test.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/052tangle.cc.html b/html/052tangle.cc.html
index 7cbd909d..d32070dd 100644
--- a/html/052tangle.cc.html
+++ b/html/052tangle.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 052tangle.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/053recipe_header.cc.html b/html/053recipe_header.cc.html
index 348e473d..36d7b5c6 100644
--- a/html/053recipe_header.cc.html
+++ b/html/053recipe_header.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 053recipe_header.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
 .LineNr { color: #444444; }
-.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.SalientComment { color: #00ffff; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.Error { color: #ffffff; background-color: #ff6060; padding-bottom: 1px; }
+.cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/054static_dispatch.cc.html b/html/054static_dispatch.cc.html
index 2f3b6c65..d7e54744 100644
--- a/html/054static_dispatch.cc.html
+++ b/html/054static_dispatch.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 054static_dispatch.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.CommentedCode { color: #6c6c6c; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/055shape_shifting_container.cc.html b/html/055shape_shifting_container.cc.html
index a21d709c..4f4043a5 100644
--- a/html/055shape_shifting_container.cc.html
+++ b/html/055shape_shifting_container.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 055shape_shifting_container.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
-.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.cSpecial { color: #008000; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/056shape_shifting_recipe.cc.html b/html/056shape_shifting_recipe.cc.html
index 1482d9e9..f3c43d60 100644
--- a/html/056shape_shifting_recipe.cc.html
+++ b/html/056shape_shifting_recipe.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 056shape_shifting_recipe.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,21 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.SalientComment { color: #00ffff; }
-.CommentedCode { color: #6c6c6c; }
-.muData { color: #ffff00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.cSpecial { color: #008000; }
+.SalientComment { color: #00ffff; }
+.CommentedCode { color: #6c6c6c; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
-.PreProc { color: #800080; }
+.traceContains { color: #008000; }
+.muData { color: #ffff00; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.cSpecial { color: #008000; }
 -->
 </style>
 
@@ -1120,7 +1119,7 @@ if ('onhashchange' in window) {
 <span id="L1054" class="LineNr">1054 </span>  local-scope
 <span id="L1055" class="LineNr">1055 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
 <span id="L1056" class="LineNr">1056 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>get x<span class="Delimiter">,</span> z:offse  <span class="Comment"># typo in 'offset'</span>
-<span id="L1057" class="LineNr">1057 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1057" class="LineNr">1057 </span>  <span class="Comment"># define a variable with the same name 'z'</span>
 <span id="L1058" class="LineNr">1058 </span>  <span class="Normal">z</span>:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L1059" class="LineNr">1059 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
 <span id="L1060" class="LineNr">1060 </span>  foo z
@@ -1140,7 +1139,7 @@ if ('onhashchange' in window) {
 <span id="L1074" class="LineNr">1074 </span>  local-scope
 <span id="L1075" class="LineNr">1075 </span>  <span class="Normal">x</span>:foo2<span class="Special"> &lt;- </span>merge <span class="Constant">34</span>
 <span id="L1076" class="LineNr">1076 </span>  <span class="Normal">y</span>:num<span class="Special"> &lt;- </span>get x<span class="Delimiter">,</span> z:offse  <span class="Comment"># typo in 'offset'</span>
-<span id="L1077" class="LineNr">1077 </span><span class="PreProc">  </span><span class="Comment"># define a variable with the same name 'z'</span>
+<span id="L1077" class="LineNr">1077 </span>  <span class="Comment"># define a variable with the same name 'z'</span>
 <span id="L1078" class="LineNr">1078 </span>  <span class="Normal">z</span>:&amp;:num<span class="Special"> &lt;- </span>copy <span class="Constant">34</span>
 <span id="L1079" class="LineNr">1079 </span>  <span class="Comment"># trigger specialization of the shape-shifting recipe</span>
 <span id="L1080" class="LineNr">1080 </span>  foo *z
diff --git a/html/057immutable.cc.html b/html/057immutable.cc.html
index 1bf26363..a52592cb 100644
--- a/html/057immutable.cc.html
+++ b/html/057immutable.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 057immutable.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/058to_text.cc.html b/html/058to_text.cc.html
index 00e9fe49..710fefd5 100644
--- a/html/058to_text.cc.html
+++ b/html/058to_text.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 058to_text.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/059to_text.mu.html b/html/059to_text.mu.html
index 1076b050..55d9846c 100644
--- a/html/059to_text.mu.html
+++ b/html/059to_text.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 059to_text.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,12 +16,12 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/060rewrite_literal_string.cc.html b/html/060rewrite_literal_string.cc.html
index 44235735..094f758c 100644
--- a/html/060rewrite_literal_string.cc.html
+++ b/html/060rewrite_literal_string.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 060rewrite_literal_string.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
 -->
 </style>
diff --git a/html/061text.mu.html b/html/061text.mu.html
index 2c115a45..0cb40eab 100644
--- a/html/061text.mu.html
+++ b/html/061text.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 061text.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,14 +17,14 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Delimiter { color: #800080; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/062convert_ingredients_to_text.cc.html b/html/062convert_ingredients_to_text.cc.html
index 19e826f8..7be88099 100644
--- a/html/062convert_ingredients_to_text.cc.html
+++ b/html/062convert_ingredients_to_text.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 062convert_ingredients_to_text.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .traceContains { color: #008000; }
 -->
 </style>
diff --git a/html/063array.mu.html b/html/063array.mu.html
index 0c8a5349..4506b04a 100644
--- a/html/063array.mu.html
+++ b/html/063array.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 063array.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Constant { color: #00a0a0; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/064list.mu.html b/html/064list.mu.html
index 7a8b3c55..ea49476e 100644
--- a/html/064list.mu.html
+++ b/html/064list.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 064list.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/065duplex_list.mu.html b/html/065duplex_list.mu.html
index a426a45d..f57d9588 100644
--- a/html/065duplex_list.mu.html
+++ b/html/065duplex_list.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 065duplex_list.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/066stream.mu.html b/html/066stream.mu.html
index eb35065b..198737c7 100644
--- a/html/066stream.mu.html
+++ b/html/066stream.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 066stream.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/067random.cc.html b/html/067random.cc.html
index a044f382..eec8e30a 100644
--- a/html/067random.cc.html
+++ b/html/067random.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 067random.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
diff --git a/html/068random.mu.html b/html/068random.mu.html
index 5179d9c1..a2faf51a 100644
--- a/html/068random.mu.html
+++ b/html/068random.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 068random.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
 .muControl { color: #c0a020; }
-.Constant { color: #00a0a0; }
+.muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/069hash.cc.html b/html/069hash.cc.html
index 62e9f45b..0ea3fa15 100644
--- a/html/069hash.cc.html
+++ b/html/069hash.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 069hash.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Constant { color: #00a0a0; }
+.CommentedCode { color: #6c6c6c; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
-.muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
+.Constant { color: #00a0a0; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.muRecipe { color: #ff8700; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.CommentedCode { color: #6c6c6c; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.Special { color: #c00000; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/070table.mu.html b/html/070table.mu.html
index faaf6d78..0333b19a 100644
--- a/html/070table.mu.html
+++ b/html/070table.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 070table.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/072recipe.cc.html b/html/072recipe.cc.html
index 2d8b05b2..70743be3 100644
--- a/html/072recipe.cc.html
+++ b/html/072recipe.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 072recipe.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.SalientComment { color: #00ffff; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
@@ -119,7 +119,7 @@ if ('onhashchange' in window) {
 <span id="L56" class="LineNr"> 56 </span><span class="muRecipe">def</span> <a href='000organization.cc.html#L113'>main</a> [
 <span id="L57" class="LineNr"> 57 </span>  local-scope
 <span id="L58" class="LineNr"> 58 </span>  <span class="Normal">a</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>equal <span class="Identifier">break</span> <span class="Constant">0</span>
-<span id="L59" class="LineNr"> 59 </span>  <span class="Normal">break</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
+<span id="L59" class="LineNr"> 59 </span>  <span class="Identifier">break</span>:<span class="Normal">bool</span><span class="Special"> &lt;- </span>copy <span class="Constant">0</span>
 <span id="L60" class="LineNr"> 60 </span>]
 <span id="L61" class="LineNr"> 61 </span><span class="traceContains">+error: <a href='000organization.cc.html#L113'>main</a>: missing type for 'break' in 'a:bool &lt;- equal break, 0'</span>
 <span id="L62" class="LineNr"> 62 </span>
diff --git a/html/073scheduler.cc.html b/html/073scheduler.cc.html
index 53bf8eef..6812df55 100644
--- a/html/073scheduler.cc.html
+++ b/html/073scheduler.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 073scheduler.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.traceAbsent { color: #c00000; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/074wait.cc.html b/html/074wait.cc.html
index 9eff1d76..7e8d3583 100644
--- a/html/074wait.cc.html
+++ b/html/074wait.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 074wait.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,19 +15,19 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
 .muRecipe { color: #ff8700; }
-.muData { color: #ffff00; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 .traceContains { color: #008000; }
-.cSpecial { color: #008000; }
 -->
 </style>
 
diff --git a/html/075channel.mu.html b/html/075channel.mu.html
index 5275ec38..62f342b5 100644
--- a/html/075channel.mu.html
+++ b/html/075channel.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 075channel.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.muControl { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/076continuation.cc.html b/html/076continuation.cc.html
index 84764606..b3954146 100644
--- a/html/076continuation.cc.html
+++ b/html/076continuation.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 076continuation.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceAbsent { color: #c00000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
-.traceAbsent { color: #c00000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/080display.cc.html b/html/080display.cc.html
index 7ae6032a..a63e3cc5 100644
--- a/html/080display.cc.html
+++ b/html/080display.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 080display.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.cSpecial { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/081print.mu.html b/html/081print.mu.html
index 20ab6cf3..9f84a486 100644
--- a/html/081print.mu.html
+++ b/html/081print.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 081print.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.muControl { color: #c0a020; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/082scenario_screen.cc.html b/html/082scenario_screen.cc.html
index 13858db5..577bcd2b 100644
--- a/html/082scenario_screen.cc.html
+++ b/html/082scenario_screen.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 082scenario_screen.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,20 +15,20 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.CommentedCode { color: #6c6c6c; }
-.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
 .Delimiter { color: #800080; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.CommentedCode { color: #6c6c6c; }
 .traceAbsent { color: #c00000; }
-.cSpecial { color: #008000; }
+.muScenario { color: #00af00; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.cSpecial { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/083scenario_screen_test.mu.html b/html/083scenario_screen_test.mu.html
index 9c275760..e28c3a8f 100644
--- a/html/083scenario_screen_test.mu.html
+++ b/html/083scenario_screen_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 083scenario_screen_test.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/084console.mu.html b/html/084console.mu.html
index 58efc4c0..1d720076 100644
--- a/html/084console.mu.html
+++ b/html/084console.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 084console.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/085scenario_console.cc.html b/html/085scenario_console.cc.html
index 85acaf08..c170c314 100644
--- a/html/085scenario_console.cc.html
+++ b/html/085scenario_console.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 085scenario_console.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
 .Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .muScenario { color: #00af00; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
 .Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/086scenario_console_test.mu.html b/html/086scenario_console_test.mu.html
index 4451efa9..95f75adb 100644
--- a/html/086scenario_console_test.mu.html
+++ b/html/086scenario_console_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 086scenario_console_test.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/087file.cc.html b/html/087file.cc.html
index 711733f1..54959e7a 100644
--- a/html/087file.cc.html
+++ b/html/087file.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 087file.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/088file.mu.html b/html/088file.mu.html
index d769c5ff..63edd7cb 100644
--- a/html/088file.mu.html
+++ b/html/088file.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 088file.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html
index 5d9d7c6a..519978a8 100644
--- a/html/089scenario_filesystem.cc.html
+++ b/html/089scenario_filesystem.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 089scenario_filesystem.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.Constant { color: #00a0a0; }
+.LineNr { color: #444444; }
 .muScenario { color: #00af00; }
-.Special { color: #c00000; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.Constant { color: #00a0a0; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/090scenario_filesystem_test.mu.html b/html/090scenario_filesystem_test.mu.html
index 8291c5fb..22a76dd2 100644
--- a/html/090scenario_filesystem_test.mu.html
+++ b/html/090scenario_filesystem_test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 090scenario_filesystem_test.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/091socket.cc.html b/html/091socket.cc.html
index 1509b08e..7fa12274 100644
--- a/html/091socket.cc.html
+++ b/html/091socket.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 091socket.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/092socket.mu.html b/html/092socket.mu.html
index bf293b90..f6010a34 100644
--- a/html/092socket.mu.html
+++ b/html/092socket.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 092socket.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,14 +17,14 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Delimiter { color: #800080; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/099hardware_checks.cc.html b/html/099hardware_checks.cc.html
index c9e32494..de36acf2 100644
--- a/html/099hardware_checks.cc.html
+++ b/html/099hardware_checks.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 099hardware_checks.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.traceContains { color: #008000; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/100trace_browser.cc.html b/html/100trace_browser.cc.html
index 2e0bb574..80d6e158 100644
--- a/html/100trace_browser.cc.html
+++ b/html/100trace_browser.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 100trace_browser.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/101run_sandboxed.cc.html b/html/101run_sandboxed.cc.html
index 9cd09613..553d3f77 100644
--- a/html/101run_sandboxed.cc.html
+++ b/html/101run_sandboxed.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 101run_sandboxed.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Special { color: #c00000; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
-.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.traceContains { color: #008000; }
+.Special { color: #c00000; }
 .Identifier { color: #c0a020; }
+.Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
+.traceContains { color: #008000; }
 -->
 </style>
 
diff --git a/html/998check_type_pointers.cc.html b/html/998check_type_pointers.cc.html
index 0c26fe83..ba56ad81 100644
--- a/html/998check_type_pointers.cc.html
+++ b/html/998check_type_pointers.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 998check_type_pointers.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,10 +15,10 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.LineNr { color: #444444; }
-.CommentedCode { color: #6c6c6c; }
 -->
 </style>
 
diff --git a/html/999spaces.cc.html b/html/999spaces.cc.html
index 638202e1..2add52e4 100644
--- a/html/999spaces.cc.html
+++ b/html/999spaces.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - 999spaces.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
-.LineNr { color: #444444; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/channel.mu.html b/html/channel.mu.html
index b77e22dc..55201f33 100644
--- a/html/channel.mu.html
+++ b/html/channel.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - channel.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/chessboard.mu.html b/html/chessboard.mu.html
index 0cb1c0bb..3cb915ef 100644
--- a/html/chessboard.mu.html
+++ b/html/chessboard.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - chessboard.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
-.CommentedCode { color: #6c6c6c; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/console.mu.html b/html/console.mu.html
index c045bd2c..01572445 100644
--- a/html/console.mu.html
+++ b/html/console.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - console.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/continuation1.mu.html b/html/continuation1.mu.html
index a08d19b3..3f9df7df 100644
--- a/html/continuation1.mu.html
+++ b/html/continuation1.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation1.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,11 +17,11 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/continuation2.mu.html b/html/continuation2.mu.html
index 4b853e11..cc796796 100644
--- a/html/continuation2.mu.html
+++ b/html/continuation2.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation2.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,12 +17,12 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/continuation3.mu.html b/html/continuation3.mu.html
index 55a32d61..2eae301f 100644
--- a/html/continuation3.mu.html
+++ b/html/continuation3.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation3.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,11 +17,11 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/continuation4.mu.html b/html/continuation4.mu.html
index e3d266e1..84e000c1 100644
--- a/html/continuation4.mu.html
+++ b/html/continuation4.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation4.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,12 +17,12 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/continuation5.mu.html b/html/continuation5.mu.html
index 29e75c17..2d3cf494 100644
--- a/html/continuation5.mu.html
+++ b/html/continuation5.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - continuation5.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,12 +17,12 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/counters.mu.html b/html/counters.mu.html
index bc824899..fcd14576 100644
--- a/html/counters.mu.html
+++ b/html/counters.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - counters.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/display.mu.html b/html/display.mu.html
index 1010e09e..255c43fc 100644
--- a/html/display.mu.html
+++ b/html/display.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - display.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/edit/001-editor.mu.html b/html/edit/001-editor.mu.html
index c5bc16a5..c6e43ccc 100644
--- a/html/edit/001-editor.mu.html
+++ b/html/edit/001-editor.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/001-editor.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/002-typing.mu.html b/html/edit/002-typing.mu.html
index f33cf545..f16f2ccc 100644
--- a/html/edit/002-typing.mu.html
+++ b/html/edit/002-typing.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/002-typing.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/003-shortcuts.mu.html b/html/edit/003-shortcuts.mu.html
index e507b83d..c1936a32 100644
--- a/html/edit/003-shortcuts.mu.html
+++ b/html/edit/003-shortcuts.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/003-shortcuts.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Constant { color: #00a0a0; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/004-programming-environment.mu.html b/html/edit/004-programming-environment.mu.html
index dc0aa10e..01a5f894 100644
--- a/html/edit/004-programming-environment.mu.html
+++ b/html/edit/004-programming-environment.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/004-programming-environment.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/005-sandbox.mu.html b/html/edit/005-sandbox.mu.html
index ab45522e..0a7811b6 100644
--- a/html/edit/005-sandbox.mu.html
+++ b/html/edit/005-sandbox.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/005-sandbox.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/006-sandbox-copy.mu.html b/html/edit/006-sandbox-copy.mu.html
index fe119f1e..f0ec1bbd 100644
--- a/html/edit/006-sandbox-copy.mu.html
+++ b/html/edit/006-sandbox-copy.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/006-sandbox-copy.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Constant { color: #00a0a0; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/007-sandbox-delete.mu.html b/html/edit/007-sandbox-delete.mu.html
index 74ad4eb6..5ddbfd32 100644
--- a/html/edit/007-sandbox-delete.mu.html
+++ b/html/edit/007-sandbox-delete.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/007-sandbox-delete.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Constant { color: #00a0a0; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/008-sandbox-edit.mu.html b/html/edit/008-sandbox-edit.mu.html
index 62de3b4d..9b1205d5 100644
--- a/html/edit/008-sandbox-edit.mu.html
+++ b/html/edit/008-sandbox-edit.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/008-sandbox-edit.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,16 +15,16 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.SalientComment { color: #00ffff; }
-.Constant { color: #00a0a0; }
+.muScenario { color: #00af00; }
 .LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/009-sandbox-test.mu.html b/html/edit/009-sandbox-test.mu.html
index 5b70530e..95e9a37e 100644
--- a/html/edit/009-sandbox-test.mu.html
+++ b/html/edit/009-sandbox-test.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/009-sandbox-test.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/010-sandbox-trace.mu.html b/html/edit/010-sandbox-trace.mu.html
index 5d4404c1..c7fc51e1 100644
--- a/html/edit/010-sandbox-trace.mu.html
+++ b/html/edit/010-sandbox-trace.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/010-sandbox-trace.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,15 +17,15 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Delimiter { color: #800080; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
 .muData { color: #ffff00; }
-.SalientComment { color: #00ffff; }
+.Delimiter { color: #800080; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/011-errors.mu.html b/html/edit/011-errors.mu.html
index 96677150..e31360f8 100644
--- a/html/edit/011-errors.mu.html
+++ b/html/edit/011-errors.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/011-errors.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/edit/012-editor-undo.mu.html b/html/edit/012-editor-undo.mu.html
index 705a47e4..ee575658 100644
--- a/html/edit/012-editor-undo.mu.html
+++ b/html/edit/012-editor-undo.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - edit/012-editor-undo.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,17 +15,17 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/example1.mu.html b/html/example1.mu.html
index 35320c38..f0cecdae 100644
--- a/html/example1.mu.html
+++ b/html/example1.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - example1.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,9 +16,9 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
-.Constant { color: #00a0a0; }
 .LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
 -->
diff --git a/html/exception1.mu.html b/html/exception1.mu.html
index 9ddc943f..14cbf377 100644
--- a/html/exception1.mu.html
+++ b/html/exception1.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - exception1.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,12 +17,12 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/exception2.mu.html b/html/exception2.mu.html
index 392ccca0..d3d8c3a3 100644
--- a/html/exception2.mu.html
+++ b/html/exception2.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - exception2.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/factorial.mu.html b/html/factorial.mu.html
index 15d20edc..25bb9120 100644
--- a/html/factorial.mu.html
+++ b/html/factorial.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - factorial.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
-.muScenario { color: #00af00; }
 -->
 </style>
 
diff --git a/html/filesystem.mu.html b/html/filesystem.mu.html
index 1afa7712..1cddb957 100644
--- a/html/filesystem.mu.html
+++ b/html/filesystem.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - filesystem.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/fork.mu.html b/html/fork.mu.html
index 47f528ec..51524616 100644
--- a/html/fork.mu.html
+++ b/html/fork.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - fork.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,11 +17,11 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
-.Delimiter { color: #800080; }
 .LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
+.Delimiter { color: #800080; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 -->
 </style>
 
diff --git a/html/http-client.mu.html b/html/http-client.mu.html
index 7cce544a..4dcba47e 100644
--- a/html/http-client.mu.html
+++ b/html/http-client.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - http-client.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,14 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.Delimiter { color: #800080; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/http-server.mu.html b/html/http-server.mu.html
index 65364e63..89d19613 100644
--- a/html/http-server.mu.html
+++ b/html/http-server.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - http-server.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,11 +17,11 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
@@ -78,8 +78,8 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr">20 </span>  <a href='092socket.mu.html#L132'>write-to-socket</a> session, <span class="Constant">[HTTP/1.0 200 OK</span>
 <span id="L21" class="LineNr">21 </span><span class="Constant">Content-type: text/plain</span>
 <span id="L22" class="LineNr">22 </span>
-<span id="L23" class="LineNr">23 </span><span class="Constant">SUCCESS!</span>
-<span id="L24" class="LineNr">24 </span><span class="Constant">]</span>
+<span id="L23" class="LineNr">23 </span>SUCCESS!
+<span id="L24" class="LineNr">24 </span>]
 <span id="L25" class="LineNr">25 </span>  $print <span class="Constant">10/newline</span>, <span class="Constant">[Wrote to and closing socket...]</span>, <span class="Constant">10/newline</span>
 <span id="L26" class="LineNr">26 </span>  session <span class="Special">&lt;-</span> $close-socket session
 <span id="L27" class="LineNr">27 </span>  socket <span class="Special">&lt;-</span> $close-socket socket
diff --git a/html/immutable-error.mu.html b/html/immutable-error.mu.html
index 92113108..5beae585 100644
--- a/html/immutable-error.mu.html
+++ b/html/immutable-error.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - immutable-error.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/lambda-to-mu.mu.html b/html/lambda-to-mu.mu.html
index 8866ff52..089e3339 100644
--- a/html/lambda-to-mu.mu.html
+++ b/html/lambda-to-mu.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - lambda-to-mu.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,18 +15,18 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.CommentedCode { color: #6c6c6c; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.muScenario { color: #00af00; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
-.SalientComment { color: #00ffff; }
 .Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.CommentedCode { color: #6c6c6c; }
-.muScenario { color: #00af00; }
+.SalientComment { color: #00ffff; }
 -->
 </style>
 
diff --git a/html/mutable.mu.html b/html/mutable.mu.html
index eea20c1b..e95e071d 100644
--- a/html/mutable.mu.html
+++ b/html/mutable.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - mutable.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/nqueens.mu.html b/html/nqueens.mu.html
index 4fa4b3ee..50d534b8 100644
--- a/html/nqueens.mu.html
+++ b/html/nqueens.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - nqueens.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/real-files.mu.html b/html/real-files.mu.html
index e8d9da2d..ebcf15d2 100644
--- a/html/real-files.mu.html
+++ b/html/real-files.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - real-files.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/same-fringe.mu.html b/html/same-fringe.mu.html
index 370687b9..6a486e2f 100644
--- a/html/same-fringe.mu.html
+++ b/html/same-fringe.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - same-fringe.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -15,15 +15,15 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
-.muData { color: #ffff00; }
+.muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
+.muData { color: #ffff00; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
-.muControl { color: #c0a020; }
 -->
 </style>
 
diff --git a/html/screen.mu.html b/html/screen.mu.html
index 26eb9ac5..16366e39 100644
--- a/html/screen.mu.html
+++ b/html/screen.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - screen.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/static-dispatch.mu.html b/html/static-dispatch.mu.html
index 26aa6263..17061e69 100644
--- a/html/static-dispatch.mu.html
+++ b/html/static-dispatch.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - static-dispatch.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/subx/000organization.cc.html b/html/subx/000organization.cc.html
index 2c0c0877..10d753e9 100644
--- a/html/subx/000organization.cc.html
+++ b/html/subx/000organization.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/000organization.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -169,7 +169,7 @@ if ('onhashchange' in window) {
 <span id="L110" class="LineNr">110 </span><span class="Comment">//</span>
 <span id="L111" class="LineNr">111 </span><span class="Comment">// End Globals</span>
 <span id="L112" class="LineNr">112 </span>
-<span id="L113" class="LineNr">113 </span><span class="Normal">int</span> <a href='000organization.cc.html#L113'>main</a><span class="Delimiter">(</span><span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L113" class="LineNr">113 </span><span class="Normal">int</span> main<span class="Delimiter">(</span><span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L114" class="LineNr">114 </span>  atexit<span class="Delimiter">(</span><a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">);</span>
 <span id="L115" class="LineNr">115 </span>  <span class="Comment">// we require a 32-bit little-endian system</span>
 <span id="L116" class="LineNr">116 </span>  assert<span class="Delimiter">(</span><span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">int</span><span class="Delimiter">)</span> == <span class="Constant">4</span><span class="Delimiter">);</span>
diff --git a/html/subx/001help.cc.html b/html/subx/001help.cc.html
index d5582776..ca925bbb 100644
--- a/html/subx/001help.cc.html
+++ b/html/subx/001help.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/001help.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -124,7 +123,7 @@ if ('onhashchange' in window) {
 <span id="L63" class="LineNr"> 63 </span>    <span class="Constant">&quot;SubX uses a subset of the x86 instruction set. SubX programs will <a href='011run.cc.html#L80'>run</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L64" class="LineNr"> 64 </span>    <span class="Constant">&quot;without modification on Linux computers.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L65" class="LineNr"> 65 </span>    <span class="Constant">&quot;It provides a better experience and better error messages than</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;programming directly in machine code, but you have to stick to the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L66" class="LineNr"> 66 </span>    <span class="Constant">&quot;programming directly in machine <a href='031check_operands.cc.html#L14'>code</a>, but you have to stick to the</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L67" class="LineNr"> 67 </span>    <span class="Constant">&quot;instructions it supports.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L68" class="LineNr"> 68 </span>    <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L69" class="LineNr"> 69 </span>    <span class="Constant">&quot;== Ways to invoke subx</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -237,16 +236,16 @@ if ('onhashchange' in window) {
 <span id="L176" class="LineNr">176 </span><span class="Normal">void</span> <a href='001help.cc.html#L176'>dump_and_exit</a><span class="Delimiter">(</span><span class="Normal">int</span> sig<span class="Delimiter">,</span> siginfo_t* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <span class="Normal">void</span>* <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L177" class="LineNr">177 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>sig<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L178" class="LineNr">178 </span>    <span class="Normal">case</span> <span class="Constant">SIGABRT</span>:
-<span id="L179" class="LineNr">179 </span><span class="PreProc">      #ifndef __APPLE__</span>
+<span id="L179" class="LineNr">179 </span>      <span class="Comment">#ifndef __APPLE__</span>
 <span id="L180" class="LineNr">180 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGABRT: might be an integer overflow if it wasn't an assert() failure</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L181" class="LineNr">181 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L182" class="LineNr">182 </span><span class="PreProc">      #endif</span>
+<span id="L182" class="LineNr">182 </span>      <span class="Comment">#endif</span>
 <span id="L183" class="LineNr">183 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L184" class="LineNr">184 </span>    <span class="Normal">case</span> <span class="Constant">SIGILL</span>:
-<span id="L185" class="LineNr">185 </span><span class="PreProc">      #ifdef __APPLE__</span>
+<span id="L185" class="LineNr">185 </span>      <span class="Comment">#ifdef __APPLE__</span>
 <span id="L186" class="LineNr">186 </span>        cerr &lt;&lt; <span class="Constant">&quot;SIGILL: most likely caused by integer overflow</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L187" class="LineNr">187 </span>        _Exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L188" class="LineNr">188 </span><span class="PreProc">      #endif</span>
+<span id="L188" class="LineNr">188 </span>      <span class="Comment">#endif</span>
 <span id="L189" class="LineNr">189 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L190" class="LineNr">190 </span>    <span class="Normal">default</span>:
 <span id="L191" class="LineNr">191 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
diff --git a/html/subx/002test.cc.html b/html/subx/002test.cc.html
index 89d83fe0..8c3c25b9 100644
--- a/html/subx/002test.cc.html
+++ b/html/subx/002test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/002test.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,15 +15,14 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.CommentedCode { color: #6c6c6c; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
-.PreProc { color: #800080; }
-.CommentedCode { color: #6c6c6c; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -74,7 +73,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr"> 13 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L14" class="LineNr"> 14 </span><span class="Comment">// move a global ahead into types that we can't generate an extern declaration for</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Normal">const</span> <a href='002test.cc.html#L12'>test_fn</a> Tests[] = <span class="Delimiter">{</span>
-<span id="L16" class="LineNr"> 16 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_list&quot;</span>  <span class="Comment">// auto-generated; see 'build*' scripts</span>
+<span id="L16" class="LineNr"> 16 </span>  <span class="Comment">#include &quot;test_list&quot;  // auto-generated; see 'build*' scripts</span>
 <span id="L17" class="LineNr"> 17 </span><span class="Delimiter">};</span>
 <span id="L18" class="LineNr"> 18 </span>
 <span id="L19" class="LineNr"> 19 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
@@ -154,7 +153,7 @@ if ('onhashchange' in window) {
 <span id="L93" class="LineNr"> 93 </span><span class="Delimiter">:(before &quot;Globals&quot;)</span>
 <span id="L94" class="LineNr"> 94 </span><span class="Comment">// Names for each element of the 'Tests' global, respectively.</span>
 <span id="L95" class="LineNr"> 95 </span><span class="Normal">const</span> string Test_names[] = <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span><span class="PreProc">  #include </span><span class="Constant">&quot;test_name_list&quot;</span>  <span class="Comment">// auto-generated; see 'build*' scripts</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Comment">#include &quot;test_name_list&quot;  // auto-generated; see 'build*' scripts</span>
 <span id="L97" class="LineNr"> 97 </span><span class="Delimiter">};</span>
 <span id="L98" class="LineNr"> 98 </span><span class="Delimiter">:(after &quot;Test Runs&quot;)</span>
 <span id="L99" class="LineNr"> 99 </span>string <a href='002test.cc.html#L99'>maybe_single_test_to_run</a> = argv[argc-<span class="Constant">1</span>]<span class="Delimiter">;</span>
diff --git a/html/subx/003trace.cc.html b/html/subx/003trace.cc.html
index 38d75d22..93e351db 100644
--- a/html/subx/003trace.cc.html
+++ b/html/subx/003trace.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/003trace.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,13 +15,13 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Identifier { color: #c0a020; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
@@ -350,7 +350,7 @@ if ('onhashchange' in window) {
 <span id="L291" class="LineNr">291 </span>  <span class="Delimiter">}</span>
 <span id="L292" class="LineNr">292 </span>
 <span id="L293" class="LineNr">293 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L318'>line_exists_anywhere</a><span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L294" class="LineNr">294 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#L110'>line</a> [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L73'>label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L196'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
+<span id="L294" class="LineNr">294 </span>    cerr &lt;&lt; <span class="Constant">&quot;</span><span class="cSpecial">\n</span><span class="Constant">F - &quot;</span> &lt;&lt; FUNCTION &lt;&lt; <span class="Constant">&quot;(&quot;</span> &lt;&lt; <span class="Normal">FILE</span> &lt;&lt; <span class="Constant">&quot;:&quot;</span> &lt;&lt; LINE &lt;&lt; <span class="Constant">&quot;): <a href='011run.cc.html#L114'>line</a> [&quot;</span> &lt;&lt; <a href='003trace.cc.html#L73'>label</a> &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; <a href='003trace.cc.html#L74'>contents</a> &lt;&lt; <span class="Constant">&quot;] out of order in <a href='003trace.cc.html#L196'>trace</a>:</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span><span class="Delimiter">;</span>
 <span id="L295" class="LineNr">295 </span>    <a href='003trace.cc.html#L200'>DUMP</a><span class="Delimiter">(</span><span class="Constant">&quot;&quot;</span><span class="Delimiter">);</span>
 <span id="L296" class="LineNr">296 </span>  <span class="Delimiter">}</span>
 <span id="L297" class="LineNr">297 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
@@ -386,12 +386,12 @@ if ('onhashchange' in window) {
 <span id="L327" class="LineNr">327 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <span class="Constant">&quot;&quot;</span><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="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L330" class="LineNr">330 </span><span class="Normal">int</span> trace_count<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L114'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!Trace_stream<span class="Delimiter">)</span> <span class="Identifier">return</span> <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L332" class="LineNr">332 </span>  <span class="Normal">long</span> result = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L333" class="LineNr">333 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span>vector&lt;trace_line&gt;::iterator p = <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span>begin<span class="Delimiter">();</span>  p != <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L110'>past_lines</a><span class="Delimiter">.</span><a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>  ++p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L334" class="LineNr">334 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a> == p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L335" class="LineNr">335 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L110'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span>
+<span id="L335" class="LineNr">335 </span>      <span class="Normal">if</span> <span class="Delimiter">(</span><a href='011run.cc.html#L114'>line</a> == <span class="Constant">&quot;&quot;</span> || <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span><a href='011run.cc.html#L114'>line</a><span class="Delimiter">)</span> == <a href='003trace.cc.html#L391'>trim</a><span class="Delimiter">(</span>p<span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L74'>contents</a><span class="Delimiter">))</span>
 <span id="L336" class="LineNr">336 </span>        ++result<span class="Delimiter">;</span>
 <span id="L337" class="LineNr">337 </span>    <span class="Delimiter">}</span>
 <span id="L338" class="LineNr">338 </span>  <span class="Delimiter">}</span>
@@ -410,14 +410,14 @@ if ('onhashchange' in window) {
 <span id="L351" class="LineNr">351 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
 <span id="L352" class="LineNr">352 </span><span class="Delimiter">}</span>
 <span id="L353" class="LineNr">353 </span>
-<span id="L354" class="LineNr">354 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L355" class="LineNr">355 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='011run.cc.html#L110'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L354" class="LineNr">354 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string <a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> string <a href='011run.cc.html#L114'>line</a><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Identifier">return</span> trace_count<span class="Delimiter">(</span><a href='003trace.cc.html#L73'>label</a><span class="Delimiter">,</span> <a href='011run.cc.html#L114'>line</a><span class="Delimiter">)</span> == <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L356" class="LineNr">356 </span><span class="Delimiter">}</span>
 <span id="L357" class="LineNr">357 </span>
 <span id="L358" class="LineNr">358 </span><span class="Normal">bool</span> trace_doesnt_contain<span class="Delimiter">(</span>string expected<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L359" class="LineNr">359 </span>  vector&lt;string&gt; tmp = <a href='003trace.cc.html#L382'>split_first</a><span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <span class="Constant">&quot;: &quot;</span><span class="Delimiter">);</span>
 <span id="L360" class="LineNr">360 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>tmp<span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L361" class="LineNr">361 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing <a href='003trace.cc.html#L73'>label</a> or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L196'>trace</a> <a href='011run.cc.html#L110'>line</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L361" class="LineNr">361 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; expected &lt;&lt; <span class="Constant">&quot;: missing <a href='003trace.cc.html#L73'>label</a> or <a href='003trace.cc.html#L74'>contents</a> in <a href='003trace.cc.html#L196'>trace</a> <a href='011run.cc.html#L114'>line</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L362" class="LineNr">362 </span>    assert<span class="Delimiter">(</span><span class="Constant">false</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="Identifier">return</span> trace_doesnt_contain<span class="Delimiter">(</span>tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">),</span> tmp<span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
diff --git a/html/subx/003trace.test.cc.html b/html/subx/003trace.test.cc.html
index 77156ad1..e26cacb7 100644
--- a/html/subx/003trace.test.cc.html
+++ b/html/subx/003trace.test.cc.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - subx/003trace.test.cc</title>
-<meta name="Generator" content="Vim/7.4">
+<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=">
@@ -15,12 +15,12 @@ body { font-size: 12pt; font-family: monospace; color: #aaaaaa; background-color
 a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
+.LineNr { color: #444444; }
 .Constant { color: #00a0a0; }
-.Comment { color: #9090ff; }
-.Comment a { color:#0000ee; text-decoration:underline; }
 .Delimiter { color: #800080; }
-.LineNr { color: #444444; }
 .Normal { color: #aaaaaa; background-color: #080808; padding-bottom: 1px; }
+.Comment { color: #9090ff; }
+.Comment a { color:#0000ee; text-decoration:underline; }
 .cSpecial { color: #008000; }
 -->
 </style>
diff --git a/html/subx/011run.cc.html b/html/subx/011run.cc.html
index 272d248b..d72e46e2 100644
--- a/html/subx/011run.cc.html
+++ b/html/subx/011run.cc.html
@@ -134,7 +134,7 @@ if ('onhashchange' in window) {
 <span id="L71" class="LineNr"> 71 </span><span class="traceContains">+load: 0x00000003 -&gt; 0b</span>
 <span id="L72" class="LineNr"> 72 </span><span class="traceContains">+load: 0x00000004 -&gt; 0c</span>
 <span id="L73" class="LineNr"> 73 </span><span class="traceContains">+load: 0x00000005 -&gt; 0d</span>
-<span id="L74" class="LineNr"> 74 </span><span class="traceContains">+run: add <a href='011run.cc.html#L299'>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="L74" class="LineNr"> 74 </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="L75" class="LineNr"> 75 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
 <span id="L76" class="LineNr"> 76 </span>
 <span id="L77" class="LineNr"> 77 </span><span class="Delimiter">:(code)</span>
@@ -346,20 +346,20 @@ if ('onhashchange' in window) {
 <span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: run</span>
 <span id="L284" class="LineNr">284 </span>
 <span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add <a href='011run.cc.html#L299'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;05&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;add imm32 to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
 <span id="L287" class="LineNr">287 </span>
 <span id="L288" class="LineNr">288 </span><span class="Comment">//: our first opcode</span>
 <span id="L289" class="LineNr">289 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L290" class="LineNr">290 </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="L291" class="LineNr">291 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L292" class="LineNr">292 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L292" class="LineNr">292 </span>  <a href='003trace.cc.html#L196'>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#L260'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L293" class="LineNr">293 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
 <span id="L294" class="LineNr">294 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L295" class="LineNr">295 </span><span class="Delimiter">}</span>
 <span id="L296" class="LineNr">296 </span>
 <span id="L297" class="LineNr">297 </span><span class="Delimiter">:(code)</span>
-<span id="L298" class="LineNr">298 </span><span class="Comment">// read a 32-bit immediate in little-endian order from the instruction stream</span>
-<span id="L299" class="LineNr">299 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L298" class="LineNr">298 </span><span class="Comment">// read a 32-bit int in little-endian order from the instruction stream</span>
+<span id="L299" class="LineNr">299 </span><span class="Normal">int32_t</span> <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
 <span id="L300" class="LineNr">300 </span>  <span class="Normal">int32_t</span> result = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
 <span id="L301" class="LineNr">301 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">8</span><span class="Delimiter">);</span>
 <span id="L302" class="LineNr">302 </span>  result |= <span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">()</span>&lt;&lt;<span class="Constant">16</span><span class="Delimiter">);</span>
diff --git a/html/subx/012elf.cc.html b/html/subx/012elf.cc.html
index 1d00ccc5..11155163 100644
--- a/html/subx/012elf.cc.html
+++ b/html/subx/012elf.cc.html
@@ -67,8 +67,8 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr">  8 </span>  assert<span class="Delimiter">(</span>argc &gt; <span class="Constant">2</span><span class="Delimiter">);</span>
 <span id="L9" class="LineNr">  9 </span>  <a href='000organization.cc.html#L148'>reset</a><span class="Delimiter">();</span>
 <span id="L10" class="LineNr"> 10 </span>  cerr &lt;&lt; std::hex<span class="Delimiter">;</span>
-<span id="L11" class="LineNr"> 11 </span>  <a href='012elf.cc.html#L131'>initialize_mem</a><span class="Delimiter">();</span>
-<span id="L12" class="LineNr"> 12 </span>  Mem_offset = <a href='012elf.cc.html#L126'>CODE_START</a><span class="Delimiter">;</span>
+<span id="L11" class="LineNr"> 11 </span>  <a href='012elf.cc.html#L130'>initialize_mem</a><span class="Delimiter">();</span>
+<span id="L12" class="LineNr"> 12 </span>  Mem_offset = <a href='012elf.cc.html#L125'>CODE_START</a><span class="Delimiter">;</span>
 <span id="L13" class="LineNr"> 13 </span>  <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span>argv[<span class="Constant">2</span>]<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
 <span id="L14" class="LineNr"> 14 </span>  <span class="Normal">while</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a> &lt; <a href='010---vm.cc.html#L95'>End_of_program</a><span class="Delimiter">)</span>  <span class="Comment">// weak final-gasp termination check</span>
 <span id="L15" class="LineNr"> 15 </span>    <a href='010---vm.cc.html#L150'>run_one_instruction</a><span class="Delimiter">();</span>
@@ -79,13 +79,13 @@ if ('onhashchange' in window) {
 <span id="L20" class="LineNr"> 20 </span><span class="Delimiter">:(code)</span>
 <span id="L21" class="LineNr"> 21 </span><span class="Normal">void</span> <a href='012elf.cc.html#L21'>load_elf</a><span class="Delimiter">(</span><span class="Normal">const</span> string&amp; filename<span class="Delimiter">,</span> <span class="Normal">int</span> argc<span class="Delimiter">,</span> <span class="Normal">char</span>* argv[]<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L22" class="LineNr"> 22 </span>  <span class="Normal">int</span> fd = open<span class="Delimiter">(</span>filename<span class="Delimiter">.</span>c_str<span class="Delimiter">(),</span> O_RDONLY<span class="Delimiter">);</span>
-<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: open&quot;</span> &lt;&lt; <a href='012elf.cc.html#L144'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>fd &lt; <span class="Constant">0</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; filename<span class="Delimiter">.</span>c_str<span class="Delimiter">()</span> &lt;&lt; <span class="Constant">&quot;: open&quot;</span> &lt;&lt; <a href='012elf.cc.html#L143'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Normal">off_t</span> size = lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_END</span><span class="Delimiter">);</span>
 <span id="L25" class="LineNr"> 25 </span>  lseek<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> <span class="Constant">0</span><span class="Delimiter">,</span> <span class="Constant">SEEK_SET</span><span class="Delimiter">);</span>
 <span id="L26" class="LineNr"> 26 </span>  <span class="Normal">uint8_t</span>* elf_contents = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span>malloc<span class="Delimiter">(</span>size<span class="Delimiter">));</span>
-<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;malloc(&quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L144'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents == <span class="Constant">NULL</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;malloc(&quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L143'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Normal">ssize_t</span> read_size = read<span class="Delimiter">(</span>fd<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">);</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;read → &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; (!= &quot;</span> &lt;&lt; read_size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L144'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size != read_size<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;read → &quot;</span> &lt;&lt; size &lt;&lt; <span class="Constant">&quot; (!= &quot;</span> &lt;&lt; read_size &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='012elf.cc.html#L143'>perr</a><span class="Delimiter">()</span> &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
 <span id="L30" class="LineNr"> 30 </span>  <a href='012elf.cc.html#L34'>load_elf_contents</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> argc<span class="Delimiter">,</span> argv<span class="Delimiter">);</span>
 <span id="L31" class="LineNr"> 31 </span>  free<span class="Delimiter">(</span>elf_contents<span class="Delimiter">);</span>
 <span id="L32" class="LineNr"> 32 </span><span class="Delimiter">}</span>
@@ -94,135 +94,134 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>  <span class="Normal">uint8_t</span> magic[<span class="Constant">5</span>] = <span class="Delimiter">{</span><span class="Constant">0</span><span class="Delimiter">};</span>
 <span id="L36" class="LineNr"> 36 </span>  memcpy<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> elf_contents<span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>memcmp<span class="Delimiter">(</span>magic<span class="Delimiter">,</span> <span class="Constant">&quot;</span><span class="cSpecial">\177</span><span class="Constant">ELF&quot;</span><span class="Delimiter">,</span> <span class="Constant">4</span><span class="Delimiter">)</span> != <span class="Constant">0</span><span class="Delimiter">)</span>
-<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L38" class="LineNr"> 38 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid ELF file; starts with </span><span class="cSpecial">\&quot;</span><span class="Constant">&quot;</span> &lt;&lt; magic &lt;&lt; <span class="Constant">'&quot;'</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
 <span id="L39" class="LineNr"> 39 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">4</span>] != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L40" class="LineNr"> 40 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only 32-bit ELF files (4-byte words; virtual addresses up to 4GB) supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>elf_contents[<span class="Constant">5</span>] != <span class="Constant">1</span><span class="Delimiter">)</span>
-<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
+<span id="L42" class="LineNr"> 42 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Only little-endian ELF files supported.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
 <span id="L43" class="LineNr"> 43 </span>  <span class="Comment">// unused: remaining 10 bytes of e_ident</span>
-<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L44" class="LineNr"> 44 </span>  <span class="Normal">uint32_t</span> e_machine_type = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">16</span>]<span class="Delimiter">);</span>
 <span id="L45" class="LineNr"> 45 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_machine_type != <span class="Constant">0x00030002</span><span class="Delimiter">)</span>
 <span id="L46" class="LineNr"> 46 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;ELF type/machine 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; e_machine_type &lt;&lt; <span class="Constant">&quot; isn't i386 executable</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
 <span id="L47" class="LineNr"> 47 </span>  <span class="Comment">// unused: e_version. We only support version 1, and later versions will be backwards compatible.</span>
-<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
-<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
+<span id="L48" class="LineNr"> 48 </span>  <span class="Normal">uint32_t</span> e_entry = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">24</span>]<span class="Delimiter">);</span>
+<span id="L49" class="LineNr"> 49 </span>  <span class="Normal">uint32_t</span> e_phoff = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">28</span>]<span class="Delimiter">);</span>
 <span id="L50" class="LineNr"> 50 </span>  <span class="Comment">// unused: e_shoff</span>
 <span id="L51" class="LineNr"> 51 </span>  <span class="Comment">// unused: e_flags</span>
-<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
-<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &lt; <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
-<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
-<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
+<span id="L52" class="LineNr"> 52 </span>  <span class="Normal">uint32_t</span> e_ehsize = <a href='012elf.cc.html#L138'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">40</span>]<span class="Delimiter">);</span>
+<span id="L53" class="LineNr"> 53 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &lt; <span class="Constant">52</span><span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; ELF header too small</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
+<span id="L54" class="LineNr"> 54 </span>  <span class="Normal">uint32_t</span> e_phentsize = <a href='012elf.cc.html#L138'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">42</span>]<span class="Delimiter">);</span>
+<span id="L55" class="LineNr"> 55 </span>  <span class="Normal">uint32_t</span> e_phnum = <a href='012elf.cc.html#L138'>u16_in</a><span class="Delimiter">(</span>&amp;elf_contents[<span class="Constant">44</span>]<span class="Delimiter">);</span>
 <span id="L56" class="LineNr"> 56 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; e_phnum &lt;&lt; <span class="Constant">&quot; entries in the <a href='011run.cc.html#L96'>program</a> header, each &quot;</span> &lt;&lt; e_phentsize &lt;&lt; <span class="Constant">&quot; bytes long&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L57" class="LineNr"> 57 </span>  <span class="Comment">// unused: e_shentsize</span>
 <span id="L58" class="LineNr"> 58 </span>  <span class="Comment">// unused: e_shnum</span>
 <span id="L59" class="LineNr"> 59 </span>  <span class="Comment">// unused: e_shstrndx</span>
 <span id="L60" class="LineNr"> 60 </span>
 <span id="L61" class="LineNr"> 61 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; e_phnum<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
-<span id="L62" class="LineNr"> 62 </span>    <a href='012elf.cc.html#L92'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">);</span>
+<span id="L62" class="LineNr"> 62 </span>    <a href='012elf.cc.html#L91'>load_segment_from_program_header</a><span class="Delimiter">(</span>elf_contents<span class="Delimiter">,</span> size<span class="Delimiter">,</span> e_phoff + i*e_phentsize<span class="Delimiter">,</span> e_ehsize<span class="Delimiter">);</span>
 <span id="L63" class="LineNr"> 63 </span>
 <span id="L64" class="LineNr"> 64 </span>  <span class="Comment">// initialize code and stack</span>
-<span id="L65" class="LineNr"> 65 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L128'>AFTER_STACK</a><span class="Delimiter">;</span>
+<span id="L65" class="LineNr"> 65 </span>  Reg[ESP]<span class="Delimiter">.</span>u = <a href='012elf.cc.html#L127'>AFTER_STACK</a><span class="Delimiter">;</span>
 <span id="L66" class="LineNr"> 66 </span>  Reg[EBP]<span class="Delimiter">.</span>u = <span class="Constant">0</span><span class="Delimiter">;</span>
 <span id="L67" class="LineNr"> 67 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = e_entry<span class="Delimiter">;</span>
 <span id="L68" class="LineNr"> 68 </span>
 <span id="L69" class="LineNr"> 69 </span>  <span class="Comment">// initialize args on stack</span>
 <span id="L70" class="LineNr"> 70 </span>  <span class="Comment">// no envp for now</span>
 <span id="L71" class="LineNr"> 71 </span>  <span class="Comment">// we wastefully use a separate page of memory for argv</span>
-<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">uint32_t</span> argv_data = <a href='012elf.cc.html#L129'>ARGV_DATA_SEGMENT</a><span class="Delimiter">;</span>
+<span id="L72" class="LineNr"> 72 </span>  <span class="Normal">uint32_t</span> argv_data = <a href='012elf.cc.html#L128'>ARGV_DATA_SEGMENT</a><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 = argc-<span class="Constant">1</span><span class="Delimiter">;</span>  i &gt;= <span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">;</span>  --i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L74" class="LineNr"> 74 </span>    <a href='003trace.cc.html#L199'>dbg</a> &lt;&lt; <span class="Constant">&quot;push &quot;</span> &lt;&lt; argv_data &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L75" class="LineNr"> 75 </span>    <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">);</span>
-<span id="L76" class="LineNr"> 76 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt;= strlen<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L77" class="LineNr"> 77 </span>      <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span>
-<span id="L78" class="LineNr"> 78 </span>      argv_data += <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">char</span><span class="Delimiter">);</span>
-<span id="L79" class="LineNr"> 79 </span>      assert<span class="Delimiter">(</span>argv_data &lt; <a href='012elf.cc.html#L129'>ARGV_DATA_SEGMENT</a> + <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
-<span id="L80" class="LineNr"> 80 </span>    <span class="Delimiter">}</span>
-<span id="L81" class="LineNr"> 81 </span>  <span class="Delimiter">}</span>
-<span id="L82" class="LineNr"> 82 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>argc-<span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span>
-<span id="L83" class="LineNr"> 83 </span><span class="Delimiter">}</span>
-<span id="L84" class="LineNr"> 84 </span>
-<span id="L85" class="LineNr"> 85 </span><span class="Normal">void</span> <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L86" class="LineNr"> 86 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L87" class="LineNr"> 87 </span>  <a href='003trace.cc.html#L196'>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;decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L88" class="LineNr"> 88 </span>  <a href='003trace.cc.html#L196'>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;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L89" class="LineNr"> 89 </span>  <a href='010---vm.cc.html#L139'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<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='012elf.cc.html#L92'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L93" class="LineNr"> 93 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
-<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;program header at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L95" class="LineNr"> 95 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_type != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L96" class="LineNr"> 96 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ignoring segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; of non PT_LOAD type &quot;</span> &lt;&lt; p_type &lt;&lt; <span class="Constant">&quot; (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf)">http://refspecs.linuxbase.org/elf/elf.pdf)</a>&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
-<span id="L97" class="LineNr"> 97 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L98" class="LineNr"> 98 </span>  <span class="Delimiter">}</span>
-<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
-<span id="L101" class="LineNr">101 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L96'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
-<span id="L102" class="LineNr">102 </span>  <span class="Comment">// unused: p_paddr</span>
-<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
-<span id="L104" class="LineNr">104 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
-<span id="L105" class="LineNr">105 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
-<span id="L106" class="LineNr">106 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf)">http://refspecs.linuxbase.org/elf/elf.pdf)</a></span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
-<span id="L109" class="LineNr">109 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is too large: wants to <a href='003trace.cc.html#L222'>end</a> at &quot;</span> &lt;&lt; p_offset+p_filesz &lt;&lt; <span class="Constant">&quot; but the file ends at &quot;</span> &lt;&lt; size &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L153'>die</a><span class="Delimiter">();</span>
-<span id="L110" class="LineNr">110 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; p_vaddr + p_memsz<span class="Delimiter">)</span>
-<span id="L111" class="LineNr">111 </span>    <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>p_vaddr + p_memsz<span class="Delimiter">);</span>
-<span id="L112" class="LineNr">112 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size &gt; p_memsz<span class="Delimiter">)</span> size = p_memsz<span class="Delimiter">;</span>
-<span id="L113" class="LineNr">113 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;blitting file offsets (&quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) to addresses (&quot;</span> &lt;&lt; p_vaddr &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L114" class="LineNr">114 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p_filesz<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
-<span id="L115" class="LineNr">115 </span>    <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
-<span id="L116" class="LineNr">116 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L95'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
-<span id="L117" class="LineNr">117 </span>    <a href='010---vm.cc.html#L95'>End_of_program</a> = p_vaddr+p_memsz<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="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L121" class="LineNr">121 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now.</span>
-<span id="L122" class="LineNr">122 </span><span class="Comment">//   code: 0x08048000 -&gt; 0x08048fff</span>
-<span id="L123" class="LineNr">123 </span><span class="Comment">//   data: 0x08049000 -&gt; 0x08049fff</span>
-<span id="L124" class="LineNr">124 </span><span class="Comment">//   heap: 0x0804a000 -&gt; 0x0804afff</span>
-<span id="L125" class="LineNr">125 </span><span class="Comment">//   stack: 0x0804bfff -&gt; 0x0804b000 (downward)</span>
-<span id="L126" class="LineNr">126 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L126'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
-<span id="L128" class="LineNr">128 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L128'>AFTER_STACK</a> = <span class="Constant">0x0804c000</span><span class="Delimiter">;</span>
-<span id="L129" class="LineNr">129 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L129'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x0804e000</span><span class="Delimiter">;</span>
-<span id="L130" class="LineNr">130 </span><span class="Delimiter">:(code)</span>
-<span id="L131" class="LineNr">131 </span><span class="Normal">void</span> <a href='012elf.cc.html#L131'>initialize_mem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L132" class="LineNr">132 </span>  <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='012elf.cc.html#L128'>AFTER_STACK</a> - <a href='012elf.cc.html#L126'>CODE_START</a><span class="Delimiter">);</span>
-<span id="L133" class="LineNr">133 </span><span class="Delimiter">}</span>
-<span id="L134" class="LineNr">134 </span>
-<span id="L135" class="LineNr">135 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L135'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L136" class="LineNr">136 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
-<span id="L137" class="LineNr">137 </span><span class="Delimiter">}</span>
-<span id="L138" class="LineNr">138 </span>
-<span id="L139" class="LineNr">139 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L139'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L140" class="LineNr">140 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
-<span id="L141" class="LineNr">141 </span><span class="Delimiter">}</span>
-<span id="L142" class="LineNr">142 </span>
-<span id="L143" class="LineNr">143 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L144" class="LineNr">144 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L144'>perr</a> <span class="Delimiter">{};</span>
-<span id="L145" class="LineNr">145 </span><span class="Delimiter">:(code)</span>
-<span id="L146" class="LineNr">146 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L144'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L147" class="LineNr">147 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
-<span id="L148" class="LineNr">148 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
-<span id="L149" class="LineNr">149 </span>  <span class="Identifier">return</span> os<span class="Delimiter">;</span>
-<span id="L150" class="LineNr">150 </span><span class="Delimiter">}</span>
-<span id="L151" class="LineNr">151 </span>
-<span id="L152" class="LineNr">152 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
-<span id="L153" class="LineNr">153 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L153'>die</a> <span class="Delimiter">{};</span>
-<span id="L154" class="LineNr">154 </span><span class="Delimiter">:(code)</span>
-<span id="L155" class="LineNr">155 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='012elf.cc.html#L153'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L156" class="LineNr">156 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
-<span id="L157" class="LineNr">157 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">}</span>
-<span id="L159" class="LineNr">159 </span>
-<span id="L160" class="LineNr">160 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L161" class="LineNr">161 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
-<span id="L162" class="LineNr">162 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
-<span id="L163" class="LineNr">163 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
-<span id="L164" class="LineNr">164 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
-<span id="L165" class="LineNr">165 </span><span class="Comment">#include &lt;errno.h&gt;</span>
-<span id="L166" class="LineNr">166 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
+<span id="L74" class="LineNr"> 74 </span>    <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">);</span>
+<span id="L75" class="LineNr"> 75 </span>    <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> j = <span class="Constant">0</span><span class="Delimiter">;</span>  j &lt;= strlen<span class="Delimiter">(</span>argv[i]<span class="Delimiter">);</span>  ++j<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L76" class="LineNr"> 76 </span>      <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>argv_data<span class="Delimiter">,</span> argv[i][j]<span class="Delimiter">);</span>
+<span id="L77" class="LineNr"> 77 </span>      argv_data += <span class="Normal">sizeof</span><span class="Delimiter">(</span><span class="Normal">char</span><span class="Delimiter">);</span>
+<span id="L78" class="LineNr"> 78 </span>      assert<span class="Delimiter">(</span>argv_data &lt; <a href='012elf.cc.html#L128'>ARGV_DATA_SEGMENT</a> + <a href='012elf.cc.html#L126'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
+<span id="L79" class="LineNr"> 79 </span>    <span class="Delimiter">}</span>
+<span id="L80" class="LineNr"> 80 </span>  <span class="Delimiter">}</span>
+<span id="L81" class="LineNr"> 81 </span>  <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span>argc-<span class="Comment">/*</span><span class="Comment">skip 'subx_bin' and 'run'</span><span class="Comment">*/</span><span class="Constant">2</span><span class="Delimiter">);</span>
+<span id="L82" class="LineNr"> 82 </span><span class="Delimiter">}</span>
+<span id="L83" class="LineNr"> 83 </span>
+<span id="L84" class="LineNr"> 84 </span><span class="Normal">void</span> <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span><span class="Normal">uint32_t</span> val<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L85" class="LineNr"> 85 </span>  Reg[ESP]<span class="Delimiter">.</span>u -= <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L86" class="LineNr"> 86 </span>  <a href='003trace.cc.html#L196'>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;decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr"> 87 </span>  <a href='003trace.cc.html#L196'>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;pushing value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L88" class="LineNr"> 88 </span>  <a href='010---vm.cc.html#L139'>write_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">,</span> val<span class="Delimiter">);</span>
+<span id="L89" class="LineNr"> 89 </span><span class="Delimiter">}</span>
+<span id="L90" class="LineNr"> 90 </span>
+<span id="L91" class="LineNr"> 91 </span><span class="Normal">void</span> <a href='012elf.cc.html#L91'>load_segment_from_program_header</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* elf_contents<span class="Delimiter">,</span> <span class="Normal">size_t</span> size<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> offset<span class="Delimiter">,</span> <span class="Normal">uint32_t</span> e_ehsize<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L92" class="LineNr"> 92 </span>  <span class="Normal">uint32_t</span> p_type = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset]<span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;program header at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot;: type &quot;</span> &lt;&lt; p_type &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L94" class="LineNr"> 94 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_type != <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L95" class="LineNr"> 95 </span>    <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;ignoring segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; of non PT_LOAD type &quot;</span> &lt;&lt; p_type &lt;&lt; <span class="Constant">&quot; (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)&quot;</span> &lt;&lt; end<span class="Delimiter">();</span>
+<span id="L96" class="LineNr"> 96 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span>  <span class="Delimiter">}</span>
+<span id="L98" class="LineNr"> 98 </span>  <span class="Normal">uint32_t</span> p_offset = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">4</span>]<span class="Delimiter">);</span>
+<span id="L99" class="LineNr"> 99 </span>  <span class="Normal">uint32_t</span> p_vaddr = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">8</span>]<span class="Delimiter">);</span>
+<span id="L100" class="LineNr">100 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>e_ehsize &gt; p_vaddr<span class="Delimiter">)</span> <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; <a href='011run.cc.html#L96'>program</a> header overlaps ELF header</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
+<span id="L101" class="LineNr">101 </span>  <span class="Comment">// unused: p_paddr</span>
+<span id="L102" class="LineNr">102 </span>  <span class="Normal">uint32_t</span> p_filesz = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">16</span>]<span class="Delimiter">);</span>
+<span id="L103" class="LineNr">103 </span>  <span class="Normal">uint32_t</span> p_memsz = <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span>&amp;elf_contents[offset + <span class="Constant">20</span>]<span class="Delimiter">);</span>
+<span id="L104" class="LineNr">104 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_filesz != p_memsz<span class="Delimiter">)</span>
+<span id="L105" class="LineNr">105 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Can't handle segments where p_filesz != p_memsz (see <a href="http://refspecs.linuxbase.org/elf/elf.pdf">http://refspecs.linuxbase.org/elf/elf.pdf</a>)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; die<span class="Delimiter">();</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>p_offset + p_filesz &gt; size<span class="Delimiter">)</span>
+<span id="L108" class="LineNr">108 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;Invalid binary; segment at offset &quot;</span> &lt;&lt; offset &lt;&lt; <span class="Constant">&quot; is too large: wants to <a href='003trace.cc.html#L222'>end</a> at &quot;</span> &lt;&lt; p_offset+p_filesz &lt;&lt; <span class="Constant">&quot; but the file ends at &quot;</span> &lt;&lt; size &lt;&lt; <span class="cSpecial">'\n'</span> &lt;&lt; <a href='012elf.cc.html#L152'>die</a><span class="Delimiter">();</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>size<span class="Delimiter">()</span> &lt; p_vaddr + p_memsz<span class="Delimiter">)</span>
+<span id="L110" class="LineNr">110 </span>    <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span>p_vaddr + p_memsz<span class="Delimiter">);</span>
+<span id="L111" class="LineNr">111 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>size &gt; p_memsz<span class="Delimiter">)</span> size = p_memsz<span class="Delimiter">;</span>
+<span id="L112" class="LineNr">112 </span>  <a href='003trace.cc.html#L196'>trace</a><span class="Delimiter">(</span><span class="Constant">90</span><span class="Delimiter">,</span> <span class="Constant">&quot;load&quot;</span><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;blitting file offsets (&quot;</span> &lt;&lt; p_offset &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_offset+p_filesz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;) to addresses (&quot;</span> &lt;&lt; p_vaddr &lt;&lt; <span class="Constant">&quot;, &quot;</span> &lt;&lt; <span class="Delimiter">(</span>p_vaddr+p_memsz<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">')'</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L113" class="LineNr">113 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p_filesz<span class="Delimiter">;</span>  ++i<span class="Delimiter">)</span>
+<span id="L114" class="LineNr">114 </span>    <a href='010---vm.cc.html#L133'>write_mem_u8</a><span class="Delimiter">(</span>p_vaddr+i<span class="Delimiter">,</span> elf_contents[p_offset+i]<span class="Delimiter">);</span>
+<span id="L115" class="LineNr">115 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='010---vm.cc.html#L95'>End_of_program</a> &lt; p_vaddr+p_memsz<span class="Delimiter">)</span>
+<span id="L116" class="LineNr">116 </span>    <a href='010---vm.cc.html#L95'>End_of_program</a> = p_vaddr+p_memsz<span class="Delimiter">;</span>
+<span id="L117" class="LineNr">117 </span><span class="Delimiter">}</span>
+<span id="L118" class="LineNr">118 </span>
+<span id="L119" class="LineNr">119 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L120" class="LineNr">120 </span><span class="Comment">// Very primitive/fixed/insecure ELF segments for now.</span>
+<span id="L121" class="LineNr">121 </span><span class="Comment">//   code: 0x08048000 -&gt; 0x08048fff</span>
+<span id="L122" class="LineNr">122 </span><span class="Comment">//   data: 0x08049000 -&gt; 0x08049fff</span>
+<span id="L123" class="LineNr">123 </span><span class="Comment">//   heap: 0x0804a000 -&gt; 0x0804afff</span>
+<span id="L124" class="LineNr">124 </span><span class="Comment">//   stack: 0x0804bfff -&gt; 0x0804b000 (downward)</span>
+<span id="L125" class="LineNr">125 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L125'>CODE_START</a> = <span class="Constant">0x08048000</span><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L126'>SEGMENT_SIZE</a> = <span class="Constant">0x1000</span><span class="Delimiter">;</span>
+<span id="L127" class="LineNr">127 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L127'>AFTER_STACK</a> = <span class="Constant">0x0804c000</span><span class="Delimiter">;</span>
+<span id="L128" class="LineNr">128 </span><span class="Normal">const</span> <span class="Normal">int</span> <a href='012elf.cc.html#L128'>ARGV_DATA_SEGMENT</a> = <span class="Constant">0x0804e000</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span><span class="Delimiter">:(code)</span>
+<span id="L130" class="LineNr">130 </span><span class="Normal">void</span> <a href='012elf.cc.html#L130'>initialize_mem</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L131" class="LineNr">131 </span>  <a href='010---vm.cc.html#L93'>Mem</a><span class="Delimiter">.</span>resize<span class="Delimiter">(</span><a href='012elf.cc.html#L127'>AFTER_STACK</a> - <a href='012elf.cc.html#L125'>CODE_START</a><span class="Delimiter">);</span>
+<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Normal">inline</span> <span class="Normal">uint32_t</span> <a href='012elf.cc.html#L134'>u32_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L135" class="LineNr">135 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span> | p[<span class="Constant">2</span>] &lt;&lt; <span class="Constant">16</span> | p[<span class="Constant">3</span>] &lt;&lt; <span class="Constant">24</span><span class="Delimiter">;</span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">}</span>
+<span id="L137" class="LineNr">137 </span>
+<span id="L138" class="LineNr">138 </span><span class="Normal">inline</span> <span class="Normal">uint16_t</span> <a href='012elf.cc.html#L138'>u16_in</a><span class="Delimiter">(</span><span class="Normal">uint8_t</span>* p<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L139" class="LineNr">139 </span>  <span class="Identifier">return</span> p[<span class="Constant">0</span>] | p[<span class="Constant">1</span>] &lt;&lt; <span class="Constant">8</span><span class="Delimiter">;</span>
+<span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
+<span id="L141" class="LineNr">141 </span>
+<span id="L142" class="LineNr">142 </span><span class="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L143" class="LineNr">143 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L143'>perr</a> <span class="Delimiter">{};</span>
+<span id="L144" class="LineNr">144 </span><span class="Delimiter">:(code)</span>
+<span id="L145" class="LineNr">145 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; os<span class="Delimiter">,</span> <a href='012elf.cc.html#L143'>perr</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L146" class="LineNr">146 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>errno<span class="Delimiter">)</span>
+<span id="L147" class="LineNr">147 </span>    os &lt;&lt; <span class="Constant">&quot;: &quot;</span> &lt;&lt; strerror<span class="Delimiter">(</span>errno<span class="Delimiter">);</span>
+<span id="L148" class="LineNr">148 </span>  <span class="Identifier">return</span> os<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="Delimiter">:(before &quot;End Types&quot;)</span>
+<span id="L152" class="LineNr">152 </span><span class="Normal">struct</span> <a href='012elf.cc.html#L152'>die</a> <span class="Delimiter">{};</span>
+<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(code)</span>
+<span id="L154" class="LineNr">154 </span>ostream&amp; <span class="Normal">operator</span>&lt;&lt;<span class="Delimiter">(</span>ostream&amp; <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">,</span> <a href='012elf.cc.html#L152'>die</a> <span class="Comment">/*</span><span class="Comment">unused</span><span class="Comment">*/</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L155" class="LineNr">155 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">)</span> <a href='003trace.cc.html#L175'>Trace_stream</a><span class="Delimiter">-&gt;</span><a href='003trace.cc.html#L147'>newline</a><span class="Delimiter">();</span>
+<span id="L156" class="LineNr">156 </span>  exit<span class="Delimiter">(</span><span class="Constant">1</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">:(before &quot;End Includes&quot;)</span>
+<span id="L160" class="LineNr">160 </span><span class="Comment">#include &lt;sys/types.h&gt;</span>
+<span id="L161" class="LineNr">161 </span><span class="Comment">#include &lt;sys/stat.h&gt;</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment">#include &lt;fcntl.h&gt;</span>
+<span id="L163" class="LineNr">163 </span><span class="Comment">#include &lt;stdarg.h&gt;</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment">#include &lt;errno.h&gt;</span>
+<span id="L165" class="LineNr">165 </span><span class="Comment">#include &lt;unistd.h&gt;</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/013direct_addressing.cc.html b/html/subx/013direct_addressing.cc.html
index 7aee7484..8b251309 100644
--- a/html/subx/013direct_addressing.cc.html
+++ b/html/subx/013direct_addressing.cc.html
@@ -155,332 +155,372 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span><span class="SalientComment">//:: multiply</span>
 <span id="L91" class="LineNr"> 91 </span>
 <span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L93" class="LineNr"> 93 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32&quot;</span><span class="Delimiter">);</span>
+<span id="L93" class="LineNr"> 93 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;test/negate/mul/div rm32 (with <a href='010---vm.cc.html#L13'>EAX</a> if necessary) depending on subop&quot;</span><span class="Delimiter">);</span>
 <span id="L94" class="LineNr"> 94 </span>
-<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
+<span id="L95" class="LineNr"> 95 </span><span class="Delimiter">:(scenario multiply_eax_by_r32)</span>
 <span id="L96" class="LineNr"> 96 </span><span class="Special">% Reg[EAX].i = 4;</span>
-<span id="L97" class="LineNr"> 97 </span><span class="Special">% Reg[EBX].i = 2;</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Special">% Reg[ECX].i = 3;</span>
 <span id="L98" class="LineNr"> 98 </span>== <span class="Constant">0x1</span>
 <span id="L99" class="LineNr"> 99 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
-<span id="L100" class="LineNr">100 </span>  <span class="Constant">0f</span> af   d8                                      <span class="Comment"># subtract EBX into EAX</span>
-<span id="L101" class="LineNr">101 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: multiply r/m32 into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: storing 0x00000008</span>
-<span id="L105" class="LineNr">105 </span>
-<span id="L106" class="LineNr">106 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
-<span id="L107" class="LineNr">107 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span>  <span class="Comment">// multiply r32 into r/m32</span>
-<span id="L108" class="LineNr">108 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L109" class="LineNr">109 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L196'>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;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L100" class="LineNr">100 </span>  f7      e1                                      <span class="Comment"># multiply EAX by ECX</span>
+<span id="L101" class="LineNr">101 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (subop mul) 001 (src ECX)</span>
+<span id="L102" class="LineNr">102 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L14'>ECX</a></span>
+<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32</span>
+<span id="L105" class="LineNr">105 </span><span class="traceContains">+run: storing 0x0000000c</span>
+<span id="L106" class="LineNr">106 </span>
+<span id="L107" class="LineNr">107 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L108" class="LineNr">108 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L109" class="LineNr">109 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L110" class="LineNr">110 </span>  <a href='003trace.cc.html#L196'>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;operate on r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L111" class="LineNr">111 </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="L112" class="LineNr">112 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
-<span id="L113" class="LineNr">113 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L114" class="LineNr">114 </span><span class="Delimiter">}</span>
-<span id="L115" class="LineNr">115 </span>
-<span id="L116" class="LineNr">116 </span><span class="SalientComment">//:: and</span>
-<span id="L117" class="LineNr">117 </span>
-<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L119" class="LineNr">119 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
-<span id="L122" class="LineNr">122 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L123" class="LineNr">123 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
-<span id="L124" class="LineNr">124 </span>== <span class="Constant">0x1</span>
-<span id="L125" class="LineNr">125 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
-<span id="L127" class="LineNr">127 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L128" class="LineNr">128 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L129" class="LineNr">129 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L130" class="LineNr">130 </span><span class="traceContains">+run: storing 0x0000000d</span>
-<span id="L131" class="LineNr">131 </span>
-<span id="L132" class="LineNr">132 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L133" class="LineNr">133 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
-<span id="L134" class="LineNr">134 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L136" class="LineNr">136 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L137" class="LineNr">137 </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="L138" class="LineNr">138 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L139" class="LineNr">139 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L140" class="LineNr">140 </span><span class="Delimiter">}</span>
-<span id="L141" class="LineNr">141 </span>
-<span id="L142" class="LineNr">142 </span><span class="SalientComment">//:: or</span>
-<span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L145" class="LineNr">145 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L112" class="LineNr">112 </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="L113" class="LineNr">113 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L114" class="LineNr">114 </span>  <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// mul unsigned EAX by r/m32</span>
+<span id="L115" class="LineNr">115 </span>    <a href='003trace.cc.html#L196'>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;subop: multiply <a href='010---vm.cc.html#L13'>EAX</a> by r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L116" class="LineNr">116 </span>    <span class="Normal">uint64_t</span> result = Reg[EAX]<span class="Delimiter">.</span>u * <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>    Reg[EAX]<span class="Delimiter">.</span>u = result &amp; <span class="Constant">0xffffffff</span><span class="Delimiter">;</span>
+<span id="L118" class="LineNr">118 </span>    Reg[EDX]<span class="Delimiter">.</span>u = result &gt;&gt; <span class="Constant">32</span><span class="Delimiter">;</span>
+<span id="L119" class="LineNr">119 </span>    <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>Reg[EDX]<span class="Delimiter">.</span>u != <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L120" class="LineNr">120 </span>    <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[EAX]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L121" class="LineNr">121 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Delimiter">}</span>
+<span id="L123" class="LineNr">123 </span>  <span class="Comment">// End Op f7 Subops</span>
+<span id="L124" class="LineNr">124 </span>  <span class="Normal">default</span>:
+<span id="L125" class="LineNr">125 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after f7: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
+<span id="L126" class="LineNr">126 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
+<span id="L127" class="LineNr">127 </span>  <span class="Delimiter">}</span>
+<span id="L128" class="LineNr">128 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L129" class="LineNr">129 </span><span class="Delimiter">}</span>
+<span id="L130" class="LineNr">130 </span>
+<span id="L131" class="LineNr">131 </span><span class="Comment">//:</span>
+<span id="L132" class="LineNr">132 </span>
+<span id="L133" class="LineNr">133 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L134" class="LineNr">134 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;af&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;multiply rm32 into r32&quot;</span><span class="Delimiter">);</span>
+<span id="L135" class="LineNr">135 </span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(scenario multiply_r32_into_r32)</span>
+<span id="L137" class="LineNr">137 </span><span class="Special">% Reg[EAX].i = 4;</span>
+<span id="L138" class="LineNr">138 </span><span class="Special">% Reg[EBX].i = 2;</span>
+<span id="L139" class="LineNr">139 </span>== <span class="Constant">0x1</span>
+<span id="L140" class="LineNr">140 </span><span class="Comment"># op      ModR/M  SIB   displacement  immediate</span>
+<span id="L141" class="LineNr">141 </span>  <span class="Constant">0f</span> af   d8                                      <span class="Comment"># subtract EBX into EAX</span>
+<span id="L142" class="LineNr">142 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L143" class="LineNr">143 </span><span class="traceContains">+run: multiply r/m32 into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L144" class="LineNr">144 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: storing 0x00000008</span>
 <span id="L146" class="LineNr">146 </span>
-<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
-<span id="L148" class="LineNr">148 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L149" class="LineNr">149 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
-<span id="L150" class="LineNr">150 </span>== <span class="Constant">0x1</span>
-<span id="L151" class="LineNr">151 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L152" class="LineNr">152 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
-<span id="L153" class="LineNr">153 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L154" class="LineNr">154 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L155" class="LineNr">155 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L156" class="LineNr">156 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
-<span id="L157" class="LineNr">157 </span>
-<span id="L158" class="LineNr">158 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L159" class="LineNr">159 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
-<span id="L160" class="LineNr">160 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L161" class="LineNr">161 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L162" class="LineNr">162 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L163" class="LineNr">163 </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="L164" class="LineNr">164 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L165" class="LineNr">165 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">}</span>
-<span id="L167" class="LineNr">167 </span>
-<span id="L168" class="LineNr">168 </span><span class="SalientComment">//:: xor</span>
-<span id="L169" class="LineNr">169 </span>
-<span id="L170" class="LineNr">170 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L171" class="LineNr">171 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L147" class="LineNr">147 </span><span class="Delimiter">:(before &quot;End Two-Byte Opcodes Starting With 0f&quot;)</span>
+<span id="L148" class="LineNr">148 </span><span class="Normal">case</span> <span class="Constant">0xaf</span>: <span class="Delimiter">{</span>  <span class="Comment">// multiply r32 into r/m32</span>
+<span id="L149" class="LineNr">149 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L150" class="LineNr">150 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L151" class="LineNr">151 </span>  <a href='003trace.cc.html#L196'>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;multiply r/m32 into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L152" class="LineNr">152 </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="L153" class="LineNr">153 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>*<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> *arg1<span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </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 id="L157" class="LineNr">157 </span><span class="SalientComment">//:: and</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L160" class="LineNr">160 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;21&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise AND of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L161" class="LineNr">161 </span>
+<span id="L162" class="LineNr">162 </span><span class="Delimiter">:(scenario and_r32_with_r32)</span>
+<span id="L163" class="LineNr">163 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L164" class="LineNr">164 </span><span class="Special">% Reg[EBX].i = 0x000000ff;</span>
+<span id="L165" class="LineNr">165 </span>== <span class="Constant">0x1</span>
+<span id="L166" class="LineNr">166 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L167" class="LineNr">167 </span>  <span class="Constant">21</span>  d8                                      <span class="Comment"># and EBX with destination EAX</span>
+<span id="L168" class="LineNr">168 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: and <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L170" class="LineNr">170 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L171" class="LineNr">171 </span><span class="traceContains">+run: storing 0x0000000d</span>
 <span id="L172" class="LineNr">172 </span>
-<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
-<span id="L174" class="LineNr">174 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L175" class="LineNr">175 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
-<span id="L176" class="LineNr">176 </span>== <span class="Constant">0x1</span>
-<span id="L177" class="LineNr">177 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L178" class="LineNr">178 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
-<span id="L179" class="LineNr">179 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L180" class="LineNr">180 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
-<span id="L183" class="LineNr">183 </span>
-<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L185" class="LineNr">185 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L186" class="LineNr">186 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L187" class="LineNr">187 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L188" class="LineNr">188 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L189" class="LineNr">189 </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="L190" class="LineNr">190 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L192" class="LineNr">192 </span><span class="Delimiter">}</span>
-<span id="L193" class="LineNr">193 </span>
-<span id="L194" class="LineNr">194 </span><span class="SalientComment">//:: not</span>
-<span id="L195" class="LineNr">195 </span>
-<span id="L196" class="LineNr">196 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L197" class="LineNr">197 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;bitwise complement of rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L174" class="LineNr">174 </span><span class="Normal">case</span> <span class="Constant">0x21</span>: <span class="Delimiter">{</span>  <span class="Comment">// and r32 with r/m32</span>
+<span id="L175" class="LineNr">175 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L176" class="LineNr">176 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L177" class="LineNr">177 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L178" class="LineNr">178 </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="L179" class="LineNr">179 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L180" class="LineNr">180 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L181" class="LineNr">181 </span><span class="Delimiter">}</span>
+<span id="L182" class="LineNr">182 </span>
+<span id="L183" class="LineNr">183 </span><span class="SalientComment">//:: or</span>
+<span id="L184" class="LineNr">184 </span>
+<span id="L185" class="LineNr">185 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L186" class="LineNr">186 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;09&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise OR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L187" class="LineNr">187 </span>
+<span id="L188" class="LineNr">188 </span><span class="Delimiter">:(scenario or_r32_with_r32)</span>
+<span id="L189" class="LineNr">189 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L190" class="LineNr">190 </span><span class="Special">% Reg[EBX].i = 0xa0b0c0d0;</span>
+<span id="L191" class="LineNr">191 </span>== <span class="Constant">0x1</span>
+<span id="L192" class="LineNr">192 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L193" class="LineNr">193 </span>  <span class="Error">09</span>  d8                                      <span class="Comment"># or EBX with destination EAX</span>
+<span id="L194" class="LineNr">194 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: or <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: storing 0xaabbccdd</span>
 <span id="L198" class="LineNr">198 </span>
-<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(scenario not_r32)</span>
-<span id="L200" class="LineNr">200 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
-<span id="L201" class="LineNr">201 </span>== <span class="Constant">0x1</span>
-<span id="L202" class="LineNr">202 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L203" class="LineNr">203 </span>  f7  c3                                      <span class="Comment"># not EBX</span>
-<span id="L204" class="LineNr">204 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: 'not' of r/m32</span>
-<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L207" class="LineNr">207 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
+<span id="L199" class="LineNr">199 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L200" class="LineNr">200 </span><span class="Normal">case</span> <span class="Constant">0x09</span>: <span class="Delimiter">{</span>  <span class="Comment">// or r32 with r/m32</span>
+<span id="L201" class="LineNr">201 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L202" class="LineNr">202 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L203" class="LineNr">203 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L204" class="LineNr">204 </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="L205" class="LineNr">205 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L206" class="LineNr">206 </span>  <span class="Identifier">break</span><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><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L210" class="LineNr">210 </span><span class="Normal">case</span> <span class="Constant">0xf7</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L212" class="LineNr">212 </span>  <a href='003trace.cc.html#L196'>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;'not' of r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L213" class="LineNr">213 </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="L214" class="LineNr">214 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
-<span id="L215" class="LineNr">215 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L216" class="LineNr">216 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
-<span id="L217" class="LineNr">217 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L218" class="LineNr">218 </span>  <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L219" class="LineNr">219 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</span>
-<span id="L221" class="LineNr">221 </span>
-<span id="L222" class="LineNr">222 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L223" class="LineNr">223 </span>
-<span id="L224" class="LineNr">224 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L225" class="LineNr">225 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &lt; r32&quot;</span><span class="Delimiter">);</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
-<span id="L228" class="LineNr">228 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L229" class="LineNr">229 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L230" class="LineNr">230 </span>== <span class="Constant">0x1</span>
-<span id="L231" class="LineNr">231 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L232" class="LineNr">232 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L233" class="LineNr">233 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L234" class="LineNr">234 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L235" class="LineNr">235 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L236" class="LineNr">236 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L237" class="LineNr">237 </span>
-<span id="L238" class="LineNr">238 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L239" class="LineNr">239 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
-<span id="L240" class="LineNr">240 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L241" class="LineNr">241 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L242" class="LineNr">242 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L243" class="LineNr">243 </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="L244" class="LineNr">244 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L246" class="LineNr">246 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L247" class="LineNr">247 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L248" class="LineNr">248 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L249" class="LineNr">249 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L251" class="LineNr">251 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L252" class="LineNr">252 </span><span class="Delimiter">}</span>
-<span id="L253" class="LineNr">253 </span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
-<span id="L255" class="LineNr">255 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
-<span id="L256" class="LineNr">256 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L257" class="LineNr">257 </span>== <span class="Constant">0x1</span>
-<span id="L258" class="LineNr">258 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L259" class="LineNr">259 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L260" class="LineNr">260 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L263" class="LineNr">263 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
-<span id="L266" class="LineNr">266 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
-<span id="L267" class="LineNr">267 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L268" class="LineNr">268 </span>== <span class="Constant">0x1</span>
-<span id="L269" class="LineNr">269 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
-<span id="L271" class="LineNr">271 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L272" class="LineNr">272 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L273" class="LineNr">273 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L275" class="LineNr">275 </span>
-<span id="L276" class="LineNr">276 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L209" class="LineNr">209 </span><span class="SalientComment">//:: xor</span>
+<span id="L210" class="LineNr">210 </span>
+<span id="L211" class="LineNr">211 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L212" class="LineNr">212 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;31&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;rm32 = bitwise XOR of r32 with rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L213" class="LineNr">213 </span>
+<span id="L214" class="LineNr">214 </span><span class="Delimiter">:(scenario xor_r32_with_r32)</span>
+<span id="L215" class="LineNr">215 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L216" class="LineNr">216 </span><span class="Special">% Reg[EBX].i = 0xaabbc0d0;</span>
+<span id="L217" class="LineNr">217 </span>== <span class="Constant">0x1</span>
+<span id="L218" class="LineNr">218 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Constant">31</span>  d8                                      <span class="Comment"># xor EBX with destination EAX</span>
+<span id="L220" class="LineNr">220 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: xor <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L222" class="LineNr">222 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L223" class="LineNr">223 </span><span class="traceContains">+run: storing 0xa0b0ccdd</span>
+<span id="L224" class="LineNr">224 </span>
+<span id="L225" class="LineNr">225 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L226" class="LineNr">226 </span><span class="Normal">case</span> <span class="Constant">0x31</span>: <span class="Delimiter">{</span>  <span class="Comment">// xor r32 with r/m32</span>
+<span id="L227" class="LineNr">227 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L228" class="LineNr">228 </span>  <span class="Normal">uint8_t</span> arg2 = <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 id="L229" class="LineNr">229 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>arg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L230" class="LineNr">230 </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="L231" class="LineNr">231 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> Reg[arg2]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L232" class="LineNr">232 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L233" class="LineNr">233 </span><span class="Delimiter">}</span>
+<span id="L234" class="LineNr">234 </span>
+<span id="L235" class="LineNr">235 </span><span class="SalientComment">//:: not</span>
+<span id="L236" class="LineNr">236 </span>
+<span id="L237" class="LineNr">237 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L238" class="LineNr">238 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;bitwise complement of rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(scenario not_r32)</span>
+<span id="L241" class="LineNr">241 </span><span class="Special">% Reg[EBX].i = 0x0f0f00ff;</span>
+<span id="L242" class="LineNr">242 </span>== <span class="Constant">0x1</span>
+<span id="L243" class="LineNr">243 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L244" class="LineNr">244 </span>  f7  d3                                      <span class="Comment"># not EBX</span>
+<span id="L245" class="LineNr">245 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 010 (subop not) 011 (dest EBX)</span>
+<span id="L246" class="LineNr">246 </span><span class="traceContains">+run: operate on r/m32</span>
+<span id="L247" class="LineNr">247 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L248" class="LineNr">248 </span><span class="traceContains">+run: subop: not</span>
+<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
+<span id="L250" class="LineNr">250 </span>
+<span id="L251" class="LineNr">251 </span><span class="Delimiter">:(before &quot;End Op f7 Subops&quot;)</span>
+<span id="L252" class="LineNr">252 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// not r/m32</span>
+<span id="L253" class="LineNr">253 </span>  <a href='003trace.cc.html#L196'>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;subop: not&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L254" class="LineNr">254 </span>  *arg1 = ~<span class="Delimiter">(</span>*arg1<span class="Delimiter">);</span>
+<span id="L255" class="LineNr">255 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L256" class="LineNr">256 </span>  SF = <span class="Delimiter">(</span>*arg1 &gt;&gt; <span class="Constant">31</span><span class="Delimiter">);</span>
+<span id="L257" class="LineNr">257 </span>  ZF = <span class="Delimiter">(</span>*arg1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L258" class="LineNr">258 </span>  <a href='010---vm.cc.html#L59'>OF</a> =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L259" class="LineNr">259 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L260" class="LineNr">260 </span><span class="Delimiter">}</span>
+<span id="L261" class="LineNr">261 </span>
+<span id="L262" class="LineNr">262 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L263" class="LineNr">263 </span>
+<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L265" class="LineNr">265 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;39&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &lt; r32&quot;</span><span class="Delimiter">);</span>
+<span id="L266" class="LineNr">266 </span>
+<span id="L267" class="LineNr">267 </span><span class="Delimiter">:(scenario compare_r32_with_r32_greater)</span>
+<span id="L268" class="LineNr">268 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L269" class="LineNr">269 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
+<span id="L270" class="LineNr">270 </span>== <span class="Constant">0x1</span>
+<span id="L271" class="LineNr">271 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L272" class="LineNr">272 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L273" class="LineNr">273 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L274" class="LineNr">274 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L275" class="LineNr">275 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L276" class="LineNr">276 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L277" class="LineNr">277 </span>
-<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L279" class="LineNr">279 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L280" class="LineNr">280 </span>
-<span id="L281" class="LineNr">281 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
-<span id="L282" class="LineNr">282 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L283" class="LineNr">283 </span>== <span class="Constant">0x1</span>
-<span id="L284" class="LineNr">284 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
-<span id="L286" class="LineNr">286 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L287" class="LineNr">287 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L288" class="LineNr">288 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L289" class="LineNr">289 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L290" class="LineNr">290 </span>
-<span id="L291" class="LineNr">291 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L292" class="LineNr">292 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L294" class="LineNr">294 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L296" class="LineNr">296 </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="L297" class="LineNr">297 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L298" class="LineNr">298 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L299" class="LineNr">299 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span><span class="Delimiter">}</span>
-<span id="L301" class="LineNr">301 </span>
-<span id="L302" class="LineNr">302 </span><span class="SalientComment">//:: xchg</span>
-<span id="L303" class="LineNr">303 </span>
-<span id="L304" class="LineNr">304 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L305" class="LineNr">305 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L306" class="LineNr">306 </span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
-<span id="L308" class="LineNr">308 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L309" class="LineNr">309 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
-<span id="L310" class="LineNr">310 </span>== <span class="Constant">0x1</span>
-<span id="L311" class="LineNr">311 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L312" class="LineNr">312 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
-<span id="L313" class="LineNr">313 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
-<span id="L317" class="LineNr">317 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L318" class="LineNr">318 </span>
-<span id="L319" class="LineNr">319 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L320" class="LineNr">320 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
-<span id="L321" class="LineNr">321 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L322" class="LineNr">322 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L323" class="LineNr">323 </span>  <a href='003trace.cc.html#L196'>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;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L324" class="LineNr">324 </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="L325" class="LineNr">325 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
-<span id="L326" class="LineNr">326 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L327" class="LineNr">327 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
-<span id="L328" class="LineNr">328 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span><span class="Delimiter">}</span>
-<span id="L332" class="LineNr">332 </span>
-<span id="L333" class="LineNr">333 </span><span class="SalientComment">//:: push</span>
-<span id="L334" class="LineNr">334 </span>
-<span id="L335" class="LineNr">335 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L336" class="LineNr">336 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R0 (EAX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L337" class="LineNr">337 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R1 (ECX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L338" class="LineNr">338 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R2 (EDX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L339" class="LineNr">339 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R3 (EBX) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L340" class="LineNr">340 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R4 (ESP) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L341" class="LineNr">341 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R5 (EBP) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L342" class="LineNr">342 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R6 (ESI) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L343" class="LineNr">343 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R7 (EDI) to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L344" class="LineNr">344 </span>
-<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario push_r32)</span>
-<span id="L346" class="LineNr">346 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
-<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
-<span id="L348" class="LineNr">348 </span>== <span class="Constant">0x1</span>
-<span id="L349" class="LineNr">349 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
-<span id="L351" class="LineNr">351 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
-<span id="L354" class="LineNr">354 </span>
-<span id="L355" class="LineNr">355 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L356" class="LineNr">356 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
-<span id="L357" class="LineNr">357 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
-<span id="L358" class="LineNr">358 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
-<span id="L359" class="LineNr">359 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
-<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
-<span id="L361" class="LineNr">361 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
-<span id="L362" class="LineNr">362 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
-<span id="L363" class="LineNr">363 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r32 to stack</span>
-<span id="L364" class="LineNr">364 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L365" class="LineNr">365 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L366" class="LineNr">366 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L367" class="LineNr">367 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L368" class="LineNr">368 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L369" class="LineNr">369 </span><span class="Delimiter">}</span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span><span class="SalientComment">//:: pop</span>
+<span id="L278" class="LineNr">278 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L279" class="LineNr">279 </span><span class="Normal">case</span> <span class="Constant">0x39</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r/m32 &lt; r32</span>
+<span id="L280" class="LineNr">280 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L281" class="LineNr">281 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L282" class="LineNr">282 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L283" class="LineNr">283 </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="L284" class="LineNr">284 </span>  <span class="Normal">int32_t</span> arg2 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L287" class="LineNr">287 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L288" class="LineNr">288 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L289" class="LineNr">289 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L290" class="LineNr">290 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L291" class="LineNr">291 </span>  <span class="Identifier">break</span><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="Delimiter">:(scenario compare_r32_with_r32_lesser)</span>
+<span id="L295" class="LineNr">295 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c07;</span>
+<span id="L296" class="LineNr">296 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L297" class="LineNr">297 </span>== <span class="Constant">0x1</span>
+<span id="L298" class="LineNr">298 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L300" class="LineNr">300 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L301" class="LineNr">301 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L302" class="LineNr">302 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L303" class="LineNr">303 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L304" class="LineNr">304 </span>
+<span id="L305" class="LineNr">305 </span><span class="Delimiter">:(scenario compare_r32_with_r32_equal)</span>
+<span id="L306" class="LineNr">306 </span><span class="Special">% Reg[EAX].i = 0x0a0b0c0d;</span>
+<span id="L307" class="LineNr">307 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L308" class="LineNr">308 </span>== <span class="Constant">0x1</span>
+<span id="L309" class="LineNr">309 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L310" class="LineNr">310 </span>  <span class="Constant">39</span>  d8                                      <span class="Comment"># compare EBX with EAX</span>
+<span id="L311" class="LineNr">311 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L314" class="LineNr">314 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L315" class="LineNr">315 </span>
+<span id="L316" class="LineNr">316 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L317" class="LineNr">317 </span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L319" class="LineNr">319 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;89&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r32 to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L320" class="LineNr">320 </span>
+<span id="L321" class="LineNr">321 </span><span class="Delimiter">:(scenario copy_r32_to_r32)</span>
+<span id="L322" class="LineNr">322 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L323" class="LineNr">323 </span>== <span class="Constant">0x1</span>
+<span id="L324" class="LineNr">324 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L325" class="LineNr">325 </span>  <span class="Constant">89</span>  d8                                      <span class="Comment"># copy EBX to EAX</span>
+<span id="L326" class="LineNr">326 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L329" class="LineNr">329 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L330" class="LineNr">330 </span>
+<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L332" class="LineNr">332 </span><span class="Normal">case</span> <span class="Constant">0x89</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L336" class="LineNr">336 </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="L337" class="LineNr">337 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L338" class="LineNr">338 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L340" class="LineNr">340 </span><span class="Delimiter">}</span>
+<span id="L341" class="LineNr">341 </span>
+<span id="L342" class="LineNr">342 </span><span class="SalientComment">//:: xchg</span>
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L345" class="LineNr">345 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;87&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;swap the <a href='003trace.cc.html#L74'>contents</a> of r32 and rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L346" class="LineNr">346 </span>
+<span id="L347" class="LineNr">347 </span><span class="Delimiter">:(scenario xchg_r32_with_r32)</span>
+<span id="L348" class="LineNr">348 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L349" class="LineNr">349 </span><span class="Special">% Reg[EAX].i = 0x2e;</span>
+<span id="L350" class="LineNr">350 </span>== <span class="Constant">0x1</span>
+<span id="L351" class="LineNr">351 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L352" class="LineNr">352 </span>  <span class="Constant">87</span>  d8                                      <span class="Comment"># exchange EBX with EAX</span>
+<span id="L353" class="LineNr">353 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: exchange <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L356" class="LineNr">356 </span><span class="traceContains">+run: storing 0x000000af in r/m32</span>
+<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: storing 0x0000002e in <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L358" class="LineNr">358 </span>
+<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L360" class="LineNr">360 </span><span class="Normal">case</span> <span class="Constant">0x87</span>: <span class="Delimiter">{</span>  <span class="Comment">// exchange r32 with r/m32</span>
+<span id="L361" class="LineNr">361 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L362" class="LineNr">362 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L363" class="LineNr">363 </span>  <a href='003trace.cc.html#L196'>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;exchange &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr">364 </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="L365" class="LineNr">365 </span>  <span class="Normal">int32_t</span> tmp = *arg1<span class="Delimiter">;</span>
+<span id="L366" class="LineNr">366 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L367" class="LineNr">367 </span>  Reg[reg2]<span class="Delimiter">.</span>i = tmp<span class="Delimiter">;</span>
+<span id="L368" class="LineNr">368 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg1 &lt;&lt; <span class="Constant">&quot; in r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L369" class="LineNr">369 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[reg2]<span class="Delimiter">.</span>i &lt;&lt; <span class="Constant">&quot; in &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L370" class="LineNr">370 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L371" class="LineNr">371 </span><span class="Delimiter">}</span>
 <span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L374" class="LineNr">374 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L375" class="LineNr">375 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L376" class="LineNr">376 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L377" class="LineNr">377 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L378" class="LineNr">378 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L379" class="LineNr">379 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L380" class="LineNr">380 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
-<span id="L382" class="LineNr">382 </span>
-<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario pop_r32)</span>
-<span id="L384" class="LineNr">384 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
-<span id="L385" class="LineNr">385 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
-<span id="L386" class="LineNr">386 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L387" class="LineNr">387 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L388" class="LineNr">388 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
-<span id="L389" class="LineNr">389 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L390" class="LineNr">390 </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"># 0x0a</span>
-<span id="L391" class="LineNr">391 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L412'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: popping value 0x0000000a</span>
-<span id="L393" class="LineNr">393 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000064</span>
+<span id="L373" class="LineNr">373 </span><span class="SalientComment">//:: push</span>
+<span id="L374" class="LineNr">374 </span>
+<span id="L375" class="LineNr">375 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L376" class="LineNr">376 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;50&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R0 (EAX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L377" class="LineNr">377 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;51&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R1 (ECX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L378" class="LineNr">378 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;52&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R2 (EDX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L379" class="LineNr">379 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;53&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R3 (EBX) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;54&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R4 (ESP) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L381" class="LineNr">381 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;55&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R5 (EBP) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L382" class="LineNr">382 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;56&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R6 (ESI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L383" class="LineNr">383 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;57&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push R7 (EDI) to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L384" class="LineNr">384 </span>
+<span id="L385" class="LineNr">385 </span><span class="Delimiter">:(scenario push_r32)</span>
+<span id="L386" class="LineNr">386 </span><span class="Special">% Reg[ESP].u = 0x64;</span>
+<span id="L387" class="LineNr">387 </span><span class="Special">% Reg[EBX].i = 0x0000000a;</span>
+<span id="L388" class="LineNr">388 </span>== <span class="Constant">0x1</span>
+<span id="L389" class="LineNr">389 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Constant">53</span>                                          <span class="Comment"># push EBX to stack</span>
+<span id="L391" class="LineNr">391 </span><span class="traceContains">+run: <a href='012elf.cc.html#L84'>push</a> <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000060</span>
+<span id="L393" class="LineNr">393 </span><span class="traceContains">+run: pushing value 0x0000000a</span>
 <span id="L394" class="LineNr">394 </span>
 <span id="L395" class="LineNr">395 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L396" class="LineNr">396 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
-<span id="L397" class="LineNr">397 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
-<span id="L398" class="LineNr">398 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
-<span id="L399" class="LineNr">399 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
-<span id="L400" class="LineNr">400 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
-<span id="L401" class="LineNr">401 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
-<span id="L402" class="LineNr">402 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
-<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r32</span>
+<span id="L396" class="LineNr">396 </span><span class="Normal">case</span> <span class="Constant">0x50</span>:
+<span id="L397" class="LineNr">397 </span><span class="Normal">case</span> <span class="Constant">0x51</span>:
+<span id="L398" class="LineNr">398 </span><span class="Normal">case</span> <span class="Constant">0x52</span>:
+<span id="L399" class="LineNr">399 </span><span class="Normal">case</span> <span class="Constant">0x53</span>:
+<span id="L400" class="LineNr">400 </span><span class="Normal">case</span> <span class="Constant">0x54</span>:
+<span id="L401" class="LineNr">401 </span><span class="Normal">case</span> <span class="Constant">0x55</span>:
+<span id="L402" class="LineNr">402 </span><span class="Normal">case</span> <span class="Constant">0x56</span>:
+<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x57</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r32 to stack</span>
 <span id="L404" class="LineNr">404 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L196'>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;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
-<span id="L407" class="LineNr">407 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">();</span>
-<span id="L408" class="LineNr">408 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
-<span id="L409" class="LineNr">409 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L410" class="LineNr">410 </span><span class="Delimiter">}</span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">:(code)</span>
-<span id="L412" class="LineNr">412 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
-<span id="L413" class="LineNr">413 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
-<span id="L414" class="LineNr">414 </span>  <a href='003trace.cc.html#L196'>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;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L415" class="LineNr">415 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
-<span id="L416" class="LineNr">416 </span>  <a href='003trace.cc.html#L196'>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;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L417" class="LineNr">417 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">}</span>
+<span id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L196'>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 &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L406" class="LineNr">406 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;push: &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; &quot; =&gt; &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L407" class="LineNr">407 </span>  <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span>Reg[reg]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L409" class="LineNr">409 </span><span class="Delimiter">}</span>
+<span id="L410" class="LineNr">410 </span>
+<span id="L411" class="LineNr">411 </span><span class="SalientComment">//:: pop</span>
+<span id="L412" class="LineNr">412 </span>
+<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L414" class="LineNr">414 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;58&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L415" class="LineNr">415 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;59&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L418" class="LineNr">418 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5c&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L420" class="LineNr">420 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5e&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L421" class="LineNr">421 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;5f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L422" class="LineNr">422 </span>
+<span id="L423" class="LineNr">423 </span><span class="Delimiter">:(scenario pop_r32)</span>
+<span id="L424" class="LineNr">424 </span><span class="Special">% Reg[ESP].u = 0x60;</span>
+<span id="L425" class="LineNr">425 </span><span class="Special">% write_mem_i32(0x60, 0x0000000a);</span>
+<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L428" class="LineNr">428 </span>  5b                                          <span class="Comment"># pop stack to EBX</span>
+<span id="L429" class="LineNr">429 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L430" class="LineNr">430 </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"># 0x0a</span>
+<span id="L431" class="LineNr">431 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L452'>pop</a> into <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L432" class="LineNr">432 </span><span class="traceContains">+run: popping value 0x0000000a</span>
+<span id="L433" class="LineNr">433 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000064</span>
+<span id="L434" class="LineNr">434 </span>
+<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L436" class="LineNr">436 </span><span class="Normal">case</span> <span class="Constant">0x58</span>:
+<span id="L437" class="LineNr">437 </span><span class="Normal">case</span> <span class="Constant">0x59</span>:
+<span id="L438" class="LineNr">438 </span><span class="Normal">case</span> <span class="Constant">0x5a</span>:
+<span id="L439" class="LineNr">439 </span><span class="Normal">case</span> <span class="Constant">0x5b</span>:
+<span id="L440" class="LineNr">440 </span><span class="Normal">case</span> <span class="Constant">0x5c</span>:
+<span id="L441" class="LineNr">441 </span><span class="Normal">case</span> <span class="Constant">0x5d</span>:
+<span id="L442" class="LineNr">442 </span><span class="Normal">case</span> <span class="Constant">0x5e</span>:
+<span id="L443" class="LineNr">443 </span><span class="Normal">case</span> <span class="Constant">0x5f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r32</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Normal">uint8_t</span> <a href='010---vm.cc.html#L23'>reg</a> = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L445" class="LineNr">445 </span>  <a href='003trace.cc.html#L196'>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;pop into &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L23'>reg</a><span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L446" class="LineNr">446 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;pop from &quot; &lt;&lt; Reg[ESP].u &lt;&lt; '\n';</span>
+<span id="L447" class="LineNr">447 </span>  Reg[reg]<span class="Delimiter">.</span>u = <a href='013direct_addressing.cc.html#L452'>pop</a><span class="Delimiter">();</span>
+<span id="L448" class="LineNr">448 </span><span class="CommentedCode">//?   cerr &lt;&lt; &quot;=&gt; &quot; &lt;&lt; NUM(reg) &lt;&lt; &quot;: &quot; &lt;&lt; Reg[reg].u &lt;&lt; '\n';</span>
+<span id="L449" class="LineNr">449 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">}</span>
+<span id="L451" class="LineNr">451 </span><span class="Delimiter">:(code)</span>
+<span id="L452" class="LineNr">452 </span><span class="Normal">uint32_t</span> <a href='013direct_addressing.cc.html#L452'>pop</a><span class="Delimiter">()</span> <span class="Delimiter">{</span>
+<span id="L453" class="LineNr">453 </span>  <span class="Normal">uint32_t</span> result = <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">);</span>
+<span id="L454" class="LineNr">454 </span>  <a href='003trace.cc.html#L196'>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;popping value 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; result &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L455" class="LineNr">455 </span>  Reg[ESP]<span class="Delimiter">.</span>u += <span class="Constant">4</span><span class="Delimiter">;</span>
+<span id="L456" class="LineNr">456 </span>  <a href='003trace.cc.html#L196'>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;incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L457" class="LineNr">457 </span>  <span class="Identifier">return</span> result<span class="Delimiter">;</span>
+<span id="L458" class="LineNr">458 </span><span class="Delimiter">}</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/014indirect_addressing.cc.html b/html/subx/014indirect_addressing.cc.html
index 79362ee9..3f08e713 100644
--- a/html/subx/014indirect_addressing.cc.html
+++ b/html/subx/014indirect_addressing.cc.html
@@ -291,425 +291,426 @@ if ('onhashchange' in window) {
 <span id="L227" class="LineNr">227 </span>
 <span id="L228" class="LineNr">228 </span><span class="SalientComment">//:: not</span>
 <span id="L229" class="LineNr">229 </span>
-<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(scenario not_r32_with_mem_at_r32)</span>
+<span id="L230" class="LineNr">230 </span><span class="Delimiter">:(scenario not_of_mem_at_r32)</span>
 <span id="L231" class="LineNr">231 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
 <span id="L232" class="LineNr">232 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
 <span id="L233" class="LineNr">233 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L234" class="LineNr">234 </span>  f7  <span class="PreProc">0</span><span class="Constant">3</span>                                      <span class="Comment"># negate *EBX</span>
-<span id="L235" class="LineNr">235 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
+<span id="L234" class="LineNr">234 </span>  f7  <span class="Constant">13</span>                                      <span class="Comment"># negate *EBX</span>
+<span id="L235" class="LineNr">235 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 010 (subop not) 011 (dest EBX)</span>
 <span id="L236" class="LineNr">236 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
 <span id="L237" class="LineNr">237 </span>ff <span class="PreProc">0</span><span class="Constant">0</span> <span class="Constant">0f</span> <span class="Constant">0f</span>  <span class="Comment"># 0x0f0f00ff</span>
-<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: 'not' of r/m32</span>
+<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: operate on r/m32</span>
 <span id="L239" class="LineNr">239 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L240" class="LineNr">240 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
-<span id="L241" class="LineNr">241 </span>
-<span id="L242" class="LineNr">242 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L243" class="LineNr">243 </span>
-<span id="L244" class="LineNr">244 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_greater)</span>
-<span id="L245" class="LineNr">245 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L246" class="LineNr">246 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L247" class="LineNr">247 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L248" class="LineNr">248 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L249" class="LineNr">249 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L250" class="LineNr">250 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L251" class="LineNr">251 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L252" class="LineNr">252 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L253" class="LineNr">253 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L254" class="LineNr">254 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L255" class="LineNr">255 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L256" class="LineNr">256 </span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_lesser)</span>
-<span id="L258" class="LineNr">258 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L259" class="LineNr">259 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L260" class="LineNr">260 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L261" class="LineNr">261 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L263" class="LineNr">263 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L264" class="LineNr">264 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L265" class="LineNr">265 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L266" class="LineNr">266 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L268" class="LineNr">268 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L269" class="LineNr">269 </span>
-<span id="L270" class="LineNr">270 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_equal)</span>
-<span id="L271" class="LineNr">271 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L272" class="LineNr">272 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L273" class="LineNr">273 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L274" class="LineNr">274 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L275" class="LineNr">275 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
-<span id="L276" class="LineNr">276 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L277" class="LineNr">277 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L278" class="LineNr">278 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L279" class="LineNr">279 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
-<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L281" class="LineNr">281 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L282" class="LineNr">282 </span>
-<span id="L283" class="LineNr">283 </span><span class="Comment">//:</span>
-<span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &gt; r32&quot;</span><span class="Delimiter">);</span>
-<span id="L287" class="LineNr">287 </span>
-<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span>
-<span id="L289" class="LineNr">289 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L290" class="LineNr">290 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L291" class="LineNr">291 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L292" class="LineNr">292 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L293" class="LineNr">293 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L294" class="LineNr">294 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L295" class="LineNr">295 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L296" class="LineNr">296 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L297" class="LineNr">297 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L300" class="LineNr">300 </span>
-<span id="L301" class="LineNr">301 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L302" class="LineNr">302 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r32 &lt; r/m32</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Normal">uint8_t</span> reg1 = <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 id="L305" class="LineNr">305 </span>  <a href='003trace.cc.html#L196'>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 r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L306" class="LineNr">306 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L307" class="LineNr">307 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L308" class="LineNr">308 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L309" class="LineNr">309 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L310" class="LineNr">310 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L311" class="LineNr">311 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
-<span id="L312" class="LineNr">312 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L313" class="LineNr">313 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L314" class="LineNr">314 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L315" class="LineNr">315 </span><span class="Delimiter">}</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_lesser)</span>
-<span id="L318" class="LineNr">318 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
-<span id="L320" class="LineNr">320 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L321" class="LineNr">321 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L322" class="LineNr">322 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L323" class="LineNr">323 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L324" class="LineNr">324 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L325" class="LineNr">325 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L326" class="LineNr">326 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L329" class="LineNr">329 </span>
-<span id="L330" class="LineNr">330 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_equal)</span>
-<span id="L331" class="LineNr">331 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L332" class="LineNr">332 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
-<span id="L333" class="LineNr">333 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L334" class="LineNr">334 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L335" class="LineNr">335 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
-<span id="L336" class="LineNr">336 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L337" class="LineNr">337 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L338" class="LineNr">338 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
-<span id="L339" class="LineNr">339 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L341" class="LineNr">341 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L342" class="LineNr">342 </span>
-<span id="L343" class="LineNr">343 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L344" class="LineNr">344 </span>
-<span id="L345" class="LineNr">345 </span><span class="Delimiter">:(scenario copy_r32_to_mem_at_r32)</span>
-<span id="L346" class="LineNr">346 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L348" class="LineNr">348 </span>== <span class="Constant">0x1</span>
-<span id="L349" class="LineNr">349 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L350" class="LineNr">350 </span>  <span class="Constant">89</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy EBX to *EAX</span>
-<span id="L351" class="LineNr">351 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
-<span id="L352" class="LineNr">352 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L355" class="LineNr">355 </span>
-<span id="L356" class="LineNr">356 </span><span class="Comment">//:</span>
-<span id="L357" class="LineNr">357 </span>
-<span id="L358" class="LineNr">358 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L359" class="LineNr">359 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32&quot;</span><span class="Delimiter">);</span>
-<span id="L360" class="LineNr">360 </span>
-<span id="L361" class="LineNr">361 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span>
-<span id="L362" class="LineNr">362 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L363" class="LineNr">363 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L364" class="LineNr">364 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L365" class="LineNr">365 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX to EBX</span>
-<span id="L366" class="LineNr">366 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L367" class="LineNr">367 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L368" class="LineNr">368 </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"># 0xaf</span>
-<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: copy r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: storing 0x000000af</span>
-<span id="L372" class="LineNr">372 </span>
-<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L374" class="LineNr">374 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L376" class="LineNr">376 </span>  <span class="Normal">uint8_t</span> reg1 = <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 id="L377" class="LineNr">377 </span>  <a href='003trace.cc.html#L196'>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 r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L378" class="LineNr">378 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L379" class="LineNr">379 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
-<span id="L380" class="LineNr">380 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L381" class="LineNr">381 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L382" class="LineNr">382 </span><span class="Delimiter">}</span>
-<span id="L383" class="LineNr">383 </span>
-<span id="L384" class="LineNr">384 </span><span class="Comment">//:</span>
-<span id="L385" class="LineNr">385 </span>
-<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L387" class="LineNr">387 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 (lowermost byte of r32) to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
-<span id="L388" class="LineNr">388 </span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span>
-<span id="L390" class="LineNr">390 </span><span class="Special">% Reg[EBX].i = 0xafafafaf;</span>
-<span id="L391" class="LineNr">391 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L392" class="LineNr">392 </span>== <span class="Constant">0x1</span>
-<span id="L393" class="LineNr">393 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L394" class="LineNr">394 </span>  <span class="Constant">88</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy just the lowermost byte of EBX to the byte at *EAX</span>
-<span id="L395" class="LineNr">395 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L396" class="LineNr">396 </span><span class="traceContains">+run: copy lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a> to r8/m8-at-r32</span>
-<span id="L397" class="LineNr">397 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: storing 0xaf</span>
-<span id="L399" class="LineNr">399 </span><span class="Special">% CHECK_EQ(0x000000af, read_mem_u32(0x60));</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L402" class="LineNr">402 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
-<span id="L403" class="LineNr">403 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L404" class="LineNr">404 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L405" class="LineNr">405 </span>  <a href='003trace.cc.html#L196'>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 lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L406" class="LineNr">406 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L407" class="LineNr">407 </span>  <span class="Normal">uint8_t</span>* arg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L408" class="LineNr">408 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L409" class="LineNr">409 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L410" class="LineNr">410 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L411" class="LineNr">411 </span><span class="Delimiter">}</span>
-<span id="L412" class="LineNr">412 </span>
-<span id="L413" class="LineNr">413 </span><span class="Comment">//:</span>
-<span id="L414" class="LineNr">414 </span>
-<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8 (lowermost byte of r32)&quot;</span><span class="Delimiter">);</span>
-<span id="L417" class="LineNr">417 </span>
-<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span>
-<span id="L419" class="LineNr">419 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
-<span id="L420" class="LineNr">420 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L421" class="LineNr">421 </span>== <span class="Constant">0x1</span>
-<span id="L422" class="LineNr">422 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L423" class="LineNr">423 </span>  8a  <span class="Constant">18</span>                                      <span class="Comment"># copy just the byte at *EAX to lowermost byte of EBX (clearing remaining bytes)</span>
-<span id="L424" class="LineNr">424 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
-<span id="L425" class="LineNr">425 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L426" class="LineNr">426 </span>af ff ff ff  <span class="Comment"># 0xaf with more data in following bytes</span>
-<span id="L427" class="LineNr">427 </span><span class="traceContains">+run: copy r8/m8-at-r32 to lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: storing 0xaf</span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L432" class="LineNr">432 </span><span class="Normal">case</span> <span class="Constant">0x8a</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
-<span id="L433" class="LineNr">433 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L434" class="LineNr">434 </span>  <span class="Normal">uint8_t</span> reg1 = <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 id="L435" class="LineNr">435 </span>  <a href='003trace.cc.html#L196'>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 r8/m8-at-r32 to lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L436" class="LineNr">436 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
-<span id="L437" class="LineNr">437 </span>  <span class="Normal">uint8_t</span>* arg2 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
-<span id="L438" class="LineNr">438 </span>  Reg[reg1]<span class="Delimiter">.</span>u = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg2<span class="Delimiter">);</span>
-<span id="L439" class="LineNr">439 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L440" class="LineNr">440 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L441" class="LineNr">441 </span><span class="Delimiter">}</span>
-<span id="L442" class="LineNr">442 </span>
-<span id="L443" class="LineNr">443 </span><span class="SalientComment">//:: jump</span>
-<span id="L444" class="LineNr">444 </span>
-<span id="L445" class="LineNr">445 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L446" class="LineNr">446 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
-<span id="L447" class="LineNr">447 </span>
-<span id="L448" class="LineNr">448 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
-<span id="L449" class="LineNr">449 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L450" class="LineNr">450 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L451" class="LineNr">451 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L452" class="LineNr">452 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
-<span id="L453" class="LineNr">453 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
-<span id="L454" class="LineNr">454 </span>  <span class="PreProc">0</span><span class="Constant">5</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">1</span>
-<span id="L455" class="LineNr">455 </span>  <span class="PreProc">0</span><span class="Constant">5</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">2</span>
-<span id="L456" class="LineNr">456 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L457" class="LineNr">457 </span><span class="Error">08</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"># 8</span>
-<span id="L458" class="LineNr">458 </span><span class="traceContains">+run: inst: 0x00000001</span>
-<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: jump to r/m32</span>
-<span id="L460" class="LineNr">460 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L461" class="LineNr">461 </span><span class="traceContains">+run: jumping to 0x00000008</span>
-<span id="L462" class="LineNr">462 </span><span class="traceContains">+run: inst: 0x00000008</span>
-<span id="L463" class="LineNr">463 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
-<span id="L464" class="LineNr">464 </span>
-<span id="L465" class="LineNr">465 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L466" class="LineNr">466 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
-<span id="L467" class="LineNr">467 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L468" class="LineNr">468 </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="L469" class="LineNr">469 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L470" class="LineNr">470 </span>    <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
-<span id="L471" class="LineNr">471 </span>      <a href='003trace.cc.html#L196'>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;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L472" class="LineNr">472 </span>      <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L473" class="LineNr">473 </span>      <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
-<span id="L474" class="LineNr">474 </span>      <a href='003trace.cc.html#L196'>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;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L475" class="LineNr">475 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L476" class="LineNr">476 </span>    <span class="Delimiter">}</span>
-<span id="L477" class="LineNr">477 </span>    <span class="Comment">// End Op ff Subops</span>
-<span id="L478" class="LineNr">478 </span>  <span class="Delimiter">}</span>
-<span id="L479" class="LineNr">479 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L480" class="LineNr">480 </span><span class="Delimiter">}</span>
-<span id="L481" class="LineNr">481 </span>
-<span id="L482" class="LineNr">482 </span><span class="SalientComment">//:: push</span>
-<span id="L483" class="LineNr">483 </span>
-<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
-<span id="L485" class="LineNr">485 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L486" class="LineNr">486 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L487" class="LineNr">487 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L488" class="LineNr">488 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L489" class="LineNr">489 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
-<span id="L490" class="LineNr">490 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
-<span id="L491" class="LineNr">491 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L492" class="LineNr">492 </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"># 0xaf</span>
-<span id="L493" class="LineNr">493 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> r/m32</span>
-<span id="L494" class="LineNr">494 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L495" class="LineNr">495 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span>
-<span id="L496" class="LineNr">496 </span><span class="traceContains">+run: pushing value 0x000000af</span>
-<span id="L497" class="LineNr">497 </span>
-<span id="L498" class="LineNr">498 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
-<span id="L499" class="LineNr">499 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r/m32 to stack</span>
-<span id="L500" class="LineNr">500 </span>  <a href='003trace.cc.html#L196'>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 r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L501" class="LineNr">501 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L502" class="LineNr">502 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
-<span id="L503" class="LineNr">503 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L504" class="LineNr">504 </span><span class="Delimiter">}</span>
-<span id="L505" class="LineNr">505 </span>
-<span id="L506" class="LineNr">506 </span><span class="SalientComment">//:: pop</span>
-<span id="L507" class="LineNr">507 </span>
-<span id="L508" class="LineNr">508 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L509" class="LineNr">509 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L510" class="LineNr">510 </span>
-<span id="L511" class="LineNr">511 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
-<span id="L512" class="LineNr">512 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
-<span id="L513" class="LineNr">513 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
-<span id="L514" class="LineNr">514 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L515" class="LineNr">515 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L516" class="LineNr">516 </span>  <span class="Constant">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX</span>
-<span id="L517" class="LineNr">517 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
-<span id="L518" class="LineNr">518 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
-<span id="L519" class="LineNr">519 </span><span class="Constant">30</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"># 0x30</span>
-<span id="L520" class="LineNr">520 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L412'>pop</a> into r/m32</span>
-<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
-<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: popping value 0x00000030</span>
-<span id="L523" class="LineNr">523 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000014</span>
-<span id="L524" class="LineNr">524 </span>
-<span id="L525" class="LineNr">525 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L526" class="LineNr">526 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
-<span id="L527" class="LineNr">527 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L528" class="LineNr">528 </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 id="L529" class="LineNr">529 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L530" class="LineNr">530 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
-<span id="L531" class="LineNr">531 </span>      <a href='003trace.cc.html#L196'>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;pop into r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L532" class="LineNr">532 </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="L533" class="LineNr">533 </span>      *dest = <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">();</span>
-<span id="L534" class="LineNr">534 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L535" class="LineNr">535 </span>    <span class="Delimiter">}</span>
-<span id="L536" class="LineNr">536 </span>  <span class="Delimiter">}</span>
-<span id="L537" class="LineNr">537 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L538" class="LineNr">538 </span><span class="Delimiter">}</span>
-<span id="L539" class="LineNr">539 </span>
-<span id="L540" class="LineNr">540 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
-<span id="L541" class="LineNr">541 </span>
-<span id="L542" class="LineNr">542 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
-<span id="L543" class="LineNr">543 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L544" class="LineNr">544 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L545" class="LineNr">545 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L546" class="LineNr">546 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1d            <span class="Constant">60</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"># add EBX to *0x60</span>
-<span id="L547" class="LineNr">547 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
-<span id="L548" class="LineNr">548 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L549" class="LineNr">549 </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="L550" class="LineNr">550 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L551" class="LineNr">551 </span><span class="traceContains">+run: effective address is 0x60 (disp32)</span>
-<span id="L552" class="LineNr">552 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L553" class="LineNr">553 </span>
-<span id="L554" class="LineNr">554 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
-<span id="L555" class="LineNr">555 </span><span class="Normal">case</span> <span class="Constant">5</span>:  <span class="Comment">// exception: mod 0b00 rm 0b101 =&gt; incoming disp32</span>
-<span id="L556" class="LineNr">556 </span>  addr = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L557" class="LineNr">557 </span>  <a href='003trace.cc.html#L196'>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;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L558" class="LineNr">558 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L559" class="LineNr">559 </span>
-<span id="L560" class="LineNr">560 </span><span class="Comment">//:</span>
-<span id="L561" class="LineNr">561 </span>
-<span id="L562" class="LineNr">562 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
-<span id="L563" class="LineNr">563 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L564" class="LineNr">564 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
-<span id="L565" class="LineNr">565 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L566" class="LineNr">566 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L567" class="LineNr">567 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+2)</span>
-<span id="L568" class="LineNr">568 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L569" class="LineNr">569 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L570" class="LineNr">570 </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="L571" class="LineNr">571 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L572" class="LineNr">572 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L573" class="LineNr">573 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L574" class="LineNr">574 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L575" class="LineNr">575 </span>
-<span id="L576" class="LineNr">576 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L577" class="LineNr">577 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
-<span id="L578" class="LineNr">578 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L579" class="LineNr">579 </span>  <span class="Normal">default</span>:
-<span id="L580" class="LineNr">580 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L581" class="LineNr">581 </span>    <a href='003trace.cc.html#L196'>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;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L582" class="LineNr">582 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L583" class="LineNr">583 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
-<span id="L584" class="LineNr">584 </span>  <span class="Delimiter">}</span>
-<span id="L585" class="LineNr">585 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L586" class="LineNr">586 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">());</span>
-<span id="L587" class="LineNr">587 </span>    <a href='003trace.cc.html#L196'>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;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L588" class="LineNr">588 </span>  <span class="Delimiter">}</span>
-<span id="L589" class="LineNr">589 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L590" class="LineNr">590 </span>
-<span id="L591" class="LineNr">591 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp8)</span>
-<span id="L592" class="LineNr">592 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L593" class="LineNr">593 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
-<span id="L594" class="LineNr">594 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L595" class="LineNr">595 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L596" class="LineNr">596 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            ff                       <span class="Comment"># add EBX to *(EAX-1)</span>
-<span id="L597" class="LineNr">597 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L598" class="LineNr">598 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L599" class="LineNr">599 </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="L600" class="LineNr">600 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L601" class="LineNr">601 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
-<span id="L602" class="LineNr">602 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
-<span id="L603" class="LineNr">603 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L604" class="LineNr">604 </span>
-<span id="L605" class="LineNr">605 </span><span class="Comment">//:</span>
-<span id="L606" class="LineNr">606 </span>
-<span id="L607" class="LineNr">607 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
-<span id="L608" class="LineNr">608 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L609" class="LineNr">609 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
-<span id="L610" class="LineNr">610 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L611" class="LineNr">611 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L612" class="LineNr">612 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            <span class="PreProc">0</span><span class="Constant">2</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"># add EBX to *(EAX+2)</span>
-<span id="L613" class="LineNr">613 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L614" class="LineNr">614 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L615" class="LineNr">615 </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="L616" class="LineNr">616 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L617" class="LineNr">617 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
-<span id="L618" class="LineNr">618 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L619" class="LineNr">619 </span><span class="traceContains">+run: storing 0x00000011</span>
-<span id="L620" class="LineNr">620 </span>
-<span id="L621" class="LineNr">621 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
-<span id="L622" class="LineNr">622 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
-<span id="L623" class="LineNr">623 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L624" class="LineNr">624 </span>  <span class="Normal">default</span>:
-<span id="L625" class="LineNr">625 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
-<span id="L626" class="LineNr">626 </span>    <a href='003trace.cc.html#L196'>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;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L627" class="LineNr">627 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L628" class="LineNr">628 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
-<span id="L629" class="LineNr">629 </span>  <span class="Delimiter">}</span>
-<span id="L630" class="LineNr">630 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L631" class="LineNr">631 </span>    addr += <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L632" class="LineNr">632 </span>    <a href='003trace.cc.html#L196'>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;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L633" class="LineNr">633 </span>  <span class="Delimiter">}</span>
-<span id="L634" class="LineNr">634 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L635" class="LineNr">635 </span>
-<span id="L636" class="LineNr">636 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
-<span id="L637" class="LineNr">637 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
-<span id="L638" class="LineNr">638 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
-<span id="L639" class="LineNr">639 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
-<span id="L640" class="LineNr">640 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L641" class="LineNr">641 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            ff ff ff ff              <span class="Comment"># add EBX to *(EAX-1)</span>
-<span id="L642" class="LineNr">642 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
-<span id="L643" class="LineNr">643 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L644" class="LineNr">644 </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="L645" class="LineNr">645 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
-<span id="L646" class="LineNr">646 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
-<span id="L647" class="LineNr">647 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
-<span id="L648" class="LineNr">648 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L240" class="LineNr">240 </span><span class="traceContains">+run: subop: not</span>
+<span id="L241" class="LineNr">241 </span><span class="traceContains">+run: storing 0xf0f0ff00</span>
+<span id="L242" class="LineNr">242 </span>
+<span id="L243" class="LineNr">243 </span><span class="SalientComment">//:: compare (cmp)</span>
+<span id="L244" class="LineNr">244 </span>
+<span id="L245" class="LineNr">245 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_greater)</span>
+<span id="L246" class="LineNr">246 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L247" class="LineNr">247 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
+<span id="L248" class="LineNr">248 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L249" class="LineNr">249 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L250" class="LineNr">250 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
+<span id="L251" class="LineNr">251 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L252" class="LineNr">252 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L253" class="LineNr">253 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
+<span id="L254" class="LineNr">254 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L255" class="LineNr">255 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L256" class="LineNr">256 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L257" class="LineNr">257 </span>
+<span id="L258" class="LineNr">258 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_lesser)</span>
+<span id="L259" class="LineNr">259 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L260" class="LineNr">260 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L261" class="LineNr">261 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L262" class="LineNr">262 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L263" class="LineNr">263 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
+<span id="L264" class="LineNr">264 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L265" class="LineNr">265 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L266" class="LineNr">266 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
+<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L268" class="LineNr">268 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L270" class="LineNr">270 </span>
+<span id="L271" class="LineNr">271 </span><span class="Delimiter">:(scenario compare_mem_at_r32_with_r32_equal)</span>
+<span id="L272" class="LineNr">272 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L273" class="LineNr">273 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L274" class="LineNr">274 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L275" class="LineNr">275 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L276" class="LineNr">276 </span>  <span class="Constant">39</span>  <span class="Constant">18</span>                                      <span class="Comment"># compare EBX with *EAX</span>
+<span id="L277" class="LineNr">277 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L278" class="LineNr">278 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L279" class="LineNr">279 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
+<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L16'>EBX</a> with r/m32</span>
+<span id="L281" class="LineNr">281 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L282" class="LineNr">282 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L283" class="LineNr">283 </span>
+<span id="L284" class="LineNr">284 </span><span class="Comment">//:</span>
+<span id="L285" class="LineNr">285 </span>
+<span id="L286" class="LineNr">286 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L287" class="LineNr">287 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;set SF if rm32 &gt; r32&quot;</span><span class="Delimiter">);</span>
+<span id="L288" class="LineNr">288 </span>
+<span id="L289" class="LineNr">289 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_greater)</span>
+<span id="L290" class="LineNr">290 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L291" class="LineNr">291 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L292" class="LineNr">292 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L293" class="LineNr">293 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L294" class="LineNr">294 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
+<span id="L295" class="LineNr">295 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L296" class="LineNr">296 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L297" class="LineNr">297 </span><span class="PreProc">0</span><span class="Constant">7</span> 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
+<span id="L298" class="LineNr">298 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L299" class="LineNr">299 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L300" class="LineNr">300 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L301" class="LineNr">301 </span>
+<span id="L302" class="LineNr">302 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L303" class="LineNr">303 </span><span class="Normal">case</span> <span class="Constant">0x3b</span>: <span class="Delimiter">{</span>  <span class="Comment">// set SF if r32 &lt; r/m32</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L305" class="LineNr">305 </span>  <span class="Normal">uint8_t</span> reg1 = <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 id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L196'>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 r/m32 with &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Normal">int32_t</span> arg1 = Reg[reg1]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L308" class="LineNr">308 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L309" class="LineNr">309 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - *arg2<span class="Delimiter">;</span>
+<span id="L310" class="LineNr">310 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L311" class="LineNr">311 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L312" class="LineNr">312 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - *arg2<span class="Delimiter">;</span>
+<span id="L313" class="LineNr">313 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L314" class="LineNr">314 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L315" class="LineNr">315 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L316" class="LineNr">316 </span><span class="Delimiter">}</span>
+<span id="L317" class="LineNr">317 </span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_lesser)</span>
+<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L320" class="LineNr">320 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c07;</span>
+<span id="L321" class="LineNr">321 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L322" class="LineNr">322 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L323" class="LineNr">323 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
+<span id="L324" class="LineNr">324 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L325" class="LineNr">325 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L326" class="LineNr">326 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
+<span id="L327" class="LineNr">327 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L328" class="LineNr">328 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L329" class="LineNr">329 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L330" class="LineNr">330 </span>
+<span id="L331" class="LineNr">331 </span><span class="Delimiter">:(scenario compare_r32_with_mem_at_r32_equal)</span>
+<span id="L332" class="LineNr">332 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L333" class="LineNr">333 </span><span class="Special">% Reg[EBX].i = 0x0a0b0c0d;</span>
+<span id="L334" class="LineNr">334 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L335" class="LineNr">335 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L336" class="LineNr">336 </span>  3b  <span class="Constant">18</span>                                      <span class="Comment"># compare *EAX with EBX</span>
+<span id="L337" class="LineNr">337 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L338" class="LineNr">338 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L339" class="LineNr">339 </span>0d 0c 0b 0a  <span class="Comment"># 0x0a0b0c0d</span>
+<span id="L340" class="LineNr">340 </span><span class="traceContains">+run: compare r/m32 with <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L341" class="LineNr">341 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L342" class="LineNr">342 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L343" class="LineNr">343 </span>
+<span id="L344" class="LineNr">344 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L345" class="LineNr">345 </span>
+<span id="L346" class="LineNr">346 </span><span class="Delimiter">:(scenario copy_r32_to_mem_at_r32)</span>
+<span id="L347" class="LineNr">347 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L348" class="LineNr">348 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L349" class="LineNr">349 </span>== <span class="Constant">0x1</span>
+<span id="L350" class="LineNr">350 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L351" class="LineNr">351 </span>  <span class="Constant">89</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy EBX to *EAX</span>
+<span id="L352" class="LineNr">352 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EAX) 000 (dest EAX)</span>
+<span id="L353" class="LineNr">353 </span><span class="traceContains">+run: copy <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L354" class="LineNr">354 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L356" class="LineNr">356 </span>
+<span id="L357" class="LineNr">357 </span><span class="Comment">//:</span>
+<span id="L358" class="LineNr">358 </span>
+<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L360" class="LineNr">360 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8b&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy rm32 to r32&quot;</span><span class="Delimiter">);</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r32)</span>
+<span id="L363" class="LineNr">363 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L364" class="LineNr">364 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L365" class="LineNr">365 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L366" class="LineNr">366 </span>  8b  <span class="Constant">18</span>                                      <span class="Comment"># copy *EAX to EBX</span>
+<span id="L367" class="LineNr">367 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L368" class="LineNr">368 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L369" class="LineNr">369 </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"># 0xaf</span>
+<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: copy r/m32 to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L372" class="LineNr">372 </span><span class="traceContains">+run: storing 0x000000af</span>
+<span id="L373" class="LineNr">373 </span>
+<span id="L374" class="LineNr">374 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L375" class="LineNr">375 </span><span class="Normal">case</span> <span class="Constant">0x8b</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r32 to r/m32</span>
+<span id="L376" class="LineNr">376 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Normal">uint8_t</span> reg1 = <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 id="L378" class="LineNr">378 </span>  <a href='003trace.cc.html#L196'>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 r/m32 to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L379" class="LineNr">379 </span>  <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L380" class="LineNr">380 </span>  Reg[reg1]<span class="Delimiter">.</span>i = *arg2<span class="Delimiter">;</span>
+<span id="L381" class="LineNr">381 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; *arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L382" class="LineNr">382 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L383" class="LineNr">383 </span><span class="Delimiter">}</span>
+<span id="L384" class="LineNr">384 </span>
+<span id="L385" class="LineNr">385 </span><span class="Comment">//:</span>
+<span id="L386" class="LineNr">386 </span>
+<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L388" class="LineNr">388 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;88&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8 (lowermost byte of r32) to r8/m8-at-r32&quot;</span><span class="Delimiter">);</span>
+<span id="L389" class="LineNr">389 </span>
+<span id="L390" class="LineNr">390 </span><span class="Delimiter">:(scenario copy_r8_to_mem_at_r32)</span>
+<span id="L391" class="LineNr">391 </span><span class="Special">% Reg[EBX].i = 0xafafafaf;</span>
+<span id="L392" class="LineNr">392 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L393" class="LineNr">393 </span>== <span class="Constant">0x1</span>
+<span id="L394" class="LineNr">394 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L395" class="LineNr">395 </span>  <span class="Constant">88</span>  <span class="Constant">18</span>                                      <span class="Comment"># copy just the lowermost byte of EBX to the byte at *EAX</span>
+<span id="L396" class="LineNr">396 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L397" class="LineNr">397 </span><span class="traceContains">+run: copy lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a> to r8/m8-at-r32</span>
+<span id="L398" class="LineNr">398 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L399" class="LineNr">399 </span><span class="traceContains">+run: storing 0xaf</span>
+<span id="L400" class="LineNr">400 </span><span class="Special">% CHECK_EQ(0x000000af, read_mem_u32(0x60));</span>
+<span id="L401" class="LineNr">401 </span>
+<span id="L402" class="LineNr">402 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L403" class="LineNr">403 </span><span class="Normal">case</span> <span class="Constant">0x88</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L405" class="LineNr">405 </span>  <span class="Normal">uint8_t</span> reg2 = <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 id="L406" class="LineNr">406 </span>  <a href='003trace.cc.html#L196'>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 lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg2<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot; to r8/m8-at-r32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L407" class="LineNr">407 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L408" class="LineNr">408 </span>  <span class="Normal">uint8_t</span>* arg1 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L409" class="LineNr">409 </span>  *arg1 = Reg[reg2]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L410" class="LineNr">410 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L411" class="LineNr">411 </span>  <span class="Identifier">break</span><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="Comment">//:</span>
+<span id="L415" class="LineNr">415 </span>
+<span id="L416" class="LineNr">416 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8a&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy r8/m8-at-r32 to r8 (lowermost byte of r32)&quot;</span><span class="Delimiter">);</span>
+<span id="L418" class="LineNr">418 </span>
+<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(scenario copy_mem_at_r32_to_r8)</span>
+<span id="L420" class="LineNr">420 </span><span class="Special">% Reg[EBX].i = 0xaf;</span>
+<span id="L421" class="LineNr">421 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L422" class="LineNr">422 </span>== <span class="Constant">0x1</span>
+<span id="L423" class="LineNr">423 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L424" class="LineNr">424 </span>  8a  <span class="Constant">18</span>                                      <span class="Comment"># copy just the byte at *EAX to lowermost byte of EBX (clearing remaining bytes)</span>
+<span id="L425" class="LineNr">425 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (dest EBX) 000 (src EAX)</span>
+<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L427" class="LineNr">427 </span>af ff ff ff  <span class="Comment"># 0xaf with more data in following bytes</span>
+<span id="L428" class="LineNr">428 </span><span class="traceContains">+run: copy r8/m8-at-r32 to lowermost byte of <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L430" class="LineNr">430 </span><span class="traceContains">+run: storing 0xaf</span>
+<span id="L431" class="LineNr">431 </span>
+<span id="L432" class="LineNr">432 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L433" class="LineNr">433 </span><span class="Normal">case</span> <span class="Constant">0x8a</span>: <span class="Delimiter">{</span>  <span class="Comment">// copy r/m8 to r8</span>
+<span id="L434" class="LineNr">434 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L435" class="LineNr">435 </span>  <span class="Normal">uint8_t</span> reg1 = <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 id="L436" class="LineNr">436 </span>  <a href='003trace.cc.html#L196'>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 r8/m8-at-r32 to lowermost byte of &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L437" class="LineNr">437 </span>  <span class="Comment">// use unsigned to zero-extend 8-bit value to 32 bits</span>
+<span id="L438" class="LineNr">438 </span>  <span class="Normal">uint8_t</span>* arg2 = <span class="Normal">reinterpret_cast</span>&lt;<span class="Normal">uint8_t</span>*&gt;<span class="Delimiter">(</span><a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">));</span>
+<span id="L439" class="LineNr">439 </span>  Reg[reg1]<span class="Delimiter">.</span>u = <span class="Normal">static_cast</span>&lt;<span class="Normal">uint32_t</span>&gt;<span class="Delimiter">(</span>*arg2<span class="Delimiter">);</span>
+<span id="L440" class="LineNr">440 </span>  <a href='003trace.cc.html#L196'>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;storing 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L259'>HEXBYTE</a> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>*arg2<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L442" class="LineNr">442 </span><span class="Delimiter">}</span>
+<span id="L443" class="LineNr">443 </span>
+<span id="L444" class="LineNr">444 </span><span class="SalientComment">//:: jump</span>
+<span id="L445" class="LineNr">445 </span>
+<span id="L446" class="LineNr">446 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L447" class="LineNr">447 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ff&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;jump/push/call rm32 based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L448" class="LineNr">448 </span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(scenario jump_mem_at_r32)</span>
+<span id="L450" class="LineNr">450 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L451" class="LineNr">451 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L452" class="LineNr">452 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L453" class="LineNr">453 </span>  ff  <span class="Constant">20</span>                                      <span class="Comment"># jump to *EAX</span>
+<span id="L454" class="LineNr">454 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (jump to r/m32) 000 (src EAX)</span>
+<span id="L455" class="LineNr">455 </span>  <span class="PreProc">0</span><span class="Constant">5</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">1</span>
+<span id="L456" class="LineNr">456 </span>  <span class="PreProc">0</span><span class="Constant">5</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">2</span>
+<span id="L457" class="LineNr">457 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L458" class="LineNr">458 </span><span class="Error">08</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"># 8</span>
+<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: inst: 0x00000001</span>
+<span id="L460" class="LineNr">460 </span><span class="traceContains">+run: jump to r/m32</span>
+<span id="L461" class="LineNr">461 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L462" class="LineNr">462 </span><span class="traceContains">+run: jumping to 0x00000008</span>
+<span id="L463" class="LineNr">463 </span><span class="traceContains">+run: inst: 0x00000008</span>
+<span id="L464" class="LineNr">464 </span><span class="traceAbsent">-run: inst: 0x00000003</span>
+<span id="L465" class="LineNr">465 </span>
+<span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L467" class="LineNr">467 </span><span class="Normal">case</span> <span class="Constant">0xff</span>: <span class="Delimiter">{</span>
+<span id="L468" class="LineNr">468 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L469" class="LineNr">469 </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="L470" class="LineNr">470 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L471" class="LineNr">471 </span>    <span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>  <span class="Comment">// jump to r/m32</span>
+<span id="L472" class="LineNr">472 </span>      <a href='003trace.cc.html#L196'>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;jump to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L473" class="LineNr">473 </span>      <span class="Normal">int32_t</span>* arg2 = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L474" class="LineNr">474 </span>      <a href='010---vm.cc.html#L29'>EIP</a> = *arg2<span class="Delimiter">;</span>
+<span id="L475" class="LineNr">475 </span>      <a href='003trace.cc.html#L196'>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;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L476" class="LineNr">476 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L477" class="LineNr">477 </span>    <span class="Delimiter">}</span>
+<span id="L478" class="LineNr">478 </span>    <span class="Comment">// End Op ff Subops</span>
+<span id="L479" class="LineNr">479 </span>  <span class="Delimiter">}</span>
+<span id="L480" class="LineNr">480 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L481" class="LineNr">481 </span><span class="Delimiter">}</span>
+<span id="L482" class="LineNr">482 </span>
+<span id="L483" class="LineNr">483 </span><span class="SalientComment">//:: push</span>
+<span id="L484" class="LineNr">484 </span>
+<span id="L485" class="LineNr">485 </span><span class="Delimiter">:(scenario push_mem_at_r32)</span>
+<span id="L486" class="LineNr">486 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L487" class="LineNr">487 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L488" class="LineNr">488 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L489" class="LineNr">489 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L490" class="LineNr">490 </span>  ff  <span class="Constant">30</span>                                      <span class="Comment"># push *EAX to stack</span>
+<span id="L491" class="LineNr">491 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (push r/m32) 000 (src EAX)</span>
+<span id="L492" class="LineNr">492 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L493" class="LineNr">493 </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"># 0xaf</span>
+<span id="L494" class="LineNr">494 </span><span class="traceContains">+run: <a href='012elf.cc.html#L84'>push</a> r/m32</span>
+<span id="L495" class="LineNr">495 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L496" class="LineNr">496 </span><span class="traceContains">+run: decrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000010</span>
+<span id="L497" class="LineNr">497 </span><span class="traceContains">+run: pushing value 0x000000af</span>
+<span id="L498" class="LineNr">498 </span>
+<span id="L499" class="LineNr">499 </span><span class="Delimiter">:(before &quot;End Op ff Subops&quot;)</span>
+<span id="L500" class="LineNr">500 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>  <span class="Comment">// push r/m32 to stack</span>
+<span id="L501" class="LineNr">501 </span>  <a href='003trace.cc.html#L196'>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 r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L502" class="LineNr">502 </span>  <span class="Normal">const</span> <span class="Normal">int32_t</span>* val = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
+<span id="L503" class="LineNr">503 </span>  <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span>*val<span class="Delimiter">);</span>
+<span id="L504" class="LineNr">504 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L505" class="LineNr">505 </span><span class="Delimiter">}</span>
+<span id="L506" class="LineNr">506 </span>
+<span id="L507" class="LineNr">507 </span><span class="SalientComment">//:: pop</span>
+<span id="L508" class="LineNr">508 </span>
+<span id="L509" class="LineNr">509 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L510" class="LineNr">510 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;pop top of stack to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L511" class="LineNr">511 </span>
+<span id="L512" class="LineNr">512 </span><span class="Delimiter">:(scenario pop_mem_at_r32)</span>
+<span id="L513" class="LineNr">513 </span><span class="Special">% Reg[EAX].i = 0x60;</span>
+<span id="L514" class="LineNr">514 </span><span class="Special">% Reg[ESP].u = 0x10;</span>
+<span id="L515" class="LineNr">515 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<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">8f</span>  <span class="PreProc">0</span><span class="Constant">0</span>                                      <span class="Comment"># pop stack into *EAX</span>
+<span id="L518" class="LineNr">518 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (pop r/m32) 000 (dest EAX)</span>
+<span id="L519" class="LineNr">519 </span>== <span class="Constant">0x10</span>  <span class="Comment"># data segment</span>
+<span id="L520" class="LineNr">520 </span><span class="Constant">30</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"># 0x30</span>
+<span id="L521" class="LineNr">521 </span><span class="traceContains">+run: <a href='013direct_addressing.cc.html#L452'>pop</a> into r/m32</span>
+<span id="L522" class="LineNr">522 </span><span class="traceContains">+run: effective address is 0x60 (EAX)</span>
+<span id="L523" class="LineNr">523 </span><span class="traceContains">+run: popping value 0x00000030</span>
+<span id="L524" class="LineNr">524 </span><span class="traceContains">+run: incrementing <a href='010---vm.cc.html#L17'>ESP</a> to 0x00000014</span>
+<span id="L525" class="LineNr">525 </span>
+<span id="L526" class="LineNr">526 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L527" class="LineNr">527 </span><span class="Normal">case</span> <span class="Constant">0x8f</span>: <span class="Delimiter">{</span>  <span class="Comment">// pop stack into r/m32</span>
+<span id="L528" class="LineNr">528 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L529" class="LineNr">529 </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 id="L530" class="LineNr">530 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L531" class="LineNr">531 </span>    <span class="Normal">case</span> <span class="Constant">0</span>: <span class="Delimiter">{</span>
+<span id="L532" class="LineNr">532 </span>      <a href='003trace.cc.html#L196'>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;pop into r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L533" class="LineNr">533 </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="L534" class="LineNr">534 </span>      *dest = <a href='013direct_addressing.cc.html#L452'>pop</a><span class="Delimiter">();</span>
+<span id="L535" class="LineNr">535 </span>      <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L536" class="LineNr">536 </span>    <span class="Delimiter">}</span>
+<span id="L537" class="LineNr">537 </span>  <span class="Delimiter">}</span>
+<span id="L538" class="LineNr">538 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L539" class="LineNr">539 </span><span class="Delimiter">}</span>
+<span id="L540" class="LineNr">540 </span>
+<span id="L541" class="LineNr">541 </span><span class="SalientComment">//:: special-case for loading address from disp32 rather than register</span>
+<span id="L542" class="LineNr">542 </span>
+<span id="L543" class="LineNr">543 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_displacement)</span>
+<span id="L544" class="LineNr">544 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L545" class="LineNr">545 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L546" class="LineNr">546 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L547" class="LineNr">547 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  1d            <span class="Constant">60</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"># add EBX to *0x60</span>
+<span id="L548" class="LineNr">548 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 011 (src EBX) 101 (dest in disp32)</span>
+<span id="L549" class="LineNr">549 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L550" class="LineNr">550 </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="L551" class="LineNr">551 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L552" class="LineNr">552 </span><span class="traceContains">+run: effective address is 0x60 (disp32)</span>
+<span id="L553" class="LineNr">553 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L554" class="LineNr">554 </span>
+<span id="L555" class="LineNr">555 </span><span class="Delimiter">:(before &quot;End Mod 0 Special-cases(addr)&quot;)</span>
+<span id="L556" class="LineNr">556 </span><span class="Normal">case</span> <span class="Constant">5</span>:  <span class="Comment">// exception: mod 0b00 rm 0b101 =&gt; incoming disp32</span>
+<span id="L557" class="LineNr">557 </span>  addr = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L558" class="LineNr">558 </span>  <a href='003trace.cc.html#L196'>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;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L559" class="LineNr">559 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L560" class="LineNr">560 </span>
+<span id="L561" class="LineNr">561 </span><span class="Comment">//:</span>
+<span id="L562" class="LineNr">562 </span>
+<span id="L563" class="LineNr">563 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp8)</span>
+<span id="L564" class="LineNr">564 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L565" class="LineNr">565 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
+<span id="L566" class="LineNr">566 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L567" class="LineNr">567 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L568" class="LineNr">568 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            <span class="PreProc">0</span><span class="Constant">2</span>                       <span class="Comment"># add EBX to *(EAX+2)</span>
+<span id="L569" class="LineNr">569 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L570" class="LineNr">570 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L571" class="LineNr">571 </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="L572" class="LineNr">572 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L573" class="LineNr">573 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
+<span id="L574" class="LineNr">574 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
+<span id="L575" class="LineNr">575 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L576" class="LineNr">576 </span>
+<span id="L577" class="LineNr">577 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L578" class="LineNr">578 </span><span class="Normal">case</span> <span class="Constant">1</span>:  <span class="Comment">// indirect + disp8 addressing</span>
+<span id="L579" class="LineNr">579 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L580" class="LineNr">580 </span>  <span class="Normal">default</span>:
+<span id="L581" class="LineNr">581 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L582" class="LineNr">582 </span>    <a href='003trace.cc.html#L196'>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;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L583" class="LineNr">583 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L584" class="LineNr">584 </span>  <span class="Comment">// End Mod 1 Special-cases(addr)</span>
+<span id="L585" class="LineNr">585 </span>  <span class="Delimiter">}</span>
+<span id="L586" class="LineNr">586 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L587" class="LineNr">587 </span>    addr += <span class="Normal">static_cast</span>&lt;<span class="Normal">int8_t</span>&gt;<span class="Delimiter">(</span><a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">());</span>
+<span id="L588" class="LineNr">588 </span>    <a href='003trace.cc.html#L196'>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;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp8)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L589" class="LineNr">589 </span>  <span class="Delimiter">}</span>
+<span id="L590" class="LineNr">590 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L591" class="LineNr">591 </span>
+<span id="L592" class="LineNr">592 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp8)</span>
+<span id="L593" class="LineNr">593 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L594" class="LineNr">594 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
+<span id="L595" class="LineNr">595 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L596" class="LineNr">596 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L597" class="LineNr">597 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">58</span>            ff                       <span class="Comment"># add EBX to *(EAX-1)</span>
+<span id="L598" class="LineNr">598 </span><span class="Comment"># ModR/M in binary: 01 (indirect+disp8 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L599" class="LineNr">599 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L600" class="LineNr">600 </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="L601" class="LineNr">601 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L602" class="LineNr">602 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
+<span id="L603" class="LineNr">603 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp8)</span>
+<span id="L604" class="LineNr">604 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L605" class="LineNr">605 </span>
+<span id="L606" class="LineNr">606 </span><span class="Comment">//:</span>
+<span id="L607" class="LineNr">607 </span>
+<span id="L608" class="LineNr">608 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_disp32)</span>
+<span id="L609" class="LineNr">609 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L610" class="LineNr">610 </span><span class="Special">% Reg[EAX].i = 0x5e;  // dest</span>
+<span id="L611" class="LineNr">611 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L612" class="LineNr">612 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L613" class="LineNr">613 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            <span class="PreProc">0</span><span class="Constant">2</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"># add EBX to *(EAX+2)</span>
+<span id="L614" class="LineNr">614 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L615" class="LineNr">615 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L616" class="LineNr">616 </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="L617" class="LineNr">617 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L618" class="LineNr">618 </span><span class="traceContains">+run: effective address is initially 0x5e (EAX)</span>
+<span id="L619" class="LineNr">619 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
+<span id="L620" class="LineNr">620 </span><span class="traceContains">+run: storing 0x00000011</span>
+<span id="L621" class="LineNr">621 </span>
+<span id="L622" class="LineNr">622 </span><span class="Delimiter">:(before &quot;End Mod Special-cases(addr)&quot;)</span>
+<span id="L623" class="LineNr">623 </span><span class="Normal">case</span> <span class="Constant">2</span>:  <span class="Comment">// indirect + disp32 addressing</span>
+<span id="L624" class="LineNr">624 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>rm<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L625" class="LineNr">625 </span>  <span class="Normal">default</span>:
+<span id="L626" class="LineNr">626 </span>    addr = Reg[rm]<span class="Delimiter">.</span>u<span class="Delimiter">;</span>
+<span id="L627" class="LineNr">627 </span>    <a href='003trace.cc.html#L196'>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;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (&quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>rm<span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L628" class="LineNr">628 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L629" class="LineNr">629 </span>  <span class="Comment">// End Mod 2 Special-cases(addr)</span>
+<span id="L630" class="LineNr">630 </span>  <span class="Delimiter">}</span>
+<span id="L631" class="LineNr">631 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>addr &gt; <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L632" class="LineNr">632 </span>    addr += <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L633" class="LineNr">633 </span>    <a href='003trace.cc.html#L196'>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;effective address is 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (after adding disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L634" class="LineNr">634 </span>  <span class="Delimiter">}</span>
+<span id="L635" class="LineNr">635 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L636" class="LineNr">636 </span>
+<span id="L637" class="LineNr">637 </span><span class="Delimiter">:(scenario add_r32_to_mem_at_r32_plus_negative_disp32)</span>
+<span id="L638" class="LineNr">638 </span><span class="Special">% Reg[EBX].i = 0x10;  // source</span>
+<span id="L639" class="LineNr">639 </span><span class="Special">% Reg[EAX].i = 0x61;  // dest</span>
+<span id="L640" class="LineNr">640 </span>== <span class="Constant">0x1</span>  <span class="Comment"># code segment</span>
+<span id="L641" class="LineNr">641 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L642" class="LineNr">642 </span>  <span class="PreProc">0</span><span class="Constant">1</span>  <span class="Constant">98</span>            ff ff ff ff              <span class="Comment"># add EBX to *(EAX-1)</span>
+<span id="L643" class="LineNr">643 </span><span class="Comment"># ModR/M in binary: 10 (indirect+disp32 mode) 011 (src EBX) 000 (dest EAX)</span>
+<span id="L644" class="LineNr">644 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L645" class="LineNr">645 </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="L646" class="LineNr">646 </span><span class="traceContains">+run: add <a href='010---vm.cc.html#L16'>EBX</a> to r/m32</span>
+<span id="L647" class="LineNr">647 </span><span class="traceContains">+run: effective address is initially 0x61 (EAX)</span>
+<span id="L648" class="LineNr">648 </span><span class="traceContains">+run: effective address is 0x60 (after adding disp32)</span>
+<span id="L649" class="LineNr">649 </span><span class="traceContains">+run: storing 0x00000011</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/015immediate_addressing.cc.html b/html/subx/015immediate_addressing.cc.html
index 88361ce4..e3d4b190 100644
--- a/html/subx/015immediate_addressing.cc.html
+++ b/html/subx/015immediate_addressing.cc.html
@@ -65,7 +65,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(name)&quot;)</span>
-<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;81&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop&quot;</span><span class="Delimiter">);</span>
+<span id="L4" class="LineNr">  4 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><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&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>
@@ -73,472 +73,491 @@ 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 <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
+<span id="L12" class="LineNr"> 12 </span><span class="traceContains">+run: combine imm32 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: subop add</span>
-<span id="L15" class="LineNr"> 15 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L16" class="LineNr"> 16 </span>
-<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">0x81</span>: <span class="Delimiter">{</span>  <span class="Comment">// combine imm32 with r/m32</span>
-<span id="L19" class="LineNr"> 19 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr"> 20 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L21" class="LineNr"> 21 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L14" class="LineNr"> 14 </span><span class="traceContains">+run: imm32 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#L196'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L21" class="LineNr"> 21 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>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">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="L24" class="LineNr"> 24 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L25" class="LineNr"> 25 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
-<span id="L26" class="LineNr"> 26 </span>    <a href='003trace.cc.html#L196'>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;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L27" class="LineNr"> 27 </span>    <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L28" class="LineNr"> 28 </span>    <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L29" class="LineNr"> 29 </span>  <span class="Comment">// End Op 81 Subops</span>
-<span id="L30" class="LineNr"> 30 </span>  <span class="Normal">default</span>:
-<span id="L31" class="LineNr"> 31 </span>    cerr &lt;&lt; <span class="Constant">&quot;unrecognized sub-opcode after 81: &quot;</span> &lt;&lt; <a href='010---vm.cc.html#L262'>NUM</a><span class="Delimiter">(</span>subop<span class="Delimiter">)</span> &lt;&lt; <span class="cSpecial">'\n'</span><span class="Delimiter">;</span>
-<span id="L32" class="LineNr"> 32 </span>    exit<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">);</span>
-<span id="L33" class="LineNr"> 33 </span>  <span class="Delimiter">}</span>
-<span id="L34" class="LineNr"> 34 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L35" class="LineNr"> 35 </span><span class="Delimiter">}</span>
-<span id="L36" class="LineNr"> 36 </span>
-<span id="L37" class="LineNr"> 37 </span><span class="Comment">//:</span>
+<span id="L23" class="LineNr"> 23 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L24" class="LineNr"> 24 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L25" class="LineNr"> 25 </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="L26" class="LineNr"> 26 </span>  <span class="Normal">switch</span> <span class="Delimiter">(</span>subop<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L27" class="LineNr"> 27 </span>  <span class="Normal">case</span> <span class="Constant">0</span>:
+<span id="L28" class="LineNr"> 28 </span>    <a href='003trace.cc.html#L196'>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;subop add&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>+<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<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#L262'>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>
+<span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
-<span id="L39" class="LineNr"> 39 </span><span class="Delimiter">:(scenario add_imm32_to_mem_at_r32)</span>
-<span id="L40" class="LineNr"> 40 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L41" class="LineNr"> 41 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L42" class="LineNr"> 42 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L43" class="LineNr"> 43 </span>  <span class="Constant">81</span>  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to *EBX</span>
-<span id="L44" class="LineNr"> 44 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (add imm32) 011 (dest EBX)</span>
-<span id="L45" class="LineNr"> 45 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L46" class="LineNr"> 46 </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="L47" class="LineNr"> 47 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L48" class="LineNr"> 48 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L49" class="LineNr"> 49 </span><span class="traceContains">+run: subop add</span>
-<span id="L50" class="LineNr"> 50 </span><span class="traceContains">+run: storing 0x0d0c0b0b</span>
-<span id="L51" class="LineNr"> 51 </span>
-<span id="L52" class="LineNr"> 52 </span><span class="SalientComment">//:: subtract</span>
-<span id="L53" class="LineNr"> 53 </span>
-<span id="L54" class="LineNr"> 54 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L55" class="LineNr"> 55 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L299'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L39" class="LineNr"> 39 </span><span class="Comment">//:</span>
+<span id="L40" class="LineNr"> 40 </span>
+<span id="L41" class="LineNr"> 41 </span><span class="Delimiter">:(scenario add_imm32_to_mem_at_r32)</span>
+<span id="L42" class="LineNr"> 42 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L43" class="LineNr"> 43 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L44" class="LineNr"> 44 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L45" class="LineNr"> 45 </span>  <span class="Constant">81</span>  <span class="PreProc">0</span><span class="Constant">3</span>                          0a 0b 0c 0d  <span class="Comment"># add 0x0d0c0b0a to *EBX</span>
+<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">0x60</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="L50" class="LineNr"> 50 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L51" class="LineNr"> 51 </span><span class="traceContains">+run: imm32 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">:(scenario subtract_imm32_from_eax)</span>
-<span id="L58" class="LineNr"> 58 </span><span class="Special">% Reg[EAX].i = 0x0d0c0baa;</span>
-<span id="L59" class="LineNr"> 59 </span>== <span class="Constant">0x1</span>
-<span id="L60" class="LineNr"> 60 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L61" class="LineNr"> 61 </span>  2d                              0a 0b 0c 0d  <span class="Comment"># subtract 0x0d0c0b0a from EAX</span>
-<span id="L62" class="LineNr"> 62 </span><span class="traceContains">+run: subtract <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a from <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L63" class="LineNr"> 63 </span><span class="traceContains">+run: storing 0x000000a0</span>
-<span id="L64" class="LineNr"> 64 </span>
-<span id="L65" class="LineNr"> 65 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L66" class="LineNr"> 66 </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="L67" class="LineNr"> 67 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L68" class="LineNr"> 68 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L69" class="LineNr"> 69 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L70" class="LineNr"> 70 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L71" class="LineNr"> 71 </span><span class="Delimiter">}</span>
-<span id="L72" class="LineNr"> 72 </span>
-<span id="L73" class="LineNr"> 73 </span><span class="Comment">//:</span>
-<span id="L74" class="LineNr"> 74 </span>
-<span id="L75" class="LineNr"> 75 </span><span class="Delimiter">:(scenario subtract_imm32_from_mem_at_r32)</span>
-<span id="L76" class="LineNr"> 76 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L77" class="LineNr"> 77 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L78" class="LineNr"> 78 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L79" class="LineNr"> 79 </span>  <span class="Constant">81</span>  2b                          <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="L80" class="LineNr"> 80 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L81" class="LineNr"> 81 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L82" class="LineNr"> 82 </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="L83" class="LineNr"> 83 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x00000001 with r/m32</span>
-<span id="L84" class="LineNr"> 84 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L85" class="LineNr"> 85 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L86" class="LineNr"> 86 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L87" class="LineNr"> 87 </span>
-<span id="L88" class="LineNr"> 88 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L89" class="LineNr"> 89 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
-<span id="L90" class="LineNr"> 90 </span>  <a href='003trace.cc.html#L196'>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;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L91" class="LineNr"> 91 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L92" class="LineNr"> 92 </span>  <span class="Identifier">break</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="Comment">//:</span>
-<span id="L96" class="LineNr"> 96 </span>
-<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">:(scenario subtract_imm32_from_r32)</span>
-<span id="L98" class="LineNr"> 98 </span><span class="Special">% Reg[EBX].i = 10;</span>
-<span id="L99" class="LineNr"> 99 </span>== <span class="Constant">0x1</span>
-<span id="L100" class="LineNr">100 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L101" class="LineNr">101 </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="L102" class="LineNr">102 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 101 (subtract imm32) 011 (dest EBX)</span>
-<span id="L103" class="LineNr">103 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x00000001 with r/m32</span>
-<span id="L104" class="LineNr">104 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L105" class="LineNr">105 </span><span class="traceContains">+run: subop subtract</span>
-<span id="L106" class="LineNr">106 </span><span class="traceContains">+run: storing 0x00000009</span>
-<span id="L107" class="LineNr">107 </span>
-<span id="L108" class="LineNr">108 </span><span class="SalientComment">//:: and</span>
-<span id="L109" class="LineNr">109 </span>
-<span id="L110" class="LineNr">110 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L111" class="LineNr">111 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of <a href='011run.cc.html#L299'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L57" class="LineNr"> 57 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L58" class="LineNr"> 58 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;2d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 from R0 (EAX)&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="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">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L71" class="LineNr"> 71 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; from EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L72" class="LineNr"> 72 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> Reg[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>
+<span id="L75" class="LineNr"> 75 </span>
+<span id="L76" class="LineNr"> 76 </span><span class="Comment">//:</span>
+<span id="L77" class="LineNr"> 77 </span>
+<span id="L78" class="LineNr"> 78 </span><span class="Delimiter">:(scenario subtract_imm32_from_mem_at_r32)</span>
+<span id="L79" class="LineNr"> 79 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L80" class="LineNr"> 80 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L81" class="LineNr"> 81 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L82" class="LineNr"> 82 </span>  <span class="Constant">81</span>  2b                          <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="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">0x60</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="L87" class="LineNr"> 87 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L88" class="LineNr"> 88 </span><span class="traceContains">+run: imm32 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>
+<span id="L92" class="LineNr"> 92 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L93" class="LineNr"> 93 </span><span class="Normal">case</span> <span class="Constant">5</span>: <span class="Delimiter">{</span>
+<span id="L94" class="LineNr"> 94 </span>  <a href='003trace.cc.html#L196'>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;subop subtract&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L95" class="LineNr"> 95 </span>  <a href='010---vm.cc.html#L69'>BINARY_ARITHMETIC_OP</a><span class="Delimiter">(</span>-<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L96" class="LineNr"> 96 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L97" class="LineNr"> 97 </span><span class="Delimiter">}</span>
+<span id="L98" class="LineNr"> 98 </span>
+<span id="L99" class="LineNr"> 99 </span><span class="Comment">//:</span>
+<span id="L100" class="LineNr">100 </span>
+<span id="L101" class="LineNr">101 </span><span class="Delimiter">:(scenario subtract_imm32_from_r32)</span>
+<span id="L102" class="LineNr">102 </span><span class="Special">% Reg[EBX].i = 10;</span>
+<span id="L103" class="LineNr">103 </span>== <span class="Constant">0x1</span>
+<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="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="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>
-<span id="L113" class="LineNr">113 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
-<span id="L114" class="LineNr">114 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
-<span id="L115" class="LineNr">115 </span>== <span class="Constant">0x1</span>
-<span id="L116" class="LineNr">116 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L117" class="LineNr">117 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
-<span id="L118" class="LineNr">118 </span><span class="traceContains">+run: and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L119" class="LineNr">119 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L120" class="LineNr">120 </span>
-<span id="L121" class="LineNr">121 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L122" class="LineNr">122 </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="L123" class="LineNr">123 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L124" class="LineNr">124 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L125" class="LineNr">125 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L126" class="LineNr">126 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L127" class="LineNr">127 </span><span class="Delimiter">}</span>
-<span id="L128" class="LineNr">128 </span>
-<span id="L129" class="LineNr">129 </span><span class="Comment">//:</span>
-<span id="L130" class="LineNr">130 </span>
-<span id="L131" class="LineNr">131 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
-<span id="L132" class="LineNr">132 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L133" class="LineNr">133 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L134" class="LineNr">134 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L135" class="LineNr">135 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX</span>
-<span id="L136" class="LineNr">136 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L137" class="LineNr">137 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L138" class="LineNr">138 </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="L139" class="LineNr">139 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L140" class="LineNr">140 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L141" class="LineNr">141 </span><span class="traceContains">+run: subop and</span>
-<span id="L142" class="LineNr">142 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L143" class="LineNr">143 </span>
-<span id="L144" class="LineNr">144 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L145" class="LineNr">145 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
-<span id="L146" class="LineNr">146 </span>  <a href='003trace.cc.html#L196'>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;subop and&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L147" class="LineNr">147 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L148" class="LineNr">148 </span>  <span class="Identifier">break</span><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="Comment">//:</span>
-<span id="L152" class="LineNr">152 </span>
-<span id="L153" class="LineNr">153 </span><span class="Delimiter">:(scenario and_imm32_with_r32)</span>
-<span id="L154" class="LineNr">154 </span><span class="Special">% Reg[EBX].i = 0xff;</span>
-<span id="L155" class="LineNr">155 </span>== <span class="Constant">0x1</span>
-<span id="L156" class="LineNr">156 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L157" class="LineNr">157 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
-<span id="L158" class="LineNr">158 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
-<span id="L159" class="LineNr">159 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L160" class="LineNr">160 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L161" class="LineNr">161 </span><span class="traceContains">+run: subop and</span>
-<span id="L162" class="LineNr">162 </span><span class="traceContains">+run: storing 0x0000000a</span>
-<span id="L163" class="LineNr">163 </span>
-<span id="L164" class="LineNr">164 </span><span class="SalientComment">//:: or</span>
-<span id="L165" class="LineNr">165 </span>
-<span id="L166" class="LineNr">166 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L167" class="LineNr">167 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of <a href='011run.cc.html#L299'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L168" class="LineNr">168 </span>
-<span id="L169" class="LineNr">169 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
-<span id="L170" class="LineNr">170 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
-<span id="L171" class="LineNr">171 </span>== <span class="Constant">0x1</span>
-<span id="L172" class="LineNr">172 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L173" class="LineNr">173 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
-<span id="L174" class="LineNr">174 </span><span class="traceContains">+run: or <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L175" class="LineNr">175 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L176" class="LineNr">176 </span>
-<span id="L177" class="LineNr">177 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L178" class="LineNr">178 </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="L179" class="LineNr">179 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L180" class="LineNr">180 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L181" class="LineNr">181 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L182" class="LineNr">182 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L183" class="LineNr">183 </span><span class="Delimiter">}</span>
-<span id="L184" class="LineNr">184 </span>
-<span id="L185" class="LineNr">185 </span><span class="Comment">//:</span>
-<span id="L186" class="LineNr">186 </span>
-<span id="L187" class="LineNr">187 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
-<span id="L188" class="LineNr">188 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L189" class="LineNr">189 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L190" class="LineNr">190 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L191" class="LineNr">191 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX</span>
-<span id="L192" class="LineNr">192 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L193" class="LineNr">193 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L194" class="LineNr">194 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L195" class="LineNr">195 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L196" class="LineNr">196 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L197" class="LineNr">197 </span><span class="traceContains">+run: subop or</span>
-<span id="L198" class="LineNr">198 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L199" class="LineNr">199 </span>
-<span id="L200" class="LineNr">200 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L201" class="LineNr">201 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
-<span id="L202" class="LineNr">202 </span>  <a href='003trace.cc.html#L196'>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;subop or&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L203" class="LineNr">203 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L204" class="LineNr">204 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L205" class="LineNr">205 </span><span class="Delimiter">}</span>
-<span id="L206" class="LineNr">206 </span>
-<span id="L207" class="LineNr">207 </span><span class="Delimiter">:(scenario or_imm32_with_r32)</span>
-<span id="L208" class="LineNr">208 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
-<span id="L209" class="LineNr">209 </span>== <span class="Constant">0x1</span>
-<span id="L210" class="LineNr">210 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
-<span id="L212" class="LineNr">212 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
-<span id="L213" class="LineNr">213 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L214" class="LineNr">214 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L215" class="LineNr">215 </span><span class="traceContains">+run: subop or</span>
-<span id="L216" class="LineNr">216 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L217" class="LineNr">217 </span>
-<span id="L218" class="LineNr">218 </span><span class="SalientComment">//:: xor</span>
-<span id="L219" class="LineNr">219 </span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L221" class="LineNr">221 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of <a href='011run.cc.html#L299'>imm32</a> with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L222" class="LineNr">222 </span>
-<span id="L223" class="LineNr">223 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
-<span id="L224" class="LineNr">224 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
-<span id="L225" class="LineNr">225 </span>== <span class="Constant">0x1</span>
-<span id="L226" class="LineNr">226 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L227" class="LineNr">227 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
-<span id="L228" class="LineNr">228 </span><span class="traceContains">+run: xor <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
-<span id="L229" class="LineNr">229 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
-<span id="L230" class="LineNr">230 </span>
-<span id="L231" class="LineNr">231 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L232" class="LineNr">232 </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="L233" class="LineNr">233 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L234" class="LineNr">234 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L235" class="LineNr">235 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L236" class="LineNr">236 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">}</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Comment">//:</span>
-<span id="L240" class="LineNr">240 </span>
-<span id="L241" class="LineNr">241 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
-<span id="L242" class="LineNr">242 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L243" class="LineNr">243 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L244" class="LineNr">244 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L245" class="LineNr">245 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX</span>
-<span id="L246" class="LineNr">246 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L247" class="LineNr">247 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L248" class="LineNr">248 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
-<span id="L249" class="LineNr">249 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L250" class="LineNr">250 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L251" class="LineNr">251 </span><span class="traceContains">+run: subop xor</span>
-<span id="L252" class="LineNr">252 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L253" class="LineNr">253 </span>
-<span id="L254" class="LineNr">254 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L255" class="LineNr">255 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
-<span id="L256" class="LineNr">256 </span>  <a href='003trace.cc.html#L196'>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;subop xor&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L257" class="LineNr">257 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
-<span id="L258" class="LineNr">258 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L259" class="LineNr">259 </span><span class="Delimiter">}</span>
-<span id="L260" class="LineNr">260 </span>
-<span id="L261" class="LineNr">261 </span><span class="Delimiter">:(scenario xor_imm32_with_r32)</span>
-<span id="L262" class="LineNr">262 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
-<span id="L263" class="LineNr">263 </span>== <span class="Constant">0x1</span>
-<span id="L264" class="LineNr">264 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L265" class="LineNr">265 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
-<span id="L266" class="LineNr">266 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
-<span id="L267" class="LineNr">267 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L268" class="LineNr">268 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L269" class="LineNr">269 </span><span class="traceContains">+run: subop xor</span>
-<span id="L270" class="LineNr">270 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
-<span id="L271" class="LineNr">271 </span>
-<span id="L272" class="LineNr">272 </span><span class="SalientComment">//:: compare (cmp)</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L275" class="LineNr">275 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract <a href='011run.cc.html#L299'>imm32</a> from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L276" class="LineNr">276 </span>
-<span id="L277" class="LineNr">277 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
-<span id="L278" class="LineNr">278 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
-<span id="L279" class="LineNr">279 </span>== <span class="Constant">0x1</span>
-<span id="L280" class="LineNr">280 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L281" class="LineNr">281 </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="L282" class="LineNr">282 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b07</span>
-<span id="L283" class="LineNr">283 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L113" class="LineNr">113 </span><span class="SalientComment">//:: and</span>
+<span id="L114" class="LineNr">114 </span>
+<span id="L115" class="LineNr">115 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L116" class="LineNr">116 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;25&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise AND of imm32 with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L117" class="LineNr">117 </span>
+<span id="L118" class="LineNr">118 </span><span class="Delimiter">:(scenario and_imm32_with_eax)</span>
+<span id="L119" class="LineNr">119 </span><span class="Special">% Reg[EAX].i = 0xff;</span>
+<span id="L120" class="LineNr">120 </span>== <span class="Constant">0x1</span>
+<span id="L121" class="LineNr">121 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L122" class="LineNr">122 </span>  <span class="Constant">25</span>                              0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EAX</span>
+<span id="L123" class="LineNr">123 </span><span class="traceContains">+run: and imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L124" class="LineNr">124 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L125" class="LineNr">125 </span>
+<span id="L126" class="LineNr">126 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L127" class="LineNr">127 </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="L128" class="LineNr">128 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L129" class="LineNr">129 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L130" class="LineNr">130 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L131" class="LineNr">131 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L132" class="LineNr">132 </span><span class="Delimiter">}</span>
+<span id="L133" class="LineNr">133 </span>
+<span id="L134" class="LineNr">134 </span><span class="Comment">//:</span>
+<span id="L135" class="LineNr">135 </span>
+<span id="L136" class="LineNr">136 </span><span class="Delimiter">:(scenario and_imm32_with_mem_at_r32)</span>
+<span id="L137" class="LineNr">137 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L138" class="LineNr">138 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L139" class="LineNr">139 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L140" class="LineNr">140 </span>  <span class="Constant">81</span>  <span class="Constant">23</span>                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with *EBX</span>
+<span id="L141" class="LineNr">141 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 100 (and imm32) 011 (dest EBX)</span>
+<span id="L142" class="LineNr">142 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L143" class="LineNr">143 </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="L144" class="LineNr">144 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L145" class="LineNr">145 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L146" class="LineNr">146 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L147" class="LineNr">147 </span><span class="traceContains">+run: subop and</span>
+<span id="L148" class="LineNr">148 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L149" class="LineNr">149 </span>
+<span id="L150" class="LineNr">150 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L151" class="LineNr">151 </span><span class="Normal">case</span> <span class="Constant">4</span>: <span class="Delimiter">{</span>
+<span id="L152" class="LineNr">152 </span>  <a href='003trace.cc.html#L196'>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;subop and&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L153" class="LineNr">153 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>&amp;<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L154" class="LineNr">154 </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 id="L157" class="LineNr">157 </span><span class="Comment">//:</span>
+<span id="L158" class="LineNr">158 </span>
+<span id="L159" class="LineNr">159 </span><span class="Delimiter">:(scenario and_imm32_with_r32)</span>
+<span id="L160" class="LineNr">160 </span><span class="Special">% Reg[EBX].i = 0xff;</span>
+<span id="L161" class="LineNr">161 </span>== <span class="Constant">0x1</span>
+<span id="L162" class="LineNr">162 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L163" class="LineNr">163 </span>  <span class="Constant">81</span>  e3                          0a 0b 0c 0d  <span class="Comment"># and 0x0d0c0b0a with EBX</span>
+<span id="L164" class="LineNr">164 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 100 (and imm32) 011 (dest EBX)</span>
+<span id="L165" class="LineNr">165 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L166" class="LineNr">166 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L167" class="LineNr">167 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L168" class="LineNr">168 </span><span class="traceContains">+run: subop and</span>
+<span id="L169" class="LineNr">169 </span><span class="traceContains">+run: storing 0x0000000a</span>
+<span id="L170" class="LineNr">170 </span>
+<span id="L171" class="LineNr">171 </span><span class="SalientComment">//:: or</span>
+<span id="L172" class="LineNr">172 </span>
+<span id="L173" class="LineNr">173 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L174" class="LineNr">174 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;0d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise OR of imm32 with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L175" class="LineNr">175 </span>
+<span id="L176" class="LineNr">176 </span><span class="Delimiter">:(scenario or_imm32_with_eax)</span>
+<span id="L177" class="LineNr">177 </span><span class="Special">% Reg[EAX].i = 0xd0c0b0a0;</span>
+<span id="L178" class="LineNr">178 </span>== <span class="Constant">0x1</span>
+<span id="L179" class="LineNr">179 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L180" class="LineNr">180 </span>  0d                              0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EAX</span>
+<span id="L181" class="LineNr">181 </span><span class="traceContains">+run: or imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L182" class="LineNr">182 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L183" class="LineNr">183 </span>
+<span id="L184" class="LineNr">184 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L185" class="LineNr">185 </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="L186" class="LineNr">186 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L187" class="LineNr">187 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L188" class="LineNr">188 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L189" class="LineNr">189 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L190" class="LineNr">190 </span><span class="Delimiter">}</span>
+<span id="L191" class="LineNr">191 </span>
+<span id="L192" class="LineNr">192 </span><span class="Comment">//:</span>
+<span id="L193" class="LineNr">193 </span>
+<span id="L194" class="LineNr">194 </span><span class="Delimiter">:(scenario or_imm32_with_mem_at_r32)</span>
+<span id="L195" class="LineNr">195 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L196" class="LineNr">196 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L197" class="LineNr">197 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L198" class="LineNr">198 </span>  <span class="Constant">81</span>  0b                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with *EBX</span>
+<span id="L199" class="LineNr">199 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 001 (or imm32) 011 (dest EBX)</span>
+<span id="L200" class="LineNr">200 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L201" class="LineNr">201 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
+<span id="L202" class="LineNr">202 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L203" class="LineNr">203 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L204" class="LineNr">204 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L205" class="LineNr">205 </span><span class="traceContains">+run: subop or</span>
+<span id="L206" class="LineNr">206 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L207" class="LineNr">207 </span>
+<span id="L208" class="LineNr">208 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L209" class="LineNr">209 </span><span class="Normal">case</span> <span class="Constant">1</span>: <span class="Delimiter">{</span>
+<span id="L210" class="LineNr">210 </span>  <a href='003trace.cc.html#L196'>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;subop or&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L211" class="LineNr">211 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>|<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L212" class="LineNr">212 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L213" class="LineNr">213 </span><span class="Delimiter">}</span>
+<span id="L214" class="LineNr">214 </span>
+<span id="L215" class="LineNr">215 </span><span class="Delimiter">:(scenario or_imm32_with_r32)</span>
+<span id="L216" class="LineNr">216 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
+<span id="L217" class="LineNr">217 </span>== <span class="Constant">0x1</span>
+<span id="L218" class="LineNr">218 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L219" class="LineNr">219 </span>  <span class="Constant">81</span>  cb                          0a 0b 0c 0d  <span class="Comment"># or 0x0d0c0b0a with EBX</span>
+<span id="L220" class="LineNr">220 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 001 (or imm32) 011 (dest EBX)</span>
+<span id="L221" class="LineNr">221 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L222" class="LineNr">222 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L223" class="LineNr">223 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L224" class="LineNr">224 </span><span class="traceContains">+run: subop or</span>
+<span id="L225" class="LineNr">225 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L226" class="LineNr">226 </span>
+<span id="L227" class="LineNr">227 </span><span class="SalientComment">//:: xor</span>
+<span id="L228" class="LineNr">228 </span>
+<span id="L229" class="LineNr">229 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L230" class="LineNr">230 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;35&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;R0 = bitwise XOR of imm32 with R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>
+<span id="L232" class="LineNr">232 </span><span class="Delimiter">:(scenario xor_imm32_with_eax)</span>
+<span id="L233" class="LineNr">233 </span><span class="Special">% Reg[EAX].i = 0xddccb0a0;</span>
+<span id="L234" class="LineNr">234 </span>== <span class="Constant">0x1</span>
+<span id="L235" class="LineNr">235 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L236" class="LineNr">236 </span>  <span class="Constant">35</span>                              0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EAX</span>
+<span id="L237" class="LineNr">237 </span><span class="traceContains">+run: xor imm32 0x0d0c0b0a with <a href='010---vm.cc.html#L13'>EAX</a></span>
+<span id="L238" class="LineNr">238 </span><span class="traceContains">+run: storing 0xd0c0bbaa</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L241" class="LineNr">241 </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="L242" class="LineNr">242 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L243" class="LineNr">243 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; with EAX&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L244" class="LineNr">244 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L245" class="LineNr">245 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L246" class="LineNr">246 </span><span class="Delimiter">}</span>
+<span id="L247" class="LineNr">247 </span>
+<span id="L248" class="LineNr">248 </span><span class="Comment">//:</span>
+<span id="L249" class="LineNr">249 </span>
+<span id="L250" class="LineNr">250 </span><span class="Delimiter">:(scenario xor_imm32_with_mem_at_r32)</span>
+<span id="L251" class="LineNr">251 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L252" class="LineNr">252 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L253" class="LineNr">253 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Constant">81</span>  <span class="Constant">33</span>                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with *EBX</span>
+<span id="L255" class="LineNr">255 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 110 (xor imm32) 011 (dest EBX)</span>
+<span id="L256" class="LineNr">256 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L257" class="LineNr">257 </span>a0 b0 c0 d0  <span class="Comment"># 0xd0c0b0a0</span>
+<span id="L258" class="LineNr">258 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L259" class="LineNr">259 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L260" class="LineNr">260 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L261" class="LineNr">261 </span><span class="traceContains">+run: subop xor</span>
+<span id="L262" class="LineNr">262 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L263" class="LineNr">263 </span>
+<span id="L264" class="LineNr">264 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L265" class="LineNr">265 </span><span class="Normal">case</span> <span class="Constant">6</span>: <span class="Delimiter">{</span>
+<span id="L266" class="LineNr">266 </span>  <a href='003trace.cc.html#L196'>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;subop xor&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L267" class="LineNr">267 </span>  <a href='010---vm.cc.html#L81'>BINARY_BITWISE_OP</a><span class="Delimiter">(</span>^<span class="Delimiter">,</span> *arg1<span class="Delimiter">,</span> arg2<span class="Delimiter">);</span>
+<span id="L268" class="LineNr">268 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L269" class="LineNr">269 </span><span class="Delimiter">}</span>
+<span id="L270" class="LineNr">270 </span>
+<span id="L271" class="LineNr">271 </span><span class="Delimiter">:(scenario xor_imm32_with_r32)</span>
+<span id="L272" class="LineNr">272 </span><span class="Special">% Reg[EBX].i = 0xd0c0b0a0;</span>
+<span id="L273" class="LineNr">273 </span>== <span class="Constant">0x1</span>
+<span id="L274" class="LineNr">274 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L275" class="LineNr">275 </span>  <span class="Constant">81</span>  f3                          0a 0b 0c 0d  <span class="Comment"># xor 0x0d0c0b0a with EBX</span>
+<span id="L276" class="LineNr">276 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 110 (xor imm32) 011 (dest EBX)</span>
+<span id="L277" class="LineNr">277 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L278" class="LineNr">278 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L279" class="LineNr">279 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L280" class="LineNr">280 </span><span class="traceContains">+run: subop xor</span>
+<span id="L281" class="LineNr">281 </span><span class="traceContains">+run: storing 0xddccbbaa</span>
+<span id="L282" class="LineNr">282 </span>
+<span id="L283" class="LineNr">283 </span><span class="SalientComment">//:: compare (cmp)</span>
 <span id="L284" class="LineNr">284 </span>
-<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L286" class="LineNr">286 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
-<span id="L287" class="LineNr">287 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
-<span id="L288" class="LineNr">288 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L289" class="LineNr">289 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L290" class="LineNr">290 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L291" class="LineNr">291 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L292" class="LineNr">292 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L295" class="LineNr">295 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L296" class="LineNr">296 </span>  <span class="Identifier">break</span><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="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
-<span id="L300" class="LineNr">300 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b07;</span>
-<span id="L301" class="LineNr">301 </span>== <span class="Constant">0x1</span>
-<span id="L302" class="LineNr">302 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L303" class="LineNr">303 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L304" class="LineNr">304 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a</span>
-<span id="L305" class="LineNr">305 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L306" class="LineNr">306 </span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
-<span id="L308" class="LineNr">308 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
-<span id="L309" class="LineNr">309 </span>== <span class="Constant">0x1</span>
-<span id="L310" class="LineNr">310 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L311" class="LineNr">311 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
-<span id="L312" class="LineNr">312 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a</span>
-<span id="L313" class="LineNr">313 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L314" class="LineNr">314 </span>
-<span id="L315" class="LineNr">315 </span><span class="Comment">//:</span>
-<span id="L316" class="LineNr">316 </span>
-<span id="L317" class="LineNr">317 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
-<span id="L318" class="LineNr">318 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L319" class="LineNr">319 </span>== <span class="Constant">0x1</span>
-<span id="L320" class="LineNr">320 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L321" class="LineNr">321 </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="L322" class="LineNr">322 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b07 with r/m32</span>
-<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L325" class="LineNr">325 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L326" class="LineNr">326 </span>
-<span id="L327" class="LineNr">327 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
-<span id="L328" class="LineNr">328 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
-<span id="L329" class="LineNr">329 </span>  <a href='003trace.cc.html#L196'>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;subop compare&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L330" class="LineNr">330 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L331" class="LineNr">331 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L332" class="LineNr">332 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
-<span id="L333" class="LineNr">333 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
-<span id="L335" class="LineNr">335 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L336" class="LineNr">336 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L337" class="LineNr">337 </span><span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L286" class="LineNr">286 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;3d&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;subtract imm32 from R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L287" class="LineNr">287 </span>
+<span id="L288" class="LineNr">288 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_greater)</span>
+<span id="L289" class="LineNr">289 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
+<span id="L290" class="LineNr">290 </span>== <span class="Constant">0x1</span>
+<span id="L291" class="LineNr">291 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L292" class="LineNr">292 </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="L293" class="LineNr">293 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b07</span>
+<span id="L294" class="LineNr">294 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L295" class="LineNr">295 </span>
+<span id="L296" class="LineNr">296 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L297" class="LineNr">297 </span><span class="Normal">case</span> <span class="Constant">0x3d</span>: <span class="Delimiter">{</span>  <span class="Comment">// subtract imm32 from EAX</span>
+<span id="L298" class="LineNr">298 </span>  <span class="Normal">int32_t</span> arg1 = Reg[EAX]<span class="Delimiter">.</span>i<span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L300" class="LineNr">300 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L301" class="LineNr">301 </span>  <span class="Normal">int32_t</span> tmp1 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L303" class="LineNr">303 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L304" class="LineNr">304 </span>  <span class="Normal">int64_t</span> tmp2 = arg1 - arg2<span class="Delimiter">;</span>
+<span id="L305" class="LineNr">305 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L306" class="LineNr">306 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L307" class="LineNr">307 </span>  <span class="Identifier">break</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="Delimiter">:(scenario compare_imm32_with_eax_lesser)</span>
+<span id="L311" class="LineNr">311 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b07;</span>
+<span id="L312" class="LineNr">312 </span>== <span class="Constant">0x1</span>
+<span id="L313" class="LineNr">313 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L314" class="LineNr">314 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
+<span id="L315" class="LineNr">315 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
+<span id="L316" class="LineNr">316 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L317" class="LineNr">317 </span>
+<span id="L318" class="LineNr">318 </span><span class="Delimiter">:(scenario compare_imm32_with_eax_equal)</span>
+<span id="L319" class="LineNr">319 </span><span class="Special">% Reg[EAX].i = 0x0d0c0b0a;</span>
+<span id="L320" class="LineNr">320 </span>== <span class="Constant">0x1</span>
+<span id="L321" class="LineNr">321 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L322" class="LineNr">322 </span>  3d                              0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EAX</span>
+<span id="L323" class="LineNr">323 </span><span class="traceContains">+run: compare <a href='010---vm.cc.html#L13'>EAX</a> and imm32 0x0d0c0b0a</span>
+<span id="L324" class="LineNr">324 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L325" class="LineNr">325 </span>
+<span id="L326" class="LineNr">326 </span><span class="Comment">//:</span>
+<span id="L327" class="LineNr">327 </span>
+<span id="L328" class="LineNr">328 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_greater)</span>
+<span id="L329" class="LineNr">329 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
+<span id="L330" class="LineNr">330 </span>== <span class="Constant">0x1</span>
+<span id="L331" class="LineNr">331 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L332" class="LineNr">332 </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="L333" class="LineNr">333 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L334" class="LineNr">334 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L335" class="LineNr">335 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L336" class="LineNr">336 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
+<span id="L337" class="LineNr">337 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
 <span id="L338" class="LineNr">338 </span>
-<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
-<span id="L340" class="LineNr">340 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b07;</span>
-<span id="L341" class="LineNr">341 </span>== <span class="Constant">0x1</span>
-<span id="L342" class="LineNr">342 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L343" class="LineNr">343 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L344" class="LineNr">344 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L345" class="LineNr">345 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L346" class="LineNr">346 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L347" class="LineNr">347 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L348" class="LineNr">348 </span>
-<span id="L349" class="LineNr">349 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
-<span id="L350" class="LineNr">350 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L351" class="LineNr">351 </span>== <span class="Constant">0x1</span>
-<span id="L352" class="LineNr">352 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
-<span id="L354" class="LineNr">354 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L355" class="LineNr">355 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L356" class="LineNr">356 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L358" class="LineNr">358 </span>
-<span id="L359" class="LineNr">359 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
-<span id="L360" class="LineNr">360 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L361" class="LineNr">361 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L362" class="LineNr">362 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L363" class="LineNr">363 </span>  <span class="Constant">81</span>  3b                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with *EBX</span>
-<span id="L364" class="LineNr">364 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L365" class="LineNr">365 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L366" class="LineNr">366 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L367" class="LineNr">367 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b07 with r/m32</span>
-<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
-<span id="L370" class="LineNr">370 </span>
-<span id="L371" class="LineNr">371 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
-<span id="L372" class="LineNr">372 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L373" class="LineNr">373 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L374" class="LineNr">374 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L375" class="LineNr">375 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L376" class="LineNr">376 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L377" class="LineNr">377 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L378" class="LineNr">378 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
-<span id="L379" class="LineNr">379 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L380" class="LineNr">380 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L381" class="LineNr">381 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
-<span id="L382" class="LineNr">382 </span>
-<span id="L383" class="LineNr">383 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
-<span id="L384" class="LineNr">384 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
-<span id="L385" class="LineNr">385 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L386" class="LineNr">386 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
-<span id="L387" class="LineNr">387 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L388" class="LineNr">388 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
-<span id="L389" class="LineNr">389 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
-<span id="L390" class="LineNr">390 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
-<span id="L391" class="LineNr">391 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
-<span id="L392" class="LineNr">392 </span><span class="traceContains">+run: combine <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a with r/m32</span>
-<span id="L393" class="LineNr">393 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L394" class="LineNr">394 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
-<span id="L395" class="LineNr">395 </span>
-<span id="L396" class="LineNr">396 </span><span class="SalientComment">//:: copy (mov)</span>
-<span id="L397" class="LineNr">397 </span>
-<span id="L398" class="LineNr">398 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L399" class="LineNr">399 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
-<span id="L400" class="LineNr">400 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
-<span id="L401" class="LineNr">401 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
-<span id="L402" class="LineNr">402 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
-<span id="L403" class="LineNr">403 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
-<span id="L404" class="LineNr">404 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
-<span id="L405" class="LineNr">405 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
-<span id="L406" class="LineNr">406 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
-<span id="L407" class="LineNr">407 </span>
-<span id="L408" class="LineNr">408 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
-<span id="L409" class="LineNr">409 </span>== <span class="Constant">0x1</span>
-<span id="L410" class="LineNr">410 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L411" class="LineNr">411 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
-<span id="L412" class="LineNr">412 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
-<span id="L413" class="LineNr">413 </span>
-<span id="L414" class="LineNr">414 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L415" class="LineNr">415 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
-<span id="L416" class="LineNr">416 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
-<span id="L417" class="LineNr">417 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
-<span id="L418" class="LineNr">418 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
-<span id="L419" class="LineNr">419 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
-<span id="L420" class="LineNr">420 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
-<span id="L421" class="LineNr">421 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
-<span id="L422" class="LineNr">422 </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="L423" class="LineNr">423 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
-<span id="L424" class="LineNr">424 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L425" class="LineNr">425 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L426" class="LineNr">426 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
-<span id="L427" class="LineNr">427 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L428" class="LineNr">428 </span><span class="Delimiter">}</span>
-<span id="L429" class="LineNr">429 </span>
-<span id="L430" class="LineNr">430 </span><span class="Comment">//:</span>
-<span id="L431" class="LineNr">431 </span>
-<span id="L432" class="LineNr">432 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L433" class="LineNr">433 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy <a href='011run.cc.html#L299'>imm32</a> to rm32&quot;</span><span class="Delimiter">);</span>
-<span id="L434" class="LineNr">434 </span>
-<span id="L435" class="LineNr">435 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
-<span id="L436" class="LineNr">436 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
-<span id="L437" class="LineNr">437 </span>== <span class="Constant">0x1</span>
-<span id="L438" class="LineNr">438 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L439" class="LineNr">439 </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="L440" class="LineNr">440 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
-<span id="L441" class="LineNr">441 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0d0c0b0a to r/m32</span>
-<span id="L442" class="LineNr">442 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
-<span id="L443" class="LineNr">443 </span>
-<span id="L444" class="LineNr">444 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L445" class="LineNr">445 </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="L446" class="LineNr">446 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
-<span id="L447" class="LineNr">447 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L448" class="LineNr">448 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L449" class="LineNr">449 </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="L450" class="LineNr">450 </span>  *arg1 = arg2<span class="Delimiter">;</span>
-<span id="L451" class="LineNr">451 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L452" class="LineNr">452 </span><span class="Delimiter">}</span>
-<span id="L453" class="LineNr">453 </span>
-<span id="L454" class="LineNr">454 </span><span class="SalientComment">//:: push</span>
-<span id="L455" class="LineNr">455 </span>
-<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
-<span id="L457" class="LineNr">457 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push <a href='011run.cc.html#L299'>imm32</a> to stack&quot;</span><span class="Delimiter">);</span>
-<span id="L458" class="LineNr">458 </span>
-<span id="L459" class="LineNr">459 </span><span class="Delimiter">:(scenario push_imm32)</span>
-<span id="L460" class="LineNr">460 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
-<span id="L461" class="LineNr">461 </span>== <span class="Constant">0x1</span>
-<span id="L462" class="LineNr">462 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
-<span id="L463" class="LineNr">463 </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="L464" class="LineNr">464 </span><span class="traceContains">+run: <a href='012elf.cc.html#L85'>push</a> <a href='011run.cc.html#L299'>imm32</a> 0x000000af</span>
-<span id="L465" class="LineNr">465 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
-<span id="L466" class="LineNr">466 </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="L467" class="LineNr">467 </span>
-<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
-<span id="L469" class="LineNr">469 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
-<span id="L470" class="LineNr">470 </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#L299'>imm32</a><span class="Delimiter">());</span>
-<span id="L471" class="LineNr">471 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L472" class="LineNr">472 </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="L473" class="LineNr">473 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
-<span id="L474" class="LineNr">474 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L475" class="LineNr">475 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L476" class="LineNr">476 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
-<span id="L477" class="LineNr">477 </span><span class="Delimiter">}</span>
+<span id="L339" class="LineNr">339 </span><span class="Delimiter">:(before &quot;End Op 81 Subops&quot;)</span>
+<span id="L340" class="LineNr">340 </span><span class="Normal">case</span> <span class="Constant">7</span>: <span class="Delimiter">{</span>
+<span id="L341" class="LineNr">341 </span>  <a href='003trace.cc.html#L196'>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;subop compare&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L342" class="LineNr">342 </span>  <span class="Normal">int32_t</span> tmp1 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L343" class="LineNr">343 </span>  SF = <span class="Delimiter">(</span>tmp1 &lt; <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L344" class="LineNr">344 </span>  ZF = <span class="Delimiter">(</span>tmp1 == <span class="Constant">0</span><span class="Delimiter">);</span>
+<span id="L345" class="LineNr">345 </span>  <span class="Normal">int64_t</span> tmp2 = *arg1 - arg2<span class="Delimiter">;</span>
+<span id="L346" class="LineNr">346 </span>  <a href='010---vm.cc.html#L59'>OF</a> = <span class="Delimiter">(</span>tmp1 != tmp2<span class="Delimiter">);</span>
+<span id="L347" class="LineNr">347 </span>  <a href='003trace.cc.html#L196'>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;SF=&quot;</span> &lt;&lt; SF &lt;&lt; <span class="Constant">&quot;; ZF=&quot;</span> &lt;&lt; ZF &lt;&lt; <span class="Constant">&quot;; OF=&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L59'>OF</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L348" class="LineNr">348 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L349" class="LineNr">349 </span><span class="Delimiter">}</span>
+<span id="L350" class="LineNr">350 </span>
+<span id="L351" class="LineNr">351 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_lesser)</span>
+<span id="L352" class="LineNr">352 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b07;</span>
+<span id="L353" class="LineNr">353 </span>== <span class="Constant">0x1</span>
+<span id="L354" class="LineNr">354 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L355" class="LineNr">355 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
+<span id="L356" class="LineNr">356 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L357" class="LineNr">357 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L358" class="LineNr">358 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L359" class="LineNr">359 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L360" class="LineNr">360 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L361" class="LineNr">361 </span>
+<span id="L362" class="LineNr">362 </span><span class="Delimiter">:(scenario compare_imm32_with_r32_equal)</span>
+<span id="L363" class="LineNr">363 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
+<span id="L364" class="LineNr">364 </span>== <span class="Constant">0x1</span>
+<span id="L365" class="LineNr">365 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Constant">81</span>  fb                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with EBX</span>
+<span id="L367" class="LineNr">367 </span><span class="Comment"># ModR/M in binary: 11 (direct mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L368" class="LineNr">368 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L369" class="LineNr">369 </span><span class="traceContains">+run: r/m32 is <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L370" class="LineNr">370 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L371" class="LineNr">371 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L372" class="LineNr">372 </span>
+<span id="L373" class="LineNr">373 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_greater)</span>
+<span id="L374" class="LineNr">374 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L375" class="LineNr">375 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L376" class="LineNr">376 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L377" class="LineNr">377 </span>  <span class="Constant">81</span>  3b                          <span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b07 with *EBX</span>
+<span id="L378" class="LineNr">378 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L379" class="LineNr">379 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L380" class="LineNr">380 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
+<span id="L381" class="LineNr">381 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L382" class="LineNr">382 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L383" class="LineNr">383 </span><span class="traceContains">+run: imm32 is 0x0d0c0b07</span>
+<span id="L384" class="LineNr">384 </span><span class="traceContains">+run: SF=0; ZF=0; OF=0</span>
+<span id="L385" class="LineNr">385 </span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_lesser)</span>
+<span id="L387" class="LineNr">387 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L388" class="LineNr">388 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L389" class="LineNr">389 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L390" class="LineNr">390 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
+<span id="L391" class="LineNr">391 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L392" class="LineNr">392 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L393" class="LineNr">393 </span><span class="PreProc">0</span><span class="Constant">7</span> 0b 0c 0d  <span class="Comment"># 0x0d0c0b07</span>
+<span id="L394" class="LineNr">394 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L395" class="LineNr">395 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L396" class="LineNr">396 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L397" class="LineNr">397 </span><span class="traceContains">+run: SF=1; ZF=0; OF=0</span>
+<span id="L398" class="LineNr">398 </span>
+<span id="L399" class="LineNr">399 </span><span class="Delimiter">:(scenario compare_imm32_with_mem_at_r32_equal)</span>
+<span id="L400" class="LineNr">400 </span><span class="Special">% Reg[EBX].i = 0x0d0c0b0a;</span>
+<span id="L401" class="LineNr">401 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L402" class="LineNr">402 </span>== <span class="Constant">0x01</span>  <span class="Comment"># code segment</span>
+<span id="L403" class="LineNr">403 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L404" class="LineNr">404 </span>  <span class="Constant">81</span>  3b                          0a 0b 0c 0d  <span class="Comment"># compare 0x0d0c0b0a with *EBX</span>
+<span id="L405" class="LineNr">405 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 111 (compare imm32) 011 (dest EBX)</span>
+<span id="L406" class="LineNr">406 </span>== <span class="Constant">0x60</span>  <span class="Comment"># data segment</span>
+<span id="L407" class="LineNr">407 </span>0a 0b 0c 0d  <span class="Comment"># 0x0d0c0b0a</span>
+<span id="L408" class="LineNr">408 </span><span class="traceContains">+run: combine imm32 with r/m32</span>
+<span id="L409" class="LineNr">409 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L410" class="LineNr">410 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L411" class="LineNr">411 </span><span class="traceContains">+run: SF=0; ZF=1; OF=0</span>
+<span id="L412" class="LineNr">412 </span>
+<span id="L413" class="LineNr">413 </span><span class="SalientComment">//:: copy (mov)</span>
+<span id="L414" class="LineNr">414 </span>
+<span id="L415" class="LineNr">415 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L416" class="LineNr">416 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b8&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R0 (EAX)&quot;</span><span class="Delimiter">);</span>
+<span id="L417" class="LineNr">417 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;b9&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R1 (ECX)&quot;</span><span class="Delimiter">);</span>
+<span id="L418" class="LineNr">418 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;ba&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R2 (EDX)&quot;</span><span class="Delimiter">);</span>
+<span id="L419" class="LineNr">419 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bb&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R3 (EBX)&quot;</span><span class="Delimiter">);</span>
+<span id="L420" class="LineNr">420 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bc&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R4 (ESP)&quot;</span><span class="Delimiter">);</span>
+<span id="L421" class="LineNr">421 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bd&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R5 (EBP)&quot;</span><span class="Delimiter">);</span>
+<span id="L422" class="LineNr">422 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;be&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R6 (ESI)&quot;</span><span class="Delimiter">);</span>
+<span id="L423" class="LineNr">423 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;bf&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to R7 (EDI)&quot;</span><span class="Delimiter">);</span>
+<span id="L424" class="LineNr">424 </span>
+<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario copy_imm32_to_r32)</span>
+<span id="L426" class="LineNr">426 </span>== <span class="Constant">0x1</span>
+<span id="L427" class="LineNr">427 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L428" class="LineNr">428 </span>  bb                              0a 0b 0c 0d  <span class="Comment"># copy 0x0d0c0b0a to EBX</span>
+<span id="L429" class="LineNr">429 </span><span class="traceContains">+run: copy imm32 0x0d0c0b0a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L430" class="LineNr">430 </span>
+<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L432" class="LineNr">432 </span><span class="Normal">case</span> <span class="Constant">0xb8</span>:
+<span id="L433" class="LineNr">433 </span><span class="Normal">case</span> <span class="Constant">0xb9</span>:
+<span id="L434" class="LineNr">434 </span><span class="Normal">case</span> <span class="Constant">0xba</span>:
+<span id="L435" class="LineNr">435 </span><span class="Normal">case</span> <span class="Constant">0xbb</span>:
+<span id="L436" class="LineNr">436 </span><span class="Normal">case</span> <span class="Constant">0xbc</span>:
+<span id="L437" class="LineNr">437 </span><span class="Normal">case</span> <span class="Constant">0xbd</span>:
+<span id="L438" class="LineNr">438 </span><span class="Normal">case</span> <span class="Constant">0xbe</span>:
+<span id="L439" class="LineNr">439 </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="L440" class="LineNr">440 </span>  <span class="Normal">uint8_t</span> reg1 = op &amp; <span class="Constant">0x7</span><span class="Delimiter">;</span>
+<span id="L441" class="LineNr">441 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L442" class="LineNr">442 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <span class="Constant">&quot; to &quot;</span> &lt;&lt; <a href='013direct_addressing.cc.html#L50'>rname</a><span class="Delimiter">(</span>reg1<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L443" class="LineNr">443 </span>  Reg[reg1]<span class="Delimiter">.</span>i = arg2<span class="Delimiter">;</span>
+<span id="L444" class="LineNr">444 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L445" class="LineNr">445 </span><span class="Delimiter">}</span>
+<span id="L446" class="LineNr">446 </span>
+<span id="L447" class="LineNr">447 </span><span class="Comment">//:</span>
+<span id="L448" class="LineNr">448 </span>
+<span id="L449" class="LineNr">449 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L450" class="LineNr">450 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;c7&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;copy imm32 to rm32&quot;</span><span class="Delimiter">);</span>
+<span id="L451" class="LineNr">451 </span>
+<span id="L452" class="LineNr">452 </span><span class="Delimiter">:(scenario copy_imm32_to_mem_at_r32)</span>
+<span id="L453" class="LineNr">453 </span><span class="Special">% Reg[EBX].i = 0x60;</span>
+<span id="L454" class="LineNr">454 </span>== <span class="Constant">0x1</span>
+<span id="L455" class="LineNr">455 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L456" class="LineNr">456 </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="L457" class="LineNr">457 </span><span class="Comment"># ModR/M in binary: 00 (indirect mode) 000 (unused) 011 (dest EBX)</span>
+<span id="L458" class="LineNr">458 </span><span class="traceContains">+run: copy imm32 to r/m32</span>
+<span id="L459" class="LineNr">459 </span><span class="traceContains">+run: effective address is 0x60 (EBX)</span>
+<span id="L460" class="LineNr">460 </span><span class="traceContains">+run: imm32 is 0x0d0c0b0a</span>
+<span id="L461" class="LineNr">461 </span>
+<span id="L462" class="LineNr">462 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L463" class="LineNr">463 </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="L464" class="LineNr">464 </span>  <span class="Normal">uint8_t</span> modrm = <a href='010---vm.cc.html#L214'>next</a><span class="Delimiter">();</span>
+<span id="L465" class="LineNr">465 </span>  <a href='003trace.cc.html#L196'>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; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L466" class="LineNr">466 </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="L467" class="LineNr">467 </span>  <span class="Normal">int32_t</span> arg2 = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L468" class="LineNr">468 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; arg2 &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L469" class="LineNr">469 </span>  *arg1 = arg2<span class="Delimiter">;</span>
+<span id="L470" class="LineNr">470 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L471" class="LineNr">471 </span><span class="Delimiter">}</span>
+<span id="L472" class="LineNr">472 </span>
+<span id="L473" class="LineNr">473 </span><span class="SalientComment">//:: push</span>
+<span id="L474" class="LineNr">474 </span>
+<span id="L475" class="LineNr">475 </span><span class="Delimiter">:(before &quot;End Initialize Op Names(name)&quot;)</span>
+<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> <span class="Constant">&quot;68&quot;</span><span class="Delimiter">,</span> <span class="Constant">&quot;push imm32 to stack&quot;</span><span class="Delimiter">);</span>
+<span id="L477" class="LineNr">477 </span>
+<span id="L478" class="LineNr">478 </span><span class="Delimiter">:(scenario push_imm32)</span>
+<span id="L479" class="LineNr">479 </span><span class="Special">% Reg[ESP].u = 0x14;</span>
+<span id="L480" class="LineNr">480 </span>== <span class="Constant">0x1</span>
+<span id="L481" class="LineNr">481 </span><span class="Comment"># op  ModR/M  SIB   displacement  immediate</span>
+<span id="L482" class="LineNr">482 </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="L483" class="LineNr">483 </span><span class="traceContains">+run: <a href='012elf.cc.html#L84'>push</a> imm32 0x000000af</span>
+<span id="L484" class="LineNr">484 </span><span class="traceContains">+run: <a href='010---vm.cc.html#L17'>ESP</a> is now 0x00000010</span>
+<span id="L485" class="LineNr">485 </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="L486" class="LineNr">486 </span>
+<span id="L487" class="LineNr">487 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
+<span id="L488" class="LineNr">488 </span><span class="Normal">case</span> <span class="Constant">0x68</span>: <span class="Delimiter">{</span>
+<span id="L489" class="LineNr">489 </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#L299'>next32</a><span class="Delimiter">());</span>
+<span id="L490" class="LineNr">490 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; val &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L491" class="LineNr">491 </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="L492" class="LineNr">492 </span>  <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span>val<span class="Delimiter">);</span>
+<span id="L493" class="LineNr">493 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; Reg[ESP]<span class="Delimiter">.</span>u &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L494" class="LineNr">494 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L110'>read_mem_u32</a><span class="Delimiter">(</span>Reg[ESP]<span class="Delimiter">.</span>u<span class="Delimiter">)</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L495" class="LineNr">495 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
+<span id="L496" class="LineNr">496 </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 e3ec8245..88b04d6f 100644
--- a/html/subx/016index_addressing.cc.html
+++ b/html/subx/016index_addressing.cc.html
@@ -92,7 +92,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr"> 30 </span>  <span class="Delimiter">}</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
 <span id="L32" class="LineNr"> 32 </span>    <span class="Comment">// base == EBP &amp;&amp; mod == 0</span>
-<span id="L33" class="LineNr"> 33 </span>    addr = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
+<span id="L33" class="LineNr"> 33 </span>    addr = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>  <span class="Comment">// ignore base</span>
 <span id="L34" class="LineNr"> 34 </span>    <a href='003trace.cc.html#L196'>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;effective address is initially 0x&quot;</span> &lt;&lt; std::hex &lt;&lt; addr &lt;&lt; <span class="Constant">&quot; (disp32)&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  <span class="Normal">uint8_t</span> index = <span class="Delimiter">(</span>sib&gt;&gt;<span class="Constant">3</span><span class="Delimiter">)</span>&amp;<span class="Constant">0x7</span><span class="Delimiter">;</span>
diff --git a/html/subx/019functions.cc.html b/html/subx/019functions.cc.html
index bac71cb5..293d6160 100644
--- a/html/subx/019functions.cc.html
+++ b/html/subx/019functions.cc.html
@@ -72,17 +72,17 @@ 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 <a href='011run.cc.html#L299'>imm32</a> 0x000000a0</span>
+<span id="L12" class="LineNr">12 </span><span class="traceContains">+run: call imm32 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>
 <span id="L16" class="LineNr">16 </span>
 <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">int32_t</span> offset = <a href='011run.cc.html#L299'>imm32</a><span class="Delimiter">();</span>
-<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L196'>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='011run.cc.html#L299'>imm32</a> 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L19" class="LineNr">19 </span>  <span class="Normal">int32_t</span> offset = <a href='011run.cc.html#L299'>next32</a><span class="Delimiter">();</span>
+<span id="L20" class="LineNr">20 </span>  <a href='003trace.cc.html#L196'>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#L260'>HEXWORD</a> &lt;&lt; offset &lt;&lt; <a href='003trace.cc.html#L222'>end</a><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#L85'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
+<span id="L22" class="LineNr">22 </span>  <a href='012elf.cc.html#L84'>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>
 <span id="L24" class="LineNr">24 </span>  <a href='003trace.cc.html#L196'>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;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L25" class="LineNr">25 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -107,7 +107,7 @@ if ('onhashchange' in window) {
 <span id="L44" class="LineNr">44 </span><span class="Normal">case</span> <span class="Constant">2</span>: <span class="Delimiter">{</span>  <span class="Comment">// call function pointer at r/m32</span>
 <span id="L45" class="LineNr">45 </span>  <a href='003trace.cc.html#L196'>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 to r/m32&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L46" class="LineNr">46 </span>  <span class="Normal">int32_t</span>* offset = <a href='013direct_addressing.cc.html#L31'>effective_address</a><span class="Delimiter">(</span>modrm<span class="Delimiter">);</span>
-<span id="L47" class="LineNr">47 </span>  <a href='012elf.cc.html#L85'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
+<span id="L47" class="LineNr">47 </span>  <a href='012elf.cc.html#L84'>push</a><span class="Delimiter">(</span><a href='010---vm.cc.html#L29'>EIP</a><span class="Delimiter">);</span>
 <span id="L48" class="LineNr">48 </span>  <a href='010---vm.cc.html#L29'>EIP</a> += *offset<span class="Delimiter">;</span>
 <span id="L49" class="LineNr">49 </span>  <a href='003trace.cc.html#L196'>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;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L50" class="LineNr">50 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
@@ -147,7 +147,7 @@ if ('onhashchange' in window) {
 <span id="L84" class="LineNr">84 </span><span class="Delimiter">:(before &quot;End Single-Byte Opcodes&quot;)</span>
 <span id="L85" class="LineNr">85 </span><span class="Normal">case</span> <span class="Constant">0xc3</span>: <span class="Delimiter">{</span>  <span class="Comment">// return from a call</span>
 <span id="L86" class="LineNr">86 </span>  <a href='003trace.cc.html#L196'>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;return&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L412'>pop</a><span class="Delimiter">();</span>
+<span id="L87" class="LineNr">87 </span>  <a href='010---vm.cc.html#L29'>EIP</a> = <a href='013direct_addressing.cc.html#L452'>pop</a><span class="Delimiter">();</span>
 <span id="L88" class="LineNr">88 </span>  <a href='003trace.cc.html#L196'>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;jumping to 0x&quot;</span> &lt;&lt; <a href='010---vm.cc.html#L260'>HEXWORD</a> &lt;&lt; <a href='010---vm.cc.html#L29'>EIP</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L89" class="LineNr">89 </span>  <span class="Identifier">break</span><span class="Delimiter">;</span>
 <span id="L90" class="LineNr">90 </span><span class="Delimiter">}</span>
diff --git a/html/subx/028translate.cc.html b/html/subx/028translate.cc.html
index c9b3a369..a617a359 100644
--- a/html/subx/028translate.cc.html
+++ b/html/subx/028translate.cc.html
@@ -166,7 +166,7 @@ if ('onhashchange' in window) {
 <span id="L106" class="LineNr">106 </span>    emit<span class="Delimiter">(</span>p_start<span class="Delimiter">);</span>
 <span id="L107" class="LineNr">107 </span>    <span class="Comment">// p_filesz</span>
 <span id="L108" class="LineNr">108 </span>    <span class="Normal">uint32_t</span> size = <a href='028translate.cc.html#L152'>num_words</a><span class="Delimiter">(</span>p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">));</span>
-<span id="L109" class="LineNr">109 </span>    assert<span class="Delimiter">(</span>p_offset + size &lt; <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
+<span id="L109" class="LineNr">109 </span>    assert<span class="Delimiter">(</span>p_offset + size &lt; <a href='012elf.cc.html#L126'>SEGMENT_SIZE</a><span class="Delimiter">);</span>
 <span id="L110" class="LineNr">110 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
 <span id="L111" class="LineNr">111 </span>    <span class="Comment">// p_memsz</span>
 <span id="L112" class="LineNr">112 </span>    emit<span class="Delimiter">(</span>size<span class="Delimiter">);</span>
diff --git a/html/subx/030---operands.cc.html b/html/subx/030---operands.cc.html
index 207b0e05..b09c4518 100644
--- a/html/subx/030---operands.cc.html
+++ b/html/subx/030---operands.cc.html
@@ -80,7 +80,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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L20" class="LineNr"> 20 </span>  <span class="Constant">&quot;any type.</span><span class="cSpecial">\n</span><span class="Constant">&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.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
-<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L399'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
+<span id="L22" class="LineNr"> 22 </span>  <span class="Constant">&quot;The complete list of operand <a href='031check_operands.cc.html#L398'>types</a>: mod, subop, r32 (register), rm32</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L23" class="LineNr"> 23 </span>  <span class="Constant">&quot;(register or memory), scale, index, base, disp8, disp16, disp32, imm8,</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
 <span id="L24" class="LineNr"> 24 </span>  <span class="Constant">&quot;imm32.</span><span class="cSpecial">\n</span><span class="Constant">&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.</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span>
@@ -96,7 +96,7 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr"> 35 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
 <span id="L36" class="LineNr"> 36 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
 <span id="L37" class="LineNr"> 37 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L38" class="LineNr"> 38 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L39" class="LineNr"> 39 </span>
 <span id="L40" class="LineNr"> 40 </span><span class="Comment">//: complete set of valid operand types</span>
 <span id="L41" class="LineNr"> 41 </span>
@@ -405,7 +405,7 @@ if ('onhashchange' in window) {
 <span id="L344" class="LineNr">344 </span>  bb                                                                                                                              <span class="Constant">0x2a</span>/imm32        <span class="Comment"># copy 42 to EBX</span>
 <span id="L345" class="LineNr">345 </span><span class="traceContains">+transform: packing instruction 'bb 0x2a/imm32'</span>
 <span id="L346" class="LineNr">346 </span><span class="traceContains">+transform: instruction after packing: 'bb 2a 00 00 00'</span>
-<span id="L347" class="LineNr">347 </span><span class="traceContains">+run: copy <a href='011run.cc.html#L299'>imm32</a> 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
+<span id="L347" class="LineNr">347 </span><span class="traceContains">+run: copy imm32 0x0000002a to <a href='010---vm.cc.html#L16'>EBX</a></span>
 <span id="L348" class="LineNr">348 </span>
 <span id="L349" class="LineNr">349 </span><span class="Delimiter">:(scenarios transform)</span>
 <span id="L350" class="LineNr">350 </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 73dacb99..10b640a4 100644
--- a/html/subx/031check_operands.cc.html
+++ b/html/subx/031check_operands.cc.html
@@ -90,18 +90,18 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr"> 26 </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="L27" class="LineNr"> 27 </span>  <a href='011run.cc.html#L120'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">));</span>
 <span id="L28" class="LineNr"> 28 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L485'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L29" class="LineNr"> 29 </span>    <a href='031check_operands.cc.html#L484'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L30" class="LineNr"> 30 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L31" class="LineNr"> 31 </span>  <span class="Delimiter">}</span>
 <span id="L32" class="LineNr"> 32 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L453'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L33" class="LineNr"> 33 </span>    <a href='031check_operands.cc.html#L452'>check_operands_f3</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
 <span id="L34" class="LineNr"> 34 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
 <span id="L35" class="LineNr"> 35 </span>  <span class="Delimiter">}</span>
 <span id="L36" class="LineNr"> 36 </span>  check_operands<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
 <span id="L37" class="LineNr"> 37 </span><span class="Delimiter">}</span>
 <span id="L38" class="LineNr"> 38 </span>
 <span id="L39" class="LineNr"> 39 </span><a href='011run.cc.html#L120'>word</a> <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span><a href='011run.cc.html#L120'>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="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <a href='031check_operands.cc.html#L510'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
+<span id="L40" class="LineNr"> 40 </span>  op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = <a href='031check_operands.cc.html#L509'>tolower</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>c_str<span class="Delimiter">());</span>
 <span id="L41" class="LineNr"> 41 </span>  <span class="Comment">// opcodes can't be negative</span>
 <span id="L42" class="LineNr"> 42 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L93'>starts_with</a><span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">,</span> <span class="Constant">&quot;0x&quot;</span><span class="Delimiter">))</span>
 <span id="L43" class="LineNr"> 43 </span>    op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> = op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">.</span>substr<span class="Delimiter">(</span><span class="Constant">2</span><span class="Delimiter">);</span>
@@ -247,343 +247,342 @@ if ('onhashchange' in window) {
 <span id="L183" class="LineNr">183 </span>  <span class="Comment">// or</span>
 <span id="L184" class="LineNr">184 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L185" class="LineNr">185 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L186" class="LineNr">186 </span>  <span class="Comment">// complement</span>
-<span id="L187" class="LineNr">187 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> <span class="Constant">&quot;f7&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">// xor</span>
-<span id="L189" class="LineNr">189 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L190" class="LineNr">190 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L191" class="LineNr">191 </span>  <span class="Comment">// compare</span>
-<span id="L192" class="LineNr">192 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L194" class="LineNr">194 </span>  <span class="Comment">// copy</span>
-<span id="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L197" class="LineNr">197 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L199" class="LineNr">199 </span>  <span class="Comment">// swap</span>
-<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L201" class="LineNr">201 </span>  <span class="Comment">// pop</span>
-<span id="L202" class="LineNr">202 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L203" class="LineNr">203 </span>
-<span id="L204" class="LineNr">204 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
-<span id="L205" class="LineNr">205 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L206" class="LineNr">206 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
-<span id="L207" class="LineNr">207 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L208" class="LineNr">208 </span>
-<span id="L209" class="LineNr">209 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
-<span id="L210" class="LineNr">210 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L211" class="LineNr">211 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
-<span id="L212" class="LineNr">212 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L213" class="LineNr">213 </span>
-<span id="L214" class="LineNr">214 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
-<span id="L215" class="LineNr">215 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L216" class="LineNr">216 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
-<span id="L217" class="LineNr">217 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L218" class="LineNr">218 </span>
-<span id="L219" class="LineNr">219 </span>  <span class="Comment">// End Init Permitted Operands</span>
-<span id="L220" class="LineNr">220 </span><span class="Delimiter">}</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><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
-<span id="L224" class="LineNr">224 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
-<span id="L225" class="LineNr">225 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
-<span id="L226" class="LineNr">226 </span>
-<span id="L227" class="LineNr">227 </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="L228" class="LineNr">228 </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="L229" class="LineNr">229 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
-<span id="L230" class="LineNr">230 </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#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L231" class="LineNr">231 </span>    <a href='031check_operands.cc.html#L323'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L232" class="LineNr">232 </span>    <a href='031check_operands.cc.html#L350'>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="L233" class="LineNr">233 </span>  <span class="Delimiter">}</span>
-<span id="L234" class="LineNr">234 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L235" class="LineNr">235 </span>    <a href='031check_operands.cc.html#L241'>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="L236" class="LineNr">236 </span>  <span class="Delimiter">}</span>
-<span id="L237" class="LineNr">237 </span><span class="Delimiter">}</span>
-<span id="L238" class="LineNr">238 </span>
-<span id="L239" class="LineNr">239 </span><span class="Comment">//: Many instructions can be checked just by comparing bitvectors.</span>
-<span id="L240" class="LineNr">240 </span>
-<span id="L241" class="LineNr">241 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L241'>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="L242" class="LineNr">242 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L274'>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="L243" class="LineNr">243 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L244" class="LineNr">244 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>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="L245" class="LineNr">245 </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="L246" class="LineNr">246 </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#L69'>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="L247" class="LineNr">247 </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="L248" class="LineNr">248 </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="L249" class="LineNr">249 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L250" class="LineNr">250 </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="L251" class="LineNr">251 </span>      <a href='003trace.cc.html#L203'>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#L259'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L252" class="LineNr">252 </span>    <span class="Normal">else</span>
-<span id="L253" class="LineNr">253 </span>      <a href='003trace.cc.html#L203'>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#L259'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L254" class="LineNr">254 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L255" class="LineNr">255 </span>  <span class="Delimiter">}</span>
-<span id="L256" class="LineNr">256 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L257" class="LineNr">257 </span><span class="Delimiter">}</span>
-<span id="L258" class="LineNr">258 </span>
-<span id="L259" class="LineNr">259 </span>string <a href='031check_operands.cc.html#L259'>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="L260" class="LineNr">260 </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="L261" class="LineNr">261 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
-<span id="L262" class="LineNr">262 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
-<span id="L263" class="LineNr">263 </span><span class="Delimiter">}</span>
-<span id="L264" class="LineNr">264 </span>
-<span id="L265" class="LineNr">265 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L265'>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="L266" class="LineNr">266 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L267" class="LineNr">267 </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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L268" class="LineNr">268 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L291'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><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><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
-<span id="L270" class="LineNr">270 </span>  <span class="Delimiter">}</span>
-<span id="L271" class="LineNr">271 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
-<span id="L272" class="LineNr">272 </span><span class="Delimiter">}</span>
-<span id="L273" class="LineNr">273 </span>
-<span id="L274" class="LineNr">274 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L274'>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="L275" class="LineNr">275 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L278'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</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><span class="Normal">int</span> <a href='031check_operands.cc.html#L278'>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="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <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="L280" class="LineNr">280 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L281" class="LineNr">281 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
-<span id="L282" class="LineNr">282 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
-<span id="L283" class="LineNr">283 </span>    <span class="Normal">else</span>
-<span id="L284" class="LineNr">284 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
-<span id="L285" class="LineNr">285 </span>  <span class="Delimiter">}</span>
-<span id="L286" class="LineNr">286 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
-<span id="L287" class="LineNr">287 </span><span class="Delimiter">}</span>
-<span id="L288" class="LineNr">288 </span>
-<span id="L289" class="LineNr">289 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
-<span id="L290" class="LineNr">290 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
-<span id="L291" class="LineNr">291 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L291'>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="L292" class="LineNr">292 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
-<span id="L293" class="LineNr">293 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
-<span id="L294" class="LineNr">294 </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#L157'>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="L295" class="LineNr">295 </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="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><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="L297" class="LineNr">297 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L298" class="LineNr">298 </span>      <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L299" class="LineNr">299 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
-<span id="L300" class="LineNr">300 </span>    <span class="Delimiter">}</span>
-<span id="L301" class="LineNr">301 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
-<span id="L302" class="LineNr">302 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
-<span id="L303" class="LineNr">303 </span>  <span class="Delimiter">}</span>
-<span id="L304" class="LineNr">304 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
-<span id="L305" class="LineNr">305 </span><span class="Delimiter">}</span>
-<span id="L306" class="LineNr">306 </span>
-<span id="L307" class="LineNr">307 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
-<span id="L308" class="LineNr">308 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L309" class="LineNr">309 </span>== <span class="Constant">0x1</span>
-<span id="L310" class="LineNr">310 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
-<span id="L311" class="LineNr">311 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
-<span id="L312" class="LineNr">312 </span>
-<span id="L313" class="LineNr">313 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
-<span id="L314" class="LineNr">314 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
-<span id="L315" class="LineNr">315 </span>
-<span id="L316" class="LineNr">316 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
-<span id="L317" class="LineNr">317 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L318" class="LineNr">318 </span>== <span class="Constant">0x1</span>
-<span id="L319" class="LineNr">319 </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="L320" class="LineNr">320 </span><span class="traceContains">+error: '81 0/add/subop 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing mod operand</span>
-<span id="L321" class="LineNr">321 </span>
-<span id="L322" class="LineNr">322 </span><span class="Delimiter">:(code)</span>
-<span id="L323" class="LineNr">323 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L323'>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="L324" class="LineNr">324 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<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="L325" class="LineNr">325 </span>  <a href='031check_operands.cc.html#L370'>check_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="L326" class="LineNr">326 </span>  <a href='031check_operands.cc.html#L370'>check_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="L327" class="LineNr">327 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
-<span id="L328" class="LineNr">328 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <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="L329" class="LineNr">329 </span>    <a href='031check_operands.cc.html#L370'>check_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="L330" class="LineNr">330 </span>    <a href='031check_operands.cc.html#L375'>check_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="L331" class="LineNr">331 </span>  <span class="Delimiter">}</span>
-<span id="L332" class="LineNr">332 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L333" class="LineNr">333 </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><a href='011run.cc.html#L122'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L334" class="LineNr">334 </span>  <span class="Comment">// SIB byte checks</span>
-<span id="L335" class="LineNr">335 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L229'>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><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
-<span id="L336" class="LineNr">336 </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="L337" class="LineNr">337 </span>    <a href='031check_operands.cc.html#L370'>check_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="L338" class="LineNr">338 </span>    <a href='031check_operands.cc.html#L370'>check_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="L339" class="LineNr">339 </span>  <span class="Delimiter">}</span>
-<span id="L340" class="LineNr">340 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
-<span id="L341" class="LineNr">341 </span>    <a href='031check_operands.cc.html#L375'>check_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="L342" class="LineNr">342 </span>    <a href='031check_operands.cc.html#L375'>check_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="L343" class="LineNr">343 </span>  <span class="Delimiter">}</span>
-<span id="L344" class="LineNr">344 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
-<span id="L345" class="LineNr">345 </span><span class="Delimiter">}</span>
-<span id="L346" class="LineNr">346 </span>
-<span id="L347" class="LineNr">347 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
-<span id="L348" class="LineNr">348 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
-<span id="L349" class="LineNr">349 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
-<span id="L350" class="LineNr">350 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L350'>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="L351" class="LineNr">351 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L274'>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="L352" class="LineNr">352 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L353" class="LineNr">353 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>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="L354" class="LineNr">354 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
-<span id="L355" class="LineNr">355 </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="L356" class="LineNr">356 </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#L69'>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="L357" class="LineNr">357 </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="L358" class="LineNr">358 </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="L359" class="LineNr">359 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
-<span id="L360" class="LineNr">360 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L361" class="LineNr">361 </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="L362" class="LineNr">362 </span>      <a href='003trace.cc.html#L203'>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#L259'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L363" class="LineNr">363 </span>    <span class="Normal">else</span>
-<span id="L364" class="LineNr">364 </span>      <a href='003trace.cc.html#L203'>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#L259'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L365" class="LineNr">365 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L366" class="LineNr">366 </span>  <span class="Delimiter">}</span>
-<span id="L367" class="LineNr">367 </span>  <span class="Comment">// ignore settings in any unused bits</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="Normal">void</span> <a href='031check_operands.cc.html#L370'>check_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="L371" class="LineNr">371 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L372" class="LineNr">372 </span>    <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L373" class="LineNr">373 </span><span class="Delimiter">}</span>
-<span id="L374" class="LineNr">374 </span>
-<span id="L375" class="LineNr">375 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L375'>check_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="L376" class="LineNr">376 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
-<span id="L377" class="LineNr">377 </span>    <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><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;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L378" class="LineNr">378 </span><span class="Delimiter">}</span>
-<span id="L379" class="LineNr">379 </span>
-<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(scenarios transform)</span>
-<span id="L381" class="LineNr">381 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
-<span id="L382" class="LineNr">382 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
-<span id="L383" class="LineNr">383 </span>== <span class="Constant">0x1</span>
-<span id="L384" class="LineNr">384 </span><span class="Comment"># just avoid null pointer</span>
-<span id="L385" class="LineNr">385 </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="L386" class="LineNr">386 </span>$error: <span class="Constant">0</span>
-<span id="L387" class="LineNr">387 </span><span class="Delimiter">:(scenarios run)</span>
-<span id="L388" class="LineNr">388 </span>
-<span id="L389" class="LineNr">389 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
-<span id="L390" class="LineNr">390 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L391" class="LineNr">391 </span>== <span class="Constant">0x1</span>
-<span id="L392" class="LineNr">392 </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="L393" class="LineNr">393 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
-<span id="L394" class="LineNr">394 </span>
-<span id="L395" class="LineNr">395 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
-<span id="L396" class="LineNr">396 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L397" class="LineNr">397 </span>== <span class="Constant">0x1</span>
-<span id="L398" class="LineNr">398 </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="L399" class="LineNr">399 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
-<span id="L400" class="LineNr">400 </span>
-<span id="L401" class="LineNr">401 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
-<span id="L402" class="LineNr">402 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L403" class="LineNr">403 </span>== <span class="Constant">0x1</span>
-<span id="L404" class="LineNr">404 </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="L405" class="LineNr">405 </span><span class="traceContains">+error: '81 0/add/subop 0/mod 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing rm32 operand</span>
-<span id="L406" class="LineNr">406 </span>
-<span id="L407" class="LineNr">407 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
-<span id="L408" class="LineNr">408 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L409" class="LineNr">409 </span>== <span class="Constant">0x1</span>
-<span id="L410" class="LineNr">410 </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="L411" class="LineNr">411 </span><span class="traceContains">+error: '81 0/mod 3/rm32/ebx 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing subop operand</span>
-<span id="L412" class="LineNr">412 </span>
-<span id="L413" class="LineNr">413 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
-<span id="L414" class="LineNr">414 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L415" class="LineNr">415 </span>== <span class="Constant">0x1</span>
-<span id="L416" class="LineNr">416 </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="L417" class="LineNr">417 </span><span class="traceContains">+error: '81 0/add/subop 0/mod/indirect 4/rm32/use-sib 1/imm32' (combine rm32 with <a href='011run.cc.html#L299'>imm32</a> based on subop): missing base operand</span>
-<span id="L418" class="LineNr">418 </span>
-<span id="L419" class="LineNr">419 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
-<span id="L420" class="LineNr">420 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L421" class="LineNr">421 </span>== <span class="Constant">0x1</span>
-<span id="L422" class="LineNr">422 </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="L423" class="LineNr">423 </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='011run.cc.html#L299'>imm32</a> based on subop): missing index operand</span>
-<span id="L424" class="LineNr">424 </span>
-<span id="L425" class="LineNr">425 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</span>
-<span id="L426" class="LineNr">426 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L427" class="LineNr">427 </span>== <span class="Constant">0x1</span>
-<span id="L428" class="LineNr">428 </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="L429" class="LineNr">429 </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='011run.cc.html#L299'>imm32</a> based on subop): missing base operand</span>
-<span id="L430" class="LineNr">430 </span>
-<span id="L431" class="LineNr">431 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
-<span id="L432" class="LineNr">432 </span>== <span class="Constant">0x1</span>
-<span id="L433" class="LineNr">433 </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="L434" class="LineNr">434 </span>$error: <span class="Constant">0</span>
-<span id="L435" class="LineNr">435 </span>
-<span id="L436" class="LineNr">436 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
-<span id="L437" class="LineNr">437 </span>
-<span id="L438" class="LineNr">438 </span><span class="Delimiter">:(code)</span>
-<span id="L439" class="LineNr">439 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L485'>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="L440" class="LineNr">440 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
-<span id="L441" class="LineNr">441 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L442" class="LineNr">442 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L443" class="LineNr">443 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L444" class="LineNr">444 </span>  <span class="Delimiter">}</span>
-<span id="L445" class="LineNr">445 </span>  <a href='011run.cc.html#L120'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
-<span id="L446" class="LineNr">446 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
-<span id="L447" class="LineNr">447 </span>    <a href='003trace.cc.html#L203'>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;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L448" class="LineNr">448 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
-<span id="L449" class="LineNr">449 </span>  <span class="Delimiter">}</span>
-<span id="L450" class="LineNr">450 </span>  <a href='031check_operands.cc.html#L485'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L451" class="LineNr">451 </span><span class="Delimiter">}</span>
-<span id="L452" class="LineNr">452 </span>
-<span id="L453" class="LineNr">453 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L453'>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="L454" class="LineNr">454 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L455" class="LineNr">455 </span><span class="Delimiter">}</span>
-<span id="L456" class="LineNr">456 </span>
-<span id="L457" class="LineNr">457 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
-<span id="L458" class="LineNr">458 </span><span class="Special">% Hide_errors = true;</span>
-<span id="L459" class="LineNr">459 </span>== <span class="Constant">0x1</span>
-<span id="L460" class="LineNr">460 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
-<span id="L461" class="LineNr">461 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
-<span id="L462" class="LineNr">462 </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="L463" class="LineNr">463 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
-<span id="L464" class="LineNr">464 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
-<span id="L465" class="LineNr">465 </span>
-<span id="L466" class="LineNr">466 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
-<span id="L467" class="LineNr">467 </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; <a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">;</span>
-<span id="L468" class="LineNr">468 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
-<span id="L469" class="LineNr">469 </span><span class="SalientComment">//// Class C: just op and disp16</span>
-<span id="L470" class="LineNr">470 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L471" class="LineNr">471 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
-<span id="L472" class="LineNr">472 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L473" class="LineNr">473 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L474" class="LineNr">474 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L477" class="LineNr">477 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
-<span id="L478" class="LineNr">478 </span>
-<span id="L479" class="LineNr">479 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
-<span id="L480" class="LineNr">480 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
-<span id="L481" class="LineNr">481 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
-<span id="L482" class="LineNr">482 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><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="L483" class="LineNr">483 </span>
-<span id="L484" class="LineNr">484 </span><span class="Delimiter">:(code)</span>
-<span id="L485" class="LineNr">485 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L485'>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="L486" class="LineNr">486 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L467'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
-<span id="L487" class="LineNr">487 </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#L62'>MODRM</a><span class="Delimiter">))</span>
-<span id="L488" class="LineNr">488 </span>    <a href='031check_operands.cc.html#L323'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
-<span id="L489" class="LineNr">489 </span>  <a href='031check_operands.cc.html#L492'>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#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
-<span id="L490" class="LineNr">490 </span><span class="Delimiter">}</span>
-<span id="L491" class="LineNr">491 </span>
-<span id="L492" class="LineNr">492 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L492'>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="L493" class="LineNr">493 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L274'>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="L494" class="LineNr">494 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L265'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
-<span id="L495" class="LineNr">495 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>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="L496" class="LineNr">496 </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="L497" class="LineNr">497 </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#L69'>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="L498" class="LineNr">498 </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="L499" class="LineNr">499 </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="L500" class="LineNr">500 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
-<span id="L501" class="LineNr">501 </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="L502" class="LineNr">502 </span>      <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L503" class="LineNr">503 </span>    <span class="Normal">else</span>
-<span id="L504" class="LineNr">504 </span>      <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
-<span id="L505" class="LineNr">505 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
-<span id="L506" class="LineNr">506 </span>  <span class="Delimiter">}</span>
-<span id="L507" class="LineNr">507 </span>  <span class="Comment">// ignore settings in any unused bits</span>
-<span id="L508" class="LineNr">508 </span><span class="Delimiter">}</span>
-<span id="L509" class="LineNr">509 </span>
-<span id="L510" class="LineNr">510 </span>string <a href='031check_operands.cc.html#L510'>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="L511" class="LineNr">511 </span>  ostringstream out<span class="Delimiter">;</span>
-<span id="L512" class="LineNr">512 </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="L513" class="LineNr">513 </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#L510'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
-<span id="L514" class="LineNr">514 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
-<span id="L515" class="LineNr">515 </span><span class="Delimiter">}</span>
-<span id="L516" class="LineNr">516 </span>
-<span id="L517" class="LineNr">517 </span><span class="Comment">#undef HAS</span>
-<span id="L518" class="LineNr">518 </span><span class="Comment">#undef SET</span>
-<span id="L519" class="LineNr">519 </span><span class="Comment">#undef CLEAR</span>
-<span id="L520" class="LineNr">520 </span>
-<span id="L521" class="LineNr">521 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
-<span id="L522" class="LineNr">522 </span><span class="Comment">#include&lt;cctype&gt;</span>
+<span id="L186" class="LineNr">186 </span>  <span class="Comment">// xor</span>
+<span id="L187" class="LineNr">187 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L188" class="LineNr">188 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L189" class="LineNr">189 </span>  <span class="Comment">// compare</span>
+<span id="L190" class="LineNr">190 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L191" class="LineNr">191 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L192" class="LineNr">192 </span>  <span class="Comment">// copy</span>
+<span id="L193" class="LineNr">193 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L194" class="LineNr">194 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L195" class="LineNr">195 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L196" class="LineNr">196 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L197" class="LineNr">197 </span>  <span class="Comment">// swap</span>
+<span id="L198" class="LineNr">198 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L199" class="LineNr">199 </span>  <span class="Comment">// pop</span>
+<span id="L200" class="LineNr">200 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L201" class="LineNr">201 </span>
+<span id="L202" class="LineNr">202 </span>  <span class="SalientComment">//// Class O: op, ModR/M and subop (not r32)</span>
+<span id="L203" class="LineNr">203 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L204" class="LineNr">204 </span>  <span class="Comment">//  0     0     0      |0       0     1     1</span>
+<span id="L205" class="LineNr">205 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L206" class="LineNr">206 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L207" class="LineNr">207 </span>
+<span id="L208" class="LineNr">208 </span>  <span class="SalientComment">//// Class N: op, ModR/M and imm32</span>
+<span id="L209" class="LineNr">209 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L210" class="LineNr">210 </span>  <span class="Comment">//  1     0     0      |0       0     0     1</span>
+<span id="L211" class="LineNr">211 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L212" class="LineNr">212 </span>
+<span id="L213" class="LineNr">213 </span>  <span class="SalientComment">//// Class P: op, ModR/M, subop (not r32) and imm32</span>
+<span id="L214" class="LineNr">214 </span>  <span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L215" class="LineNr">215 </span>  <span class="Comment">//  1     0     0      |0       0     1     1</span>
+<span id="L216" class="LineNr">216 </span>  <a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><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="L217" class="LineNr">217 </span>
+<span id="L218" class="LineNr">218 </span>  <span class="Comment">// End Init Permitted Operands</span>
+<span id="L219" class="LineNr">219 </span><span class="Delimiter">}</span>
+<span id="L220" class="LineNr">220 </span>
+<span id="L221" class="LineNr">221 </span><span class="Delimiter">:(code)</span>
+<span id="L222" class="LineNr">222 </span><span class="Comment">#define HAS(bitvector, bit)  ((bitvector) &amp; (1 &lt;&lt; (bit)))</span>
+<span id="L223" class="LineNr">223 </span><span class="Comment">#define SET(bitvector, bit)  ((bitvector) | (1 &lt;&lt; (bit)))</span>
+<span id="L224" class="LineNr">224 </span><span class="Comment">#define CLEAR(bitvector, bit)  ((bitvector) &amp; (~(1 &lt;&lt; (bit))))</span>
+<span id="L225" class="LineNr">225 </span>
+<span id="L226" class="LineNr">226 </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="L227" class="LineNr">227 </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="L228" class="LineNr">228 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L92'>Permitted_operands</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L229" class="LineNr">229 </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#L62'>MODRM</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L230" class="LineNr">230 </span>    <a href='031check_operands.cc.html#L322'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L231" class="LineNr">231 </span>    <a href='031check_operands.cc.html#L349'>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="L232" class="LineNr">232 </span>  <span class="Delimiter">}</span>
+<span id="L233" class="LineNr">233 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L234" class="LineNr">234 </span>    <a href='031check_operands.cc.html#L240'>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="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">//: Many instructions can be checked just by comparing bitvectors.</span>
+<span id="L239" class="LineNr">239 </span>
+<span id="L240" class="LineNr">240 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L240'>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="L241" class="LineNr">241 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L273'>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="L242" class="LineNr">242 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L264'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L243" class="LineNr">243 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>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="L244" class="LineNr">244 </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="L245" class="LineNr">245 </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#L69'>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="L246" class="LineNr">246 </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="L247" class="LineNr">247 </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="L248" class="LineNr">248 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L249" class="LineNr">249 </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="L250" class="LineNr">250 </span>      <a href='003trace.cc.html#L203'>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#L258'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L251" class="LineNr">251 </span>    <span class="Normal">else</span>
+<span id="L252" class="LineNr">252 </span>      <a href='003trace.cc.html#L203'>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#L258'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L253" class="LineNr">253 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L254" class="LineNr">254 </span>  <span class="Delimiter">}</span>
+<span id="L255" class="LineNr">255 </span>  <span class="Comment">// ignore settings in any unused bits</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>string <a href='031check_operands.cc.html#L258'>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="L259" class="LineNr">259 </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="L260" class="LineNr">260 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Identifier">return</span> <span class="Constant">&quot;&quot;</span><span class="Delimiter">;</span>
+<span id="L261" class="LineNr">261 </span>  <span class="Identifier">return</span> <span class="Constant">&quot; (&quot;</span>+get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span>+<span class="Constant">')'</span><span class="Delimiter">;</span>
+<span id="L262" class="LineNr">262 </span><span class="Delimiter">}</span>
+<span id="L263" class="LineNr">263 </span>
+<span id="L264" class="LineNr">264 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L264'>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="L265" class="LineNr">265 </span>  <span class="Normal">uint32_t</span> bitvector = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L266" class="LineNr">266 </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#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">);</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L267" class="LineNr">267 </span>    bitvector = bitvector | <a href='031check_operands.cc.html#L290'>bitvector_for_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><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><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>  <span class="Comment">// duplicate operand type</span>
+<span id="L269" class="LineNr">269 </span>  <span class="Delimiter">}</span>
+<span id="L270" class="LineNr">270 </span>  <span class="Identifier">return</span> bitvector<span class="Delimiter">;</span>
+<span id="L271" class="LineNr">271 </span><span class="Delimiter">}</span>
+<span id="L272" class="LineNr">272 </span>
+<span id="L273" class="LineNr">273 </span><span class="Normal">bool</span> <a href='031check_operands.cc.html#L273'>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="L274" class="LineNr">274 </span>  <span class="Identifier">return</span> <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">)</span> &gt; <a href='031check_operands.cc.html#L277'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</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><span class="Normal">int</span> <a href='031check_operands.cc.html#L277'>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="L278" class="LineNr">278 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <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="L279" class="LineNr">279 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f2&quot;</span> || inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;f3&quot;</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L280" class="LineNr">280 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">)</span>
+<span id="L281" class="LineNr">281 </span>      <span class="Identifier">return</span> <span class="Constant">3</span><span class="Delimiter">;</span>
+<span id="L282" class="LineNr">282 </span>    <span class="Normal">else</span>
+<span id="L283" class="LineNr">283 </span>      <span class="Identifier">return</span> <span class="Constant">2</span><span class="Delimiter">;</span>
+<span id="L284" class="LineNr">284 </span>  <span class="Delimiter">}</span>
+<span id="L285" class="LineNr">285 </span>  <span class="Identifier">return</span> <span class="Constant">1</span><span class="Delimiter">;</span>
+<span id="L286" class="LineNr">286 </span><span class="Delimiter">}</span>
+<span id="L287" class="LineNr">287 </span>
+<span id="L288" class="LineNr">288 </span><span class="Comment">// Scan the metadata of 'w' and return the bit corresponding to any operand type.</span>
+<span id="L289" class="LineNr">289 </span><span class="Comment">// Also raise an error if metadata contains multiple operand types.</span>
+<span id="L290" class="LineNr">290 </span><span class="Normal">uint32_t</span> <a href='031check_operands.cc.html#L290'>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="L291" class="LineNr">291 </span>  <span class="Normal">uint32_t</span> bv = <span class="Constant">0</span><span class="Delimiter">;</span>
+<span id="L292" class="LineNr">292 </span>  <span class="Normal">bool</span> found =<span class="Constant"> false</span><span class="Delimiter">;</span>
+<span id="L293" class="LineNr">293 </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#L157'>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="L294" class="LineNr">294 </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="L295" class="LineNr">295 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><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="L296" class="LineNr">296 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>found<span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L297" class="LineNr">297 </span>      <a href='003trace.cc.html#L203'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L298" class="LineNr">298 </span>      <span class="Identifier">return</span> <a href='031check_operands.cc.html#L93'>INVALID_OPERANDS</a><span class="Delimiter">;</span>
+<span id="L299" class="LineNr">299 </span>    <span class="Delimiter">}</span>
+<span id="L300" class="LineNr">300 </span>    bv = <span class="Delimiter">(</span><span class="Constant">1</span> &lt;&lt; get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L73'>Operand_type</a><span class="Delimiter">,</span> curr<span class="Delimiter">));</span>
+<span id="L301" class="LineNr">301 </span>    found =<span class="Constant"> true</span><span class="Delimiter">;</span>
+<span id="L302" class="LineNr">302 </span>  <span class="Delimiter">}</span>
+<span id="L303" class="LineNr">303 </span>  <span class="Identifier">return</span> bv<span class="Delimiter">;</span>
+<span id="L304" class="LineNr">304 </span><span class="Delimiter">}</span>
+<span id="L305" class="LineNr">305 </span>
+<span id="L306" class="LineNr">306 </span><span class="Delimiter">:(scenario conflicting_operand_type)</span>
+<span id="L307" class="LineNr">307 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L308" class="LineNr">308 </span>== <span class="Constant">0x1</span>
+<span id="L309" class="LineNr">309 </span>cd/software-interrupt <span class="Constant">80</span>/imm8/imm32
+<span id="L310" class="LineNr">310 </span><span class="traceContains">+error: '80/imm8/imm32' has conflicting operand types; it should have only one</span>
+<span id="L311" class="LineNr">311 </span>
+<span id="L312" class="LineNr">312 </span><span class="Comment">//: Instructions computing effective addresses have more complex rules, so</span>
+<span id="L313" class="LineNr">313 </span><span class="Comment">//: we'll hard-code a common set of instruction-decoding rules.</span>
+<span id="L314" class="LineNr">314 </span>
+<span id="L315" class="LineNr">315 </span><span class="Delimiter">:(scenario check_missing_mod_operand)</span>
+<span id="L316" class="LineNr">316 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L317" class="LineNr">317 </span>== <span class="Constant">0x1</span>
+<span id="L318" class="LineNr">318 </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="L319" class="LineNr">319 </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="L320" class="LineNr">320 </span>
+<span id="L321" class="LineNr">321 </span><span class="Delimiter">:(code)</span>
+<span id="L322" class="LineNr">322 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L322'>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="L323" class="LineNr">323 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<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="L324" class="LineNr">324 </span>  <a href='031check_operands.cc.html#L369'>check_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="L325" class="LineNr">325 </span>  <a href='031check_operands.cc.html#L369'>check_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="L326" class="LineNr">326 </span>  <span class="Comment">// no check for r32; some instructions don't use it; just assume it's 0 if missing</span>
+<span id="L327" class="LineNr">327 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;81&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;8f&quot;</span> || op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a> == <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="L328" class="LineNr">328 </span>    <a href='031check_operands.cc.html#L369'>check_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="L329" class="LineNr">329 </span>    <a href='031check_operands.cc.html#L374'>check_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="L330" class="LineNr">330 </span>  <span class="Delimiter">}</span>
+<span id="L331" class="LineNr">331 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>trace_contains_errors</a><span class="Delimiter">())</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L332" class="LineNr">332 </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><a href='011run.cc.html#L122'>data</a> != <span class="Constant">&quot;4&quot;</span><span class="Delimiter">)</span> <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L333" class="LineNr">333 </span>  <span class="Comment">// SIB byte checks</span>
+<span id="L334" class="LineNr">334 </span>  <span class="Normal">uint8_t</span> mod = <a href='011run.cc.html#L229'>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><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L335" class="LineNr">335 </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="L336" class="LineNr">336 </span>    <a href='031check_operands.cc.html#L369'>check_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="L337" class="LineNr">337 </span>    <a href='031check_operands.cc.html#L369'>check_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="L338" class="LineNr">338 </span>  <span class="Delimiter">}</span>
+<span id="L339" class="LineNr">339 </span>  <span class="Normal">else</span> <span class="Delimiter">{</span>
+<span id="L340" class="LineNr">340 </span>    <a href='031check_operands.cc.html#L374'>check_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="L341" class="LineNr">341 </span>    <a href='031check_operands.cc.html#L374'>check_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="L342" class="LineNr">342 </span>  <span class="Delimiter">}</span>
+<span id="L343" class="LineNr">343 </span>  <span class="Comment">// no check for scale; 0 (2**0 = 1) by default</span>
+<span id="L344" class="LineNr">344 </span><span class="Delimiter">}</span>
+<span id="L345" class="LineNr">345 </span>
+<span id="L346" class="LineNr">346 </span><span class="Comment">// same as compare_bitvector, with a couple of exceptions for modrm-based instructions</span>
+<span id="L347" class="LineNr">347 </span><span class="Comment">//   exception 1: ignore modrm bit since we already checked it above</span>
+<span id="L348" class="LineNr">348 </span><span class="Comment">//   exception 2: modrm instructions can use a displacement on occasion</span>
+<span id="L349" class="LineNr">349 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L349'>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="L350" class="LineNr">350 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L273'>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="L351" class="LineNr">351 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L264'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<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#L217'>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="L353" class="LineNr">353 </span>  expected = CLEAR<span class="Delimiter">(</span>expected<span class="Delimiter">,</span> <a href='031check_operands.cc.html#L62'>MODRM</a><span class="Delimiter">);</span>  <span class="Comment">// exception 1</span>
+<span id="L354" class="LineNr">354 </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="L355" class="LineNr">355 </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#L69'>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="L356" class="LineNr">356 </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="L357" class="LineNr">357 </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="L358" class="LineNr">358 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>i == <a href='031check_operands.cc.html#L64'>DISP8</a> || i == <a href='031check_operands.cc.html#L66'>DISP32</a><span class="Delimiter">)</span> <span class="Identifier">continue</span><span class="Delimiter">;</span>  <span class="Comment">// exception 2</span>
+<span id="L359" class="LineNr">359 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L360" class="LineNr">360 </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="L361" class="LineNr">361 </span>      <a href='003trace.cc.html#L203'>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#L258'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L362" class="LineNr">362 </span>    <span class="Normal">else</span>
+<span id="L363" class="LineNr">363 </span>      <a href='003trace.cc.html#L203'>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#L258'>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</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L364" class="LineNr">364 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L365" class="LineNr">365 </span>  <span class="Delimiter">}</span>
+<span id="L366" class="LineNr">366 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L367" class="LineNr">367 </span><span class="Delimiter">}</span>
+<span id="L368" class="LineNr">368 </span>
+<span id="L369" class="LineNr">369 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L369'>check_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="L370" class="LineNr">370 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L371" class="LineNr">371 </span>    <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; type &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L372" class="LineNr">372 </span><span class="Delimiter">}</span>
+<span id="L373" class="LineNr">373 </span>
+<span id="L374" class="LineNr">374 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L374'>check_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="L375" class="LineNr">375 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>has_metadata<span class="Delimiter">(</span>inst<span class="Delimiter">,</span> type<span class="Delimiter">))</span>
+<span id="L376" class="LineNr">376 </span>    <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L228'>name</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><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;)</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L377" class="LineNr">377 </span><span class="Delimiter">}</span>
+<span id="L378" class="LineNr">378 </span>
+<span id="L379" class="LineNr">379 </span><span class="Delimiter">:(scenarios transform)</span>
+<span id="L380" class="LineNr">380 </span><span class="Delimiter">:(scenario modrm_with_displacement)</span>
+<span id="L381" class="LineNr">381 </span><span class="Special">% Reg[EAX].u = 0x1;</span>
+<span id="L382" class="LineNr">382 </span>== <span class="Constant">0x1</span>
+<span id="L383" class="LineNr">383 </span><span class="Comment"># just avoid null pointer</span>
+<span id="L384" class="LineNr">384 </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="L385" class="LineNr">385 </span>$error: <span class="Constant">0</span>
+<span id="L386" class="LineNr">386 </span><span class="Delimiter">:(scenarios run)</span>
+<span id="L387" class="LineNr">387 </span>
+<span id="L388" class="LineNr">388 </span><span class="Delimiter">:(scenario conflicting_operands_in_modrm_instruction)</span>
+<span id="L389" class="LineNr">389 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L390" class="LineNr">390 </span>== <span class="Constant">0x1</span>
+<span id="L391" class="LineNr">391 </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="L392" class="LineNr">392 </span><span class="traceContains">+error: '01/add 0/mod 3/mod' has conflicting mod operands</span>
+<span id="L393" class="LineNr">393 </span>
+<span id="L394" class="LineNr">394 </span><span class="Delimiter">:(scenario conflicting_operand_type_modrm)</span>
+<span id="L395" class="LineNr">395 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L396" class="LineNr">396 </span>== <span class="Constant">0x1</span>
+<span id="L397" class="LineNr">397 </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="L398" class="LineNr">398 </span><span class="traceContains">+error: '3/rm32/r32' has conflicting operand types; it should have only one</span>
+<span id="L399" class="LineNr">399 </span>
+<span id="L400" class="LineNr">400 </span><span class="Delimiter">:(scenario check_missing_rm32_operand)</span>
+<span id="L401" class="LineNr">401 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L402" class="LineNr">402 </span>== <span class="Constant">0x1</span>
+<span id="L403" class="LineNr">403 </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="L404" class="LineNr">404 </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="L405" class="LineNr">405 </span>
+<span id="L406" class="LineNr">406 </span><span class="Delimiter">:(scenario check_missing_subop_operand)</span>
+<span id="L407" class="LineNr">407 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L408" class="LineNr">408 </span>== <span class="Constant">0x1</span>
+<span id="L409" class="LineNr">409 </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="L410" class="LineNr">410 </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="L411" class="LineNr">411 </span>
+<span id="L412" class="LineNr">412 </span><span class="Delimiter">:(scenario check_missing_base_operand)</span>
+<span id="L413" class="LineNr">413 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L414" class="LineNr">414 </span>== <span class="Constant">0x1</span>
+<span id="L415" class="LineNr">415 </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="L416" class="LineNr">416 </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="L417" class="LineNr">417 </span>
+<span id="L418" class="LineNr">418 </span><span class="Delimiter">:(scenario check_missing_index_operand)</span>
+<span id="L419" class="LineNr">419 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L420" class="LineNr">420 </span>== <span class="Constant">0x1</span>
+<span id="L421" class="LineNr">421 </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="L422" class="LineNr">422 </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="L423" class="LineNr">423 </span>
+<span id="L424" class="LineNr">424 </span><span class="Delimiter">:(scenario check_missing_base_operand_2)</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="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="L428" class="LineNr">428 </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="L429" class="LineNr">429 </span>
+<span id="L430" class="LineNr">430 </span><span class="Delimiter">:(scenario check_base_operand_not_needed_in_direct_mode)</span>
+<span id="L431" class="LineNr">431 </span>== <span class="Constant">0x1</span>
+<span id="L432" class="LineNr">432 </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="L433" class="LineNr">433 </span>$error: <span class="Constant">0</span>
+<span id="L434" class="LineNr">434 </span>
+<span id="L435" class="LineNr">435 </span><span class="SalientComment">//:: similarly handle multi-byte opcodes</span>
+<span id="L436" class="LineNr">436 </span>
+<span id="L437" class="LineNr">437 </span><span class="Delimiter">:(code)</span>
+<span id="L438" class="LineNr">438 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L484'>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="L439" class="LineNr">439 </span>  assert<span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">0</span><span class="Delimiter">).</span><a href='011run.cc.html#L122'>data</a> == <span class="Constant">&quot;0f&quot;</span><span class="Delimiter">);</span>
+<span id="L440" class="LineNr">440 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">)</span> == <span class="Constant">1</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
+<span id="L441" class="LineNr">441 </span>    <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;opcode '0f' requires a second opcode</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L442" class="LineNr">442 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L443" class="LineNr">443 </span>  <span class="Delimiter">}</span>
+<span id="L444" class="LineNr">444 </span>  <a href='011run.cc.html#L120'>word</a> op = <a href='031check_operands.cc.html#L39'>preprocess_op</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>words</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span><span class="Constant">1</span><span class="Delimiter">));</span>
+<span id="L445" class="LineNr">445 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>!contains_key<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">))</span> <span class="Delimiter">{</span>
+<span id="L446" class="LineNr">446 </span>    <a href='003trace.cc.html#L203'>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;'</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L447" class="LineNr">447 </span>    <span class="Identifier">return</span><span class="Delimiter">;</span>
+<span id="L448" class="LineNr">448 </span>  <span class="Delimiter">}</span>
+<span id="L449" class="LineNr">449 </span>  <a href='031check_operands.cc.html#L484'>check_operands_0f</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L450" class="LineNr">450 </span><span class="Delimiter">}</span>
+<span id="L451" class="LineNr">451 </span>
+<span id="L452" class="LineNr">452 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L452'>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="L453" class="LineNr">453 </span>  <a href='003trace.cc.html#L203'>raise</a> &lt;&lt; <span class="Constant">&quot;no supported opcodes starting with f3</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L454" class="LineNr">454 </span><span class="Delimiter">}</span>
+<span id="L455" class="LineNr">455 </span>
+<span id="L456" class="LineNr">456 </span><span class="Delimiter">:(scenario check_missing_disp16_operand)</span>
+<span id="L457" class="LineNr">457 </span><span class="Special">% Hide_errors = true;</span>
+<span id="L458" class="LineNr">458 </span>== <span class="Constant">0x1</span>
+<span id="L459" class="LineNr">459 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
+<span id="L460" class="LineNr">460 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
+<span id="L461" class="LineNr">461 </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="L462" class="LineNr">462 </span>  <span class="Constant">0f</span> <span class="Constant">84</span>                                                                                                                                             <span class="Comment"># jmp if ZF to ??</span>
+<span id="L463" class="LineNr">463 </span><span class="traceContains">+error: '0f 84' (jump disp16 bytes away if ZF is set): missing disp16 operand</span>
+<span id="L464" class="LineNr">464 </span>
+<span id="L465" class="LineNr">465 </span><span class="Delimiter">:(before &quot;End Globals&quot;)</span>
+<span id="L466" class="LineNr">466 </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; <a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">;</span>
+<span id="L467" class="LineNr">467 </span><span class="Delimiter">:(before &quot;End Init Permitted Operands&quot;)</span>
+<span id="L468" class="LineNr">468 </span><span class="SalientComment">//// Class C: just op and disp16</span>
+<span id="L469" class="LineNr">469 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L470" class="LineNr">470 </span><span class="Comment">//  0     0     0      |1       0     0     0</span>
+<span id="L471" class="LineNr">471 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;84&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L472" class="LineNr">472 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;85&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L473" class="LineNr">473 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8c&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L474" class="LineNr">474 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8d&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L475" class="LineNr">475 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8e&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L476" class="LineNr">476 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> <span class="Constant">&quot;8f&quot;</span><span class="Delimiter">,</span> <span class="Constant">0x08</span><span class="Delimiter">);</span>
+<span id="L477" class="LineNr">477 </span>
+<span id="L478" class="LineNr">478 </span><span class="SalientComment">//// Class M: using ModR/M byte</span>
+<span id="L479" class="LineNr">479 </span><span class="Comment">//  imm32 imm8  disp32 |disp16  disp8 subop modrm</span>
+<span id="L480" class="LineNr">480 </span><span class="Comment">//  0     0     0      |0       0     0     1</span>
+<span id="L481" class="LineNr">481 </span><a href='001help.cc.html#L243'>put</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><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="L482" class="LineNr">482 </span>
+<span id="L483" class="LineNr">483 </span><span class="Delimiter">:(code)</span>
+<span id="L484" class="LineNr">484 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L484'>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="L485" class="LineNr">485 </span>  <span class="Normal">uint8_t</span> expected_bitvector = get<span class="Delimiter">(</span><a href='031check_operands.cc.html#L466'>Permitted_operands_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">);</span>
+<span id="L486" class="LineNr">486 </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#L62'>MODRM</a><span class="Delimiter">))</span>
+<span id="L487" class="LineNr">487 </span>    <a href='031check_operands.cc.html#L322'>check_operands_modrm</a><span class="Delimiter">(</span>inst<span class="Delimiter">,</span> op<span class="Delimiter">);</span>
+<span id="L488" class="LineNr">488 </span>  <a href='031check_operands.cc.html#L491'>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#L62'>MODRM</a><span class="Delimiter">),</span> op<span class="Delimiter">);</span>
+<span id="L489" class="LineNr">489 </span><span class="Delimiter">}</span>
+<span id="L490" class="LineNr">490 </span>
+<span id="L491" class="LineNr">491 </span><span class="Normal">void</span> <a href='031check_operands.cc.html#L491'>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="L492" class="LineNr">492 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span>all_hex_bytes<span class="Delimiter">(</span>inst<span class="Delimiter">)</span> &amp;&amp; <a href='031check_operands.cc.html#L273'>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="L493" class="LineNr">493 </span>  <span class="Normal">uint8_t</span> bitvector = <a href='031check_operands.cc.html#L264'>compute_operand_bitvector</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>
+<span id="L494" class="LineNr">494 </span>  <span class="Normal">if</span> <span class="Delimiter">(</span><a href='003trace.cc.html#L217'>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="L495" class="LineNr">495 </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="L496" class="LineNr">496 </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#L69'>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="L497" class="LineNr">497 </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="L498" class="LineNr">498 </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="L499" class="LineNr">499 </span>    <span class="Normal">const</span> string&amp; optype = <a href='031check_operands.cc.html#L72'>Operand_type_name</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
+<span id="L500" class="LineNr">500 </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="L501" class="LineNr">501 </span>      <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): unexpected &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L502" class="LineNr">502 </span>    <span class="Normal">else</span>
+<span id="L503" class="LineNr">503 </span>      <a href='003trace.cc.html#L203'>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; get<span class="Delimiter">(</span><a href='010---vm.cc.html#L229'>name_0f</a><span class="Delimiter">,</span> op<span class="Delimiter">.</span><a href='011run.cc.html#L122'>data</a><span class="Delimiter">)</span> &lt;&lt; <span class="Constant">&quot;): missing &quot;</span> &lt;&lt; optype &lt;&lt; <span class="Constant">&quot; operand</span><span class="cSpecial">\n</span><span class="Constant">&quot;</span> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
+<span id="L504" class="LineNr">504 </span>    <span class="Comment">// continue giving all errors for a single instruction</span>
+<span id="L505" class="LineNr">505 </span>  <span class="Delimiter">}</span>
+<span id="L506" class="LineNr">506 </span>  <span class="Comment">// ignore settings in any unused bits</span>
+<span id="L507" class="LineNr">507 </span><span class="Delimiter">}</span>
+<span id="L508" class="LineNr">508 </span>
+<span id="L509" class="LineNr">509 </span>string <a href='031check_operands.cc.html#L509'>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="L510" class="LineNr">510 </span>  ostringstream out<span class="Delimiter">;</span>
+<span id="L511" class="LineNr">511 </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="L512" class="LineNr">512 </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#L509'>tolower</a><span class="Delimiter">(</span>*s<span class="Delimiter">));</span>
+<span id="L513" class="LineNr">513 </span>  <span class="Identifier">return</span> out<span class="Delimiter">.</span>str<span class="Delimiter">();</span>
+<span id="L514" class="LineNr">514 </span><span class="Delimiter">}</span>
+<span id="L515" class="LineNr">515 </span>
+<span id="L516" class="LineNr">516 </span><span class="Comment">#undef HAS</span>
+<span id="L517" class="LineNr">517 </span><span class="Comment">#undef SET</span>
+<span id="L518" class="LineNr">518 </span><span class="Comment">#undef CLEAR</span>
+<span id="L519" class="LineNr">519 </span>
+<span id="L520" class="LineNr">520 </span><span class="Delimiter">:(before &quot;End Includes&quot;)</span>
+<span id="L521" class="LineNr">521 </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 52765a46..1239890e 100644
--- a/html/subx/032check_operand_bounds.cc.html
+++ b/html/subx/032check_operand_bounds.cc.html
@@ -93,7 +93,7 @@ if ('onhashchange' in window) {
 <span id="L30" class="LineNr">30 </span>  <a href='003trace.cc.html#L196'>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; <a href='003trace.cc.html#L222'>end</a><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#L157'>SIZE</a><span class="Delimiter">(</span><a href='031check_operands.cc.html#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>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#L14'>code</a><span class="Delimiter">.</span><a href='011run.cc.html#L106'>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#L278'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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#L277'>first_operand</a><span class="Delimiter">(</span>inst<span class="Delimiter">);</span>  j &lt; <a href='001help.cc.html#L157'>SIZE</a><span class="Delimiter">(</span>inst<span class="Delimiter">.</span><a href='011run.cc.html#L115'>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#L115'>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#L217'>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 92f2f152..22a6503c 100644
--- a/html/subx/034compute_segment_address.cc.html
+++ b/html/subx/034compute_segment_address.cc.html
@@ -74,7 +74,7 @@ if ('onhashchange' in window) {
 <span id="L13" class="LineNr">13 </span><span class="traceContains">+load: 0x08048056 -&gt; 0b</span>
 <span id="L14" class="LineNr">14 </span><span class="traceContains">+load: 0x08048057 -&gt; 0c</span>
 <span id="L15" class="LineNr">15 </span><span class="traceContains">+load: 0x08048058 -&gt; 0d</span>
-<span id="L16" class="LineNr">16 </span><span class="traceContains">+run: add <a href='011run.cc.html#L299'>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="L16" class="LineNr">16 </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="L17" class="LineNr">17 </span><span class="traceContains">+run: storing 0x0d0c0b0a</span>
 <span id="L18" class="LineNr">18 </span>
 <span id="L19" class="LineNr">19 </span><span class="Delimiter">:(before &quot;End Level-2 Transforms&quot;)</span>
@@ -87,11 +87,11 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr">26 </span>  <span class="Normal">for</span> <span class="Delimiter">(</span><span class="Normal">size_t</span> i = <span class="Constant">0</span><span class="Delimiter">;</span>  i &lt; p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>size<span class="Delimiter">();</span>  ++i<span class="Delimiter">)</span> <span class="Delimiter">{</span>
 <span id="L27" class="LineNr">27 </span>    segment&amp; curr = p<span class="Delimiter">.</span><a href='011run.cc.html#L97'>segments</a><span class="Delimiter">.</span>at<span class="Delimiter">(</span>i<span class="Delimiter">);</span>
 <span id="L28" class="LineNr">28 </span>    <span class="Normal">if</span> <span class="Delimiter">(</span>curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> == <span class="Constant">0</span><span class="Delimiter">)</span> <span class="Delimiter">{</span>
-<span id="L29" class="LineNr">29 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> = <a href='012elf.cc.html#L126'>CODE_START</a> + i*SEGMENT_SIZE + p_offset<span class="Delimiter">;</span>
+<span id="L29" class="LineNr">29 </span>      curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> = <a href='012elf.cc.html#L125'>CODE_START</a> + i*SEGMENT_SIZE + p_offset<span class="Delimiter">;</span>
 <span id="L30" class="LineNr">30 </span>      <a href='003trace.cc.html#L196'>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;segment &quot;</span> &lt;&lt; i &lt;&lt; <span class="Constant">&quot; begins at address &quot;</span> &lt;&lt; curr<span class="Delimiter">.</span><a href='011run.cc.html#L105'>start</a> &lt;&lt; <a href='003trace.cc.html#L222'>end</a><span class="Delimiter">();</span>
 <span id="L31" class="LineNr">31 </span>    <span class="Delimiter">}</span>
 <span id="L32" class="LineNr">32 </span>    p_offset += <a href='034compute_segment_address.cc.html#L37'>size_of</a><span class="Delimiter">(</span>curr<span class="Delimiter">);</span>
-<span id="L33" class="LineNr">33 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='012elf.cc.html#L127'>SEGMENT_SIZE</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
+<span id="L33" class="LineNr">33 </span>    assert<span class="Delimiter">(</span>p_offset &lt; <a href='012elf.cc.html#L126'>SEGMENT_SIZE</a><span class="Delimiter">);</span>  <span class="Comment">// for now we get less and less available space in each successive segment</span>
 <span id="L34" class="LineNr">34 </span>  <span class="Delimiter">}</span>
 <span id="L35" class="LineNr">35 </span><span class="Delimiter">}</span>
 <span id="L36" class="LineNr">36 </span>
diff --git a/html/subx/apps/factorial.subx.html b/html/subx/apps/factorial.subx.html
index c695cb3c..1fa6a4e3 100644
--- a/html/subx/apps/factorial.subx.html
+++ b/html/subx/apps/factorial.subx.html
@@ -63,7 +63,7 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   120</span>
 <span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L10" class="LineNr">10 </span>== code
 <span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
@@ -88,36 +88,34 @@ if ('onhashchange' in window) {
 <span id="L32" class="LineNr">32 </span>
 <span id="L33" class="LineNr">33 </span><span class="Comment"># factorial(n)</span>
 <span id="L34" class="LineNr">34 </span>factorial:
-<span id="L35" class="LineNr">35 </span>  <span class="Comment"># initialize n</span>
-<span id="L36" class="LineNr">36 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L37" class="LineNr">37 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
-<span id="L38" class="LineNr">38 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
-<span id="L39" class="LineNr">39 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
-<span id="L40" class="LineNr">40 </span>  81          7/subop/compare     3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># compare EDX with 1</span>
-<span id="L41" class="LineNr">41 </span>  7e/jump-if-&lt;=                  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          $factorial:exit/disp8             <span class="Comment"># jump if &lt;= to $factorial:exit</span>
-<span id="L42" class="LineNr">42 </span>  <span class="Comment"># EBX: n-1</span>
-<span id="L43" class="LineNr">43 </span>  89/copy                         3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          2/r32/EDX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EDX to EBX</span>
-<span id="L44" class="LineNr">44 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract 1 from EBX</span>
-<span id="L45" class="LineNr">45 </span>  <span class="Comment"># prepare call</span>
-<span id="L46" class="LineNr">46 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBP</span>
-<span id="L47" class="LineNr">47 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
-<span id="L48" class="LineNr">48 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
-<span id="L49" class="LineNr">49 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
-<span id="L50" class="LineNr">50 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
-<span id="L51" class="LineNr">51 </span>  <span class="Comment"># discard arg</span>
-<span id="L52" class="LineNr">52 </span>  5e/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop into ESI</span>
-<span id="L53" class="LineNr">53 </span>  <span class="Comment"># clean up after call</span>
-<span id="L54" class="LineNr">54 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
-<span id="L55" class="LineNr">55 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop to EBP</span>
-<span id="L56" class="LineNr">56 </span>  <span class="Comment"># refresh n</span>
-<span id="L57" class="LineNr">57 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
-<span id="L58" class="LineNr">58 </span>  <span class="Comment"># return n * factorial(n-1)</span>
-<span id="L59" class="LineNr">59 </span>  0f af/multiply                  3/mod/direct    2/rm32/EDX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          0/r32/EAX  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># multiply EDX (n) into EAX (factorial(n-1))</span>
-<span id="L60" class="LineNr">60 </span>  <span class="Comment"># TODO: check for overflow</span>
-<span id="L61" class="LineNr">61 </span>$factorial:exit:
-<span id="L62" class="LineNr">62 </span>  c3/return
-<span id="L63" class="LineNr">63 </span>
-<span id="L64" class="LineNr">64 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
+<span id="L35" class="LineNr">35 </span>  <span class="Comment"># initialize EAX to 1 (base case)</span>
+<span id="L36" class="LineNr">36 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># copy 1 to EAX</span>
+<span id="L37" class="LineNr">37 </span>  <span class="Comment"># if (n &lt;= 1) jump exit</span>
+<span id="L38" class="LineNr">38 </span>  81          7/subop/compare     1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          4/disp8         1/imm32           <span class="Comment"># compare *(ESP+4) with 1</span>
+<span id="L39" class="LineNr">39 </span>  7e/jump-if-&lt;=                  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          $factorial:exit/disp8             <span class="Comment"># jump if &lt;= to $factorial:exit</span>
+<span id="L40" class="LineNr">40 </span>  <span class="Comment"># EBX: n-1</span>
+<span id="L41" class="LineNr">41 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              3/r32/EBX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EBX</span>
+<span id="L42" class="LineNr">42 </span>  81          5/subop/subtract    3/mod/direct    3/rm32/EBX   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32           <span class="Comment"># subtract 1 from EBX</span>
+<span id="L43" class="LineNr">43 </span>  <span class="Comment"># prepare call</span>
+<span id="L44" class="LineNr">44 </span>  55/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBP</span>
+<span id="L45" class="LineNr">45 </span>  89/copy                         3/mod/direct    5/rm32/EBP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          4/r32/ESP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy ESP to EBP</span>
+<span id="L46" class="LineNr">46 </span>  <span class="Comment"># EAX: factorial(n-1)</span>
+<span id="L47" class="LineNr">47 </span>  53/push                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># push EBX</span>
+<span id="L48" class="LineNr">48 </span>  e8/call                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>          factorial/disp32
+<span id="L49" class="LineNr">49 </span>  <span class="Comment"># discard arg</span>
+<span id="L50" class="LineNr">50 </span>  5e/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop into ESI</span>
+<span id="L51" class="LineNr">51 </span>  <span class="Comment"># clean up after call</span>
+<span id="L52" class="LineNr">52 </span>  89/copy                         3/mod/direct    4/rm32/ESP   <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>          5/r32/EBP  <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># copy EBP to ESP</span>
+<span id="L53" class="LineNr">53 </span>  5d/pop                         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>                <span class="Comment"># pop to EBP</span>
+<span id="L54" class="LineNr">54 </span>  <span class="Comment"># refresh n</span>
+<span id="L55" class="LineNr">55 </span>  8b/copy                         1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none              2/r32/EDX   4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># copy *(ESP+4) to EDX</span>
+<span id="L56" class="LineNr">56 </span>  <span class="Comment"># return n * factorial(n-1)</span>
+<span id="L57" class="LineNr">57 </span>  f7          4/subop/multiply    1/mod/*+disp8   4/rm32/sib    4/base/ESP  4/index/none                          4/disp8        <span class="Delimiter"> . </span>                <span class="Comment"># multiply *(ESP+4) (n) into EAX (factorial(n-1))</span>
+<span id="L58" class="LineNr">58 </span>  <span class="Comment"># TODO: check for overflow</span>
+<span id="L59" class="LineNr">59 </span>$factorial:exit:
+<span id="L60" class="LineNr">60 </span>  c3/return
+<span id="L61" class="LineNr">61 </span>
+<span id="L62" class="LineNr">62 </span><span class="Comment"># vim&#0058;ft=subx:nowrap:so=0</span>
 </pre>
 </body>
 </html>
diff --git a/html/subx/examples/ex1.1.subx.html b/html/subx/examples/ex1.1.subx.html
index bb74b710..f706d6fd 100644
--- a/html/subx/examples/ex1.1.subx.html
+++ b/html/subx/examples/ex1.1.subx.html
@@ -63,7 +63,7 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
-<span id="L11" class="LineNr">11 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L11" class="LineNr">11 </span>== code
 <span id="L12" class="LineNr">12 </span><span class="Comment"># opcode        ModR/M                    SIB                   displacement    immediate</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># instruction   mod, reg, Reg/Mem bits    scale, index, base</span>
 <span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes     0/1 byte                  0/1 byte              0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/examples/ex1.2.subx.html b/html/subx/examples/ex1.2.subx.html
index 169797e8..aa5cb359 100644
--- a/html/subx/examples/ex1.2.subx.html
+++ b/html/subx/examples/ex1.2.subx.html
@@ -63,7 +63,7 @@ if ('onhashchange' in window) {
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   $ echo $?</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment">#   42</span>
 <span id="L10" class="LineNr">10 </span>
-<span id="L11" class="LineNr">11 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L11" class="LineNr">11 </span>== code
 <span id="L12" class="LineNr">12 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L14" class="LineNr">14 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/examples/ex2.subx.html b/html/subx/examples/ex2.subx.html
index 0ec3069a..e372f373 100644
--- a/html/subx/examples/ex2.subx.html
+++ b/html/subx/examples/ex2.subx.html
@@ -62,7 +62,7 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   2</span>
 <span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L10" class="LineNr">10 </span>== code
 <span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/examples/ex3.subx.html b/html/subx/examples/ex3.subx.html
index 1118bc53..baea67fa 100644
--- a/html/subx/examples/ex3.subx.html
+++ b/html/subx/examples/ex3.subx.html
@@ -62,7 +62,7 @@ if ('onhashchange' in window) {
 <span id="L7" class="LineNr"> 7 </span><span class="Comment">#   $ echo $?</span>
 <span id="L8" class="LineNr"> 8 </span><span class="Comment">#   55</span>
 <span id="L9" class="LineNr"> 9 </span>
-<span id="L10" class="LineNr">10 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L10" class="LineNr">10 </span>== code
 <span id="L11" class="LineNr">11 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L12" class="LineNr">12 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L13" class="LineNr">13 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/examples/ex4.subx.html b/html/subx/examples/ex4.subx.html
index 8191b5c5..94014c9b 100644
--- a/html/subx/examples/ex4.subx.html
+++ b/html/subx/examples/ex4.subx.html
@@ -59,7 +59,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex4.subx ex4</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex4</span>
 <span id="L6" class="LineNr"> 6 </span>
-<span id="L7" class="LineNr"> 7 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L7" class="LineNr"> 7 </span>== code
 <span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
@@ -90,7 +90,7 @@ if ('onhashchange' in window) {
 <span id="L35" class="LineNr">35 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
 <span id="L36" class="LineNr">36 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
 <span id="L37" class="LineNr">37 </span>
-<span id="L38" class="LineNr">38 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L38" class="LineNr">38 </span>== data
 <span id="L39" class="LineNr">39 </span>x:
 <span id="L40" class="LineNr">40 </span>00 00 00 00  <span class="Comment"># space for read() to write to</span>
 <span id="L41" class="LineNr">41 </span>
diff --git a/html/subx/examples/ex5.subx.html b/html/subx/examples/ex5.subx.html
index ea095cba..6034b3f2 100644
--- a/html/subx/examples/ex5.subx.html
+++ b/html/subx/examples/ex5.subx.html
@@ -59,7 +59,7 @@ if ('onhashchange' in window) {
 <span id="L4" class="LineNr"> 4 </span><span class="Comment">#   $ subx translate ex5.subx ex5</span>
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex5</span>
 <span id="L6" class="LineNr"> 6 </span>
-<span id="L7" class="LineNr"> 7 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L7" class="LineNr"> 7 </span>== code
 <span id="L8" class="LineNr"> 8 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L10" class="LineNr">10 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/subx/examples/ex6.subx.html b/html/subx/examples/ex6.subx.html
index 3ae33645..f633a7c3 100644
--- a/html/subx/examples/ex6.subx.html
+++ b/html/subx/examples/ex6.subx.html
@@ -60,7 +60,7 @@ if ('onhashchange' in window) {
 <span id="L5" class="LineNr"> 5 </span><span class="Comment">#   $ subx run ex6</span>
 <span id="L6" class="LineNr"> 6 </span><span class="Comment">#   Hello, world!</span>
 <span id="L7" class="LineNr"> 7 </span>
-<span id="L8" class="LineNr"> 8 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L8" class="LineNr"> 8 </span>== code
 <span id="L9" class="LineNr"> 9 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L10" class="LineNr">10 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L11" class="LineNr">11 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
@@ -81,7 +81,7 @@ if ('onhashchange' in window) {
 <span id="L26" class="LineNr">26 </span>  b8/copy                                                                                                                         1/imm32           <span class="Comment"># copy 1 to EAX</span>
 <span id="L27" class="LineNr">27 </span>  cd/syscall                                                                                                                      0x80/imm8         <span class="Comment"># int 80h</span>
 <span id="L28" class="LineNr">28 </span>
-<span id="L29" class="LineNr">29 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L29" class="LineNr">29 </span>== data
 <span id="L30" class="LineNr">30 </span>size:  <span class="Comment"># size of string</span>
 <span id="L31" class="LineNr">31 </span>  0e 00 00 00  <span class="Comment"># 14</span>
 <span id="L32" class="LineNr">32 </span>x:  <span class="Comment"># string to print</span>
diff --git a/html/subx/examples/ex7.subx.html b/html/subx/examples/ex7.subx.html
index ecf0f0f8..35ac5418 100644
--- a/html/subx/examples/ex7.subx.html
+++ b/html/subx/examples/ex7.subx.html
@@ -66,7 +66,7 @@ if ('onhashchange' in window) {
 <span id="L10" class="LineNr"> 10 </span><span class="Comment">#   $ echo $?</span>
 <span id="L11" class="LineNr"> 11 </span><span class="Comment">#   97</span>
 <span id="L12" class="LineNr"> 12 </span>
-<span id="L13" class="LineNr"> 13 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L13" class="LineNr"> 13 </span>== code
 <span id="L14" class="LineNr"> 14 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L15" class="LineNr"> 15 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L16" class="LineNr"> 16 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
@@ -146,7 +146,7 @@ if ('onhashchange' in window) {
 <span id="L90" class="LineNr"> 90 </span>  b8/copy                        <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              1/imm32/exit            <span class="Comment"># copy 1 to EAX</span>
 <span id="L91" class="LineNr"> 91 </span>  cd/syscall                     <span class="Delimiter"> . </span>             <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>           <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>         <span class="Delimiter"> . </span>              0x80/imm8               <span class="Comment"># int 80h</span>
 <span id="L92" class="LineNr"> 92 </span>
-<span id="L93" class="LineNr"> 93 </span>== <a href='011run.cc.html#L122'>data</a>
+<span id="L93" class="LineNr"> 93 </span>== data
 <span id="L94" class="LineNr"> 94 </span>stream:
 <span id="L95" class="LineNr"> 95 </span>00 00 00 00
 <span id="L96" class="LineNr"> 96 </span>a:
diff --git a/html/subx/examples/ex8.subx.html b/html/subx/examples/ex8.subx.html
index a20af2b4..62c118c6 100644
--- a/html/subx/examples/ex8.subx.html
+++ b/html/subx/examples/ex8.subx.html
@@ -69,7 +69,7 @@ if ('onhashchange' in window) {
 <span id="L14" class="LineNr">14 </span><span class="Comment">#   ...</span>
 <span id="L15" class="LineNr">15 </span><span class="Comment"># Locals start from ESP-4 downwards.</span>
 <span id="L16" class="LineNr">16 </span>
-<span id="L17" class="LineNr">17 </span>== <a href='031check_operands.cc.html#L14'>code</a>
+<span id="L17" class="LineNr">17 </span>== code
 <span id="L18" class="LineNr">18 </span><span class="Comment"># instruction                     effective address                                                   operand     displacement    immediate</span>
 <span id="L19" class="LineNr">19 </span><span class="Comment"># op          subop               mod             rm32          base        index         scale       r32</span>
 <span id="L20" class="LineNr">20 </span><span class="Comment"># 1-3 bytes   3 bits              2 bits          3 bits        3 bits      3 bits        2 bits      2 bits      0/1/2/4 bytes   0/1/2/4 bytes</span>
diff --git a/html/tangle.mu.html b/html/tangle.mu.html
index 2a0d11cf..2dbb66d5 100644
--- a/html/tangle.mu.html
+++ b/html/tangle.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - tangle.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -17,12 +17,12 @@ a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muControl { color: #c0a020; }
 .muRecipe { color: #ff8700; }
-.Special { color: #c00000; }
+.LineNr { color: #444444; }
 .Delimiter { color: #800080; }
+.Constant { color: #00a0a0; }
+.Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>
 
diff --git a/html/x.mu.html b/html/x.mu.html
index 2581c401..022c3a6f 100644
--- a/html/x.mu.html
+++ b/html/x.mu.html
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <title>Mu - x.mu</title>
-<meta name="Generator" content="Vim/7.4">
+<meta name="Generator" content="Vim/8.0">
 <meta name="plugin-version" content="vim7.4_v2">
 <meta name="syntax" content="none">
 <meta name="settings" content="number_lines,use_css,pre_wrap,no_foldcolumn,expand_tabs,line_ids,prevent_copy=">
@@ -16,11 +16,11 @@ a { color:#eeeeee; text-decoration: none; }
 a:hover { text-decoration: underline; }
 * { font-size: 12pt; font-size: 1em; }
 .muRecipe { color: #ff8700; }
+.LineNr { color: #444444; }
+.Constant { color: #00a0a0; }
 .Special { color: #c00000; }
 .Comment { color: #9090ff; }
 .Comment a { color:#0000ee; text-decoration:underline; }
-.Constant { color: #00a0a0; }
-.LineNr { color: #444444; }
 -->
 </style>